8 files changed, 24 insertions, 24 deletions
diff --git a/src/Specific/montgomery32_2e137m13/feadd.c b/src/Specific/montgomery32_2e137m13/feadd.c
index cae1d30a9..9551c2a6f 100644
--- a/src/Specific/montgomery32_2e137m13/feadd.c
+++ b/src/Specific/montgomery32_2e137m13/feadd.c
@@ -20,11 +20,11 @@ static void feadd(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x45; uint8_t x46 = _subborrow_u32(x43, x30, 0xffffffff, &x45);
   { uint32_t x48; uint8_t x49 = _subborrow_u32(x46, x33, 0x1ff, &x48);
   { uint32_t _; uint8_t x52 = _subborrow_u32(x49, x34, 0x0, &_);
-  { uint32_t x53 = cmovznz(x52, x48, x33);
-  { uint32_t x54 = cmovznz(x52, x45, x30);
-  { uint32_t x55 = cmovznz(x52, x42, x27);
-  { uint32_t x56 = cmovznz(x52, x39, x24);
-  { uint32_t x57 = cmovznz(x52, x36, x21);
+  { uint32_t x53 = cmovznz32(x52, x48, x33);
+  { uint32_t x54 = cmovznz32(x52, x45, x30);
+  { uint32_t x55 = cmovznz32(x52, x42, x27);
+  { uint32_t x56 = cmovznz32(x52, x39, x24);
+  { uint32_t x57 = cmovznz32(x52, x36, x21);
   out[0] = x57;
   out[1] = x56;
   out[2] = x55;
diff --git a/src/Specific/montgomery32_2e137m13/feaddDisplay.log b/src/Specific/montgomery32_2e137m13/feaddDisplay.log
index ae3fa76fe..ce18e4d1f 100644
--- a/src/Specific/montgomery32_2e137m13/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e137m13/feaddDisplay.log
@@ -13,11 +13,11 @@ Interp-η
  uint32_t x45, uint8_t x46 = subborrow_u32(x43, x30, 0xffffffff);
  uint32_t x48, uint8_t x49 = subborrow_u32(x46, x33, 0x1ff);
  uint32_t _, uint8_t x52 = subborrow_u32(x49, x34, 0x0);
- uint32_t x53 = cmovznz(x52, x48, x33);
- uint32_t x54 = cmovznz(x52, x45, x30);
- uint32_t x55 = cmovznz(x52, x42, x27);
- uint32_t x56 = cmovznz(x52, x39, x24);
- uint32_t x57 = cmovznz(x52, x36, x21);
+ uint32_t x53 = cmovznz32(x52, x48, x33);
+ uint32_t x54 = cmovznz32(x52, x45, x30);
+ uint32_t x55 = cmovznz32(x52, x42, x27);
+ uint32_t x56 = cmovznz32(x52, x39, x24);
+ uint32_t x57 = cmovznz32(x52, x36, x21);
  return (x53, x54, x55, x56, x57))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e137m13/femul.c b/src/Specific/montgomery32_2e137m13/femul.c
index fd1e9b76a..95d505d62 100644
--- a/src/Specific/montgomery32_2e137m13/femul.c
+++ b/src/Specific/montgomery32_2e137m13/femul.c
@@ -178,11 +178,11 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x511; uint8_t x512 = _subborrow_u32(x509, x495, 0xffffffff, &x511);
   { uint32_t x514; uint8_t x515 = _subborrow_u32(x512, x498, 0x1ff, &x514);
   { uint32_t _; uint8_t x518 = _subborrow_u32(x515, x500, 0x0, &_);
-  { uint32_t x519 = cmovznz(x518, x514, x498);
-  { uint32_t x520 = cmovznz(x518, x511, x495);
-  { uint32_t x521 = cmovznz(x518, x508, x492);
-  { uint32_t x522 = cmovznz(x518, x505, x489);
-  { uint32_t x523 = cmovznz(x518, x502, x486);
+  { uint32_t x519 = cmovznz32(x518, x514, x498);
+  { uint32_t x520 = cmovznz32(x518, x511, x495);
+  { uint32_t x521 = cmovznz32(x518, x508, x492);
+  { uint32_t x522 = cmovznz32(x518, x505, x489);
+  { uint32_t x523 = cmovznz32(x518, x502, x486);
   out[0] = x523;
   out[1] = x522;
   out[2] = x521;
diff --git a/src/Specific/montgomery32_2e137m13/femulDisplay.log b/src/Specific/montgomery32_2e137m13/femulDisplay.log
index 0e1d03814..e2ecb1b74 100644
--- a/src/Specific/montgomery32_2e137m13/femulDisplay.log
+++ b/src/Specific/montgomery32_2e137m13/femulDisplay.log
@@ -171,11 +171,11 @@ Interp-η
  uint32_t x511, uint8_t x512 = subborrow_u32(x509, x495, 0xffffffff);
  uint32_t x514, uint8_t x515 = subborrow_u32(x512, x498, 0x1ff);
  uint32_t _, uint8_t x518 = subborrow_u32(x515, x500, 0x0);
- uint32_t x519 = cmovznz(x518, x514, x498);
- uint32_t x520 = cmovznz(x518, x511, x495);
- uint32_t x521 = cmovznz(x518, x508, x492);
- uint32_t x522 = cmovznz(x518, x505, x489);
- uint32_t x523 = cmovznz(x518, x502, x486);
+ uint32_t x519 = cmovznz32(x518, x514, x498);
+ uint32_t x520 = cmovznz32(x518, x511, x495);
+ uint32_t x521 = cmovznz32(x518, x508, x492);
+ uint32_t x522 = cmovznz32(x518, x505, x489);
+ uint32_t x523 = cmovznz32(x518, x502, x486);
  return (x519, x520, x521, x522, x523))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e137m13/feopp.c b/src/Specific/montgomery32_2e137m13/feopp.c
index b0be8f604..39924b58e 100644
--- a/src/Specific/montgomery32_2e137m13/feopp.c
+++ b/src/Specific/montgomery32_2e137m13/feopp.c
@@ -9,7 +9,7 @@ static void feopp(uint32_t out[5], const uint32_t in1[5]) {
   { uint32_t x16; uint8_t x17 = _subborrow_u32(x14, 0x0, x6, &x16);
   { uint32_t x19; uint8_t x20 = _subborrow_u32(x17, 0x0, x8, &x19);
   { uint32_t x22; uint8_t x23 = _subborrow_u32(x20, 0x0, x7, &x22);
-  { uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+  { uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
   { uint32_t x25 = (x24 & 0xfffffff3);
   { uint32_t x27; uint8_t x28 = _addcarryx_u32(0x0, x10, x25, &x27);
   { uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e137m13/feoppDisplay.log b/src/Specific/montgomery32_2e137m13/feoppDisplay.log
index 0d78fcafe..f1cfb1f67 100644
--- a/src/Specific/montgomery32_2e137m13/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e137m13/feoppDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x16, uint8_t x17 = subborrow_u32(x14, 0x0, x6);
  uint32_t x19, uint8_t x20 = subborrow_u32(x17, 0x0, x8);
  uint32_t x22, uint8_t x23 = subborrow_u32(x20, 0x0, x7);
- uint32_t x24 = (uint32_t)cmovznz(x23, 0x0, 0xffffffff);
+ uint32_t x24 = cmovznz32(x23, 0x0, 0xffffffff);
  uint32_t x25 = (x24 & 0xfffffff3);
  uint32_t x27, uint8_t x28 = addcarryx_u32(0x0, x10, x25);
  uint32_t x29 = (x24 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e137m13/fesub.c b/src/Specific/montgomery32_2e137m13/fesub.c
index deafb3894..ee8fe44ce 100644
--- a/src/Specific/montgomery32_2e137m13/fesub.c
+++ b/src/Specific/montgomery32_2e137m13/fesub.c
@@ -14,7 +14,7 @@ static void fesub(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, x9, x17, &x27);
   { uint32_t x30; uint8_t x31 = _subborrow_u32(x28, x11, x19, &x30);
   { uint32_t x33; uint8_t x34 = _subborrow_u32(x31, x10, x18, &x33);
-  { uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+  { uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
   { uint32_t x36 = (x35 & 0xfffffff3);
   { uint32_t x38; uint8_t x39 = _addcarryx_u32(0x0, x21, x36, &x38);
   { uint32_t x40 = (x35 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e137m13/fesubDisplay.log b/src/Specific/montgomery32_2e137m13/fesubDisplay.log
index 8b3d79a2b..795077b02 100644
--- a/src/Specific/montgomery32_2e137m13/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e137m13/fesubDisplay.log
@@ -7,7 +7,7 @@ Interp-η
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, x9, x17);
  uint32_t x30, uint8_t x31 = subborrow_u32(x28, x11, x19);
  uint32_t x33, uint8_t x34 = subborrow_u32(x31, x10, x18);
- uint32_t x35 = (uint32_t)cmovznz(x34, 0x0, 0xffffffff);
+ uint32_t x35 = cmovznz32(x34, 0x0, 0xffffffff);
  uint32_t x36 = (x35 & 0xfffffff3);
  uint32_t x38, uint8_t x39 = addcarryx_u32(0x0, x21, x36);
  uint32_t x40 = (x35 & 0xffffffff);