8 files changed, 28 insertions, 28 deletions
diff --git a/src/Specific/montgomery32_2e174m17/feadd.c b/src/Specific/montgomery32_2e174m17/feadd.c
index 2c1967002..a361d09df 100644
--- a/src/Specific/montgomery32_2e174m17/feadd.c
+++ b/src/Specific/montgomery32_2e174m17/feadd.c
@@ -24,12 +24,12 @@ static void feadd(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x55; uint8_t x56 = _subborrow_u32(x53, x37, 0xffffffff, &x55);
   { uint32_t x58; uint8_t x59 = _subborrow_u32(x56, x40, 0x3fff, &x58);
   { uint32_t _; uint8_t x62 = _subborrow_u32(x59, x41, 0x0, &_);
-  { uint32_t x63 = cmovznz(x62, x58, x40);
-  { uint32_t x64 = cmovznz(x62, x55, x37);
-  { uint32_t x65 = cmovznz(x62, x52, x34);
-  { uint32_t x66 = cmovznz(x62, x49, x31);
-  { uint32_t x67 = cmovznz(x62, x46, x28);
-  { uint32_t x68 = cmovznz(x62, x43, x25);
+  { uint32_t x63 = cmovznz32(x62, x58, x40);
+  { uint32_t x64 = cmovznz32(x62, x55, x37);
+  { uint32_t x65 = cmovznz32(x62, x52, x34);
+  { uint32_t x66 = cmovznz32(x62, x49, x31);
+  { uint32_t x67 = cmovznz32(x62, x46, x28);
+  { uint32_t x68 = cmovznz32(x62, x43, x25);
   out[0] = x68;
   out[1] = x67;
   out[2] = x66;
diff --git a/src/Specific/montgomery32_2e174m17/feaddDisplay.log b/src/Specific/montgomery32_2e174m17/feaddDisplay.log
index de742aef3..31e22218b 100644
--- a/src/Specific/montgomery32_2e174m17/feaddDisplay.log
+++ b/src/Specific/montgomery32_2e174m17/feaddDisplay.log
@@ -15,12 +15,12 @@ Interp-η
  uint32_t x55, uint8_t x56 = subborrow_u32(x53, x37, 0xffffffff);
  uint32_t x58, uint8_t x59 = subborrow_u32(x56, x40, 0x3fff);
  uint32_t _, uint8_t x62 = subborrow_u32(x59, x41, 0x0);
- uint32_t x63 = cmovznz(x62, x58, x40);
- uint32_t x64 = cmovznz(x62, x55, x37);
- uint32_t x65 = cmovznz(x62, x52, x34);
- uint32_t x66 = cmovznz(x62, x49, x31);
- uint32_t x67 = cmovznz(x62, x46, x28);
- uint32_t x68 = cmovznz(x62, x43, x25);
+ uint32_t x63 = cmovznz32(x62, x58, x40);
+ uint32_t x64 = cmovznz32(x62, x55, x37);
+ uint32_t x65 = cmovznz32(x62, x52, x34);
+ uint32_t x66 = cmovznz32(x62, x49, x31);
+ uint32_t x67 = cmovznz32(x62, x46, x28);
+ uint32_t x68 = cmovznz32(x62, x43, x25);
  return (x63, x64, x65, x66, x67, x68))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e174m17/femul.c b/src/Specific/montgomery32_2e174m17/femul.c
index e713bda8f..b24bb3ee2 100644
--- a/src/Specific/montgomery32_2e174m17/femul.c
+++ b/src/Specific/montgomery32_2e174m17/femul.c
@@ -250,12 +250,12 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x723; uint8_t x724 = _subborrow_u32(x721, x704, 0xffffffff, &x723);
   { uint32_t x726; uint8_t x727 = _subborrow_u32(x724, x707, 0x3fff, &x726);
   { uint32_t _; uint8_t x730 = _subborrow_u32(x727, x709, 0x0, &_);
-  { uint32_t x731 = cmovznz(x730, x726, x707);
-  { uint32_t x732 = cmovznz(x730, x723, x704);
-  { uint32_t x733 = cmovznz(x730, x720, x701);
-  { uint32_t x734 = cmovznz(x730, x717, x698);
-  { uint32_t x735 = cmovznz(x730, x714, x695);
-  { uint32_t x736 = cmovznz(x730, x711, x692);
+  { uint32_t x731 = cmovznz32(x730, x726, x707);
+  { uint32_t x732 = cmovznz32(x730, x723, x704);
+  { uint32_t x733 = cmovznz32(x730, x720, x701);
+  { uint32_t x734 = cmovznz32(x730, x717, x698);
+  { uint32_t x735 = cmovznz32(x730, x714, x695);
+  { uint32_t x736 = cmovznz32(x730, x711, x692);
   out[0] = x736;
   out[1] = x735;
   out[2] = x734;
diff --git a/src/Specific/montgomery32_2e174m17/femulDisplay.log b/src/Specific/montgomery32_2e174m17/femulDisplay.log
index 90a669291..047054f7e 100644
--- a/src/Specific/montgomery32_2e174m17/femulDisplay.log
+++ b/src/Specific/montgomery32_2e174m17/femulDisplay.log
@@ -241,12 +241,12 @@ Interp-η
  uint32_t x723, uint8_t x724 = subborrow_u32(x721, x704, 0xffffffff);
  uint32_t x726, uint8_t x727 = subborrow_u32(x724, x707, 0x3fff);
  uint32_t _, uint8_t x730 = subborrow_u32(x727, x709, 0x0);
- uint32_t x731 = cmovznz(x730, x726, x707);
- uint32_t x732 = cmovznz(x730, x723, x704);
- uint32_t x733 = cmovznz(x730, x720, x701);
- uint32_t x734 = cmovznz(x730, x717, x698);
- uint32_t x735 = cmovznz(x730, x714, x695);
- uint32_t x736 = cmovznz(x730, x711, x692);
+ uint32_t x731 = cmovznz32(x730, x726, x707);
+ uint32_t x732 = cmovznz32(x730, x723, x704);
+ uint32_t x733 = cmovznz32(x730, x720, x701);
+ uint32_t x734 = cmovznz32(x730, x717, x698);
+ uint32_t x735 = cmovznz32(x730, x714, x695);
+ uint32_t x736 = cmovznz32(x730, x711, x692);
  return (x731, x732, x733, x734, x735, x736))
 (x, x0)%core
      : word32 * word32 * word32 * word32 * word32 * word32 → word32 * word32 * word32 * word32 * word32 * word32 → ReturnType (uint32_t * uint32_t * uint32_t * uint32_t * uint32_t * uint32_t)
diff --git a/src/Specific/montgomery32_2e174m17/feopp.c b/src/Specific/montgomery32_2e174m17/feopp.c
index c4e407fe1..65336f912 100644
--- a/src/Specific/montgomery32_2e174m17/feopp.c
+++ b/src/Specific/montgomery32_2e174m17/feopp.c
@@ -11,7 +11,7 @@ static void feopp(uint32_t out[6], const uint32_t in1[6]) {
   { uint32_t x21; uint8_t x22 = _subborrow_u32(x19, 0x0, x8, &x21);
   { uint32_t x24; uint8_t x25 = _subborrow_u32(x22, 0x0, x10, &x24);
   { uint32_t x27; uint8_t x28 = _subborrow_u32(x25, 0x0, x9, &x27);
-  { uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+  { uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
   { uint32_t x30 = (x29 & 0xffffffef);
   { uint32_t x32; uint8_t x33 = _addcarryx_u32(0x0, x12, x30, &x32);
   { uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m17/feoppDisplay.log b/src/Specific/montgomery32_2e174m17/feoppDisplay.log
index c52675634..189315f28 100644
--- a/src/Specific/montgomery32_2e174m17/feoppDisplay.log
+++ b/src/Specific/montgomery32_2e174m17/feoppDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x21, uint8_t x22 = subborrow_u32(x19, 0x0, x8);
  uint32_t x24, uint8_t x25 = subborrow_u32(x22, 0x0, x10);
  uint32_t x27, uint8_t x28 = subborrow_u32(x25, 0x0, x9);
- uint32_t x29 = (uint32_t)cmovznz(x28, 0x0, 0xffffffff);
+ uint32_t x29 = cmovznz32(x28, 0x0, 0xffffffff);
  uint32_t x30 = (x29 & 0xffffffef);
  uint32_t x32, uint8_t x33 = addcarryx_u32(0x0, x12, x30);
  uint32_t x34 = (x29 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m17/fesub.c b/src/Specific/montgomery32_2e174m17/fesub.c
index 0e395b59f..e66d18339 100644
--- a/src/Specific/montgomery32_2e174m17/fesub.c
+++ b/src/Specific/montgomery32_2e174m17/fesub.c
@@ -17,7 +17,7 @@ static void fesub(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x34; uint8_t x35 = _subborrow_u32(x32, x11, x21, &x34);
   { uint32_t x37; uint8_t x38 = _subborrow_u32(x35, x13, x23, &x37);
   { uint32_t x40; uint8_t x41 = _subborrow_u32(x38, x12, x22, &x40);
-  { uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+  { uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
   { uint32_t x43 = (x42 & 0xffffffef);
   { uint32_t x45; uint8_t x46 = _addcarryx_u32(0x0, x25, x43, &x45);
   { uint32_t x47 = (x42 & 0xffffffff);
diff --git a/src/Specific/montgomery32_2e174m17/fesubDisplay.log b/src/Specific/montgomery32_2e174m17/fesubDisplay.log
index 8d11cefbd..d5763203a 100644
--- a/src/Specific/montgomery32_2e174m17/fesubDisplay.log
+++ b/src/Specific/montgomery32_2e174m17/fesubDisplay.log
@@ -8,7 +8,7 @@ Interp-η
  uint32_t x34, uint8_t x35 = subborrow_u32(x32, x11, x21);
  uint32_t x37, uint8_t x38 = subborrow_u32(x35, x13, x23);
  uint32_t x40, uint8_t x41 = subborrow_u32(x38, x12, x22);
- uint32_t x42 = (uint32_t)cmovznz(x41, 0x0, 0xffffffff);
+ uint32_t x42 = cmovznz32(x41, 0x0, 0xffffffff);
  uint32_t x43 = (x42 & 0xffffffef);
  uint32_t x45, uint8_t x46 = addcarryx_u32(0x0, x25, x43);
  uint32_t x47 = (x42 & 0xffffffff);