Update display logs and c files

10 files changed, 23 insertions, 23 deletions

diff --git a/src/Specific/NISTP256/AMD128/feaddDisplay.log b/src/Specific/NISTP256/AMD128/feaddDisplay.log
index ea6db527b..89d8839bf 100644
--- a/src/Specific/NISTP256/AMD128/feaddDisplay.log
+++ b/src/Specific/NISTP256/AMD128/feaddDisplay.log
@@ -7,8 +7,8 @@ Interp-η
  uint128_t x15, uint8_t x16 = subborrow_u128(0x0, x9, 0xffffffffffffffffffffffffL);
  uint128_t x18, uint8_t x19 = subborrow_u128(x16, x12, 0xffffffff000000010000000000000000L);
  uint128_t _, uint8_t x22 = subborrow_u128(x19, x13, 0x0);
- uint128_t x23 = cmovznz(x22, x18, x12);
- uint128_t x24 = cmovznz(x22, x15, x9);
+ uint128_t x23 = cmovznz128(x22, x18, x12);
+ uint128_t x24 = cmovznz128(x22, x15, x9);
  return (x23, x24))
 (x, x0)%core
      : word128 * word128 → word128 * word128 → ReturnType (uint128_t * uint128_t)
diff --git a/src/Specific/NISTP256/AMD128/femulDisplay.log b/src/Specific/NISTP256/AMD128/femulDisplay.log
index 3edcd5cba..96bc3e200 100644
--- a/src/Specific/NISTP256/AMD128/femulDisplay.log
+++ b/src/Specific/NISTP256/AMD128/femulDisplay.log
@@ -33,8 +33,8 @@ Interp-η
  uint128_t x91, uint8_t x92 = subborrow_u128(0x0, x84, 0xffffffffffffffffffffffffL);
  uint128_t x94, uint8_t x95 = subborrow_u128(x92, x87, 0xffffffff000000010000000000000000L);
  uint128_t _, uint8_t x98 = subborrow_u128(x95, x89, 0x0);
- uint128_t x99 = cmovznz(x98, x94, x87);
- uint128_t x100 = cmovznz(x98, x91, x84);
+ uint128_t x99 = cmovznz128(x98, x94, x87);
+ uint128_t x100 = cmovznz128(x98, x91, x84);
  return (x99, x100))
 (x, x0)%core
      : word128 * word128 → word128 * word128 → ReturnType (uint128_t * uint128_t)
diff --git a/src/Specific/NISTP256/AMD128/feoppDisplay.log b/src/Specific/NISTP256/AMD128/feoppDisplay.log
index ea60d9f66..f3b1f606f 100644
--- a/src/Specific/NISTP256/AMD128/feoppDisplay.log
+++ b/src/Specific/NISTP256/AMD128/feoppDisplay.log
@@ -4,7 +4,7 @@ Interp-η
  λ '(x1, x2)%core,
  uint128_t x4, uint8_t x5 = subborrow_u128(0x0, 0x0, x2);
  uint128_t x7, uint8_t x8 = subborrow_u128(x5, 0x0, x1);
- uint128_t x9 = (uint128_t)cmovznz(x8, 0x0, 0xffffffffffffffffffffffffffffffffL);
+ uint128_t x9 = cmovznz128(x8, 0x0, 0xffffffffffffffffffffffffffffffffL);
  uint128_t x10 = (x9 & 0xffffffffffffffffffffffffL);
  uint128_t x12, uint8_t x13 = addcarryx_u128(0x0, x4, x10);
  uint128_t x14 = (x9 & 0xffffffff000000010000000000000000L);
diff --git a/src/Specific/NISTP256/AMD128/fesubDisplay.log b/src/Specific/NISTP256/AMD128/fesubDisplay.log
index 70f224d33..5136e376d 100644
--- a/src/Specific/NISTP256/AMD128/fesubDisplay.log
+++ b/src/Specific/NISTP256/AMD128/fesubDisplay.log
@@ -4,7 +4,7 @@ Interp-η
  λ '(x4, x5, (x6, x7))%core,
  uint128_t x9, uint8_t x10 = subborrow_u128(0x0, x5, x7);
  uint128_t x12, uint8_t x13 = subborrow_u128(x10, x4, x6);
- uint128_t x14 = (uint128_t)cmovznz(x13, 0x0, 0xffffffffffffffffffffffffffffffffL);
+ uint128_t x14 = cmovznz128(x13, 0x0, 0xffffffffffffffffffffffffffffffffL);
  uint128_t x15 = (x14 & 0xffffffffffffffffffffffffL);
  uint128_t x17, uint8_t x18 = addcarryx_u128(0x0, x9, x15);
  uint128_t x19 = (x14 & 0xffffffff000000010000000000000000L);
diff --git a/src/Specific/NISTP256/AMD64/feaddDisplay.log b/src/Specific/NISTP256/AMD64/feaddDisplay.log
index ba7a2f50d..9849e94ae 100644
--- a/src/Specific/NISTP256/AMD64/feaddDisplay.log
+++ b/src/Specific/NISTP256/AMD64/feaddDisplay.log
@@ -11,10 +11,10 @@ Interp-η
  uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0x0);
  uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xffffffff00000001L);
  uint64_t _, uint8_t x42 = subborrow_u64(x39, x27, 0x0);
- uint64_t x43 = cmovznz(x42, x38, x26);
- uint64_t x44 = cmovznz(x42, x35, x23);
- uint64_t x45 = cmovznz(x42, x32, x20);
- uint64_t x46 = cmovznz(x42, x29, x17);
+ uint64_t x43 = cmovznz64(x42, x38, x26);
+ uint64_t x44 = cmovznz64(x42, x35, x23);
+ uint64_t x45 = cmovznz64(x42, x32, x20);
+ uint64_t x46 = cmovznz64(x42, x29, x17);
  return (x43, x44, x45, x46))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/NISTP256/AMD64/femulDisplay.log b/src/Specific/NISTP256/AMD64/femulDisplay.log
index 78afa86fa..1ad198fe0 100644
--- a/src/Specific/NISTP256/AMD64/femulDisplay.log
+++ b/src/Specific/NISTP256/AMD64/femulDisplay.log
@@ -105,10 +105,10 @@ Interp-η
  uint64_t x311, uint8_t x312 = subborrow_u64(x309, x298, 0x0);
  uint64_t x314, uint8_t x315 = subborrow_u64(x312, x301, 0xffffffff00000001L);
  uint64_t _, uint8_t x318 = subborrow_u64(x315, x303, 0x0);
- uint64_t x319 = cmovznz(x318, x314, x301);
- uint64_t x320 = cmovznz(x318, x311, x298);
- uint64_t x321 = cmovznz(x318, x308, x295);
- uint64_t x322 = cmovznz(x318, x305, x292);
+ uint64_t x319 = cmovznz64(x318, x314, x301);
+ uint64_t x320 = cmovznz64(x318, x311, x298);
+ uint64_t x321 = cmovznz64(x318, x308, x295);
+ uint64_t x322 = cmovznz64(x318, x305, x292);
  return (x319, x320, x321, x322))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)
diff --git a/src/Specific/NISTP256/AMD64/feoppDisplay.log b/src/Specific/NISTP256/AMD64/feoppDisplay.log
index 87297dfac..b08bcd7fb 100644
--- a/src/Specific/NISTP256/AMD64/feoppDisplay.log
+++ b/src/Specific/NISTP256/AMD64/feoppDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x11, uint8_t x12 = subborrow_u64(x9, 0x0, x4);
  uint64_t x14, uint8_t x15 = subborrow_u64(x12, 0x0, x6);
  uint64_t x17, uint8_t x18 = subborrow_u64(x15, 0x0, x5);
- uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+ uint64_t x19 = cmovznz64(x18, 0x0, 0xffffffffffffffffL);
  uint64_t x20 = (x19 & 0xffffffffffffffffL);
  uint64_t x22, uint8_t x23 = addcarryx_u64(0x0, x8, x20);
  uint64_t x24 = (x19 & 0xffffffff);
diff --git a/src/Specific/NISTP256/AMD64/fesubDisplay.log b/src/Specific/NISTP256/AMD64/fesubDisplay.log
index 410fead3f..9175c3383 100644
--- a/src/Specific/NISTP256/AMD64/fesubDisplay.log
+++ b/src/Specific/NISTP256/AMD64/fesubDisplay.log
@@ -6,7 +6,7 @@ Interp-η
  uint64_t x20, uint8_t x21 = subborrow_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = subborrow_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = subborrow_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t)cmovznz(x27, 0x0, 0xffffffffffffffffL);
+ uint64_t x28 = cmovznz64(x27, 0x0, 0xffffffffffffffffL);
  uint64_t x29 = (x28 & 0xffffffffffffffffL);
  uint64_t x31, uint8_t x32 = addcarryx_u64(0x0, x17, x29);
  uint64_t x33 = (x28 & 0xffffffff);
diff --git a/src/Specific/montgomery64_2e389m21/femulDisplay.log b/src/Specific/montgomery64_2e389m21/femulDisplay.log
index e85f8a75f..302439898 100644
--- a/src/Specific/montgomery64_2e389m21/femulDisplay.log
+++ b/src/Specific/montgomery64_2e389m21/femulDisplay.log
@@ -23,7 +23,7 @@ Interp-η
  uint64_t x83, uint64_t x84 = mulx_u64(x71, 0xffffffffffffffffL);
  uint64_t x86, uint64_t x87 = mulx_u64(x71, 0xffffffffffffffffL);
  uint64_t x89, uint64_t x90 = mulx_u64(x71, 0xffffffffffffffffL);
- uint64_t x92, uint8_t x93 = mulx_u64_out_u8(x71, 0x1f);
+ uint64_t x92, uint8_t x93 = Op (Syntax.MulSplit 64 (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x71, 0x1f);
  uint64_t x95, uint8_t x96 = addcarryx_u64(0x0, x75, x77);
  uint64_t x98, uint8_t x99 = addcarryx_u64(x96, x78, x80);
  uint64_t x101, uint8_t x102 = addcarryx_u64(x99, x81, x83);
@@ -68,7 +68,7 @@ Interp-η
  uint64_t x216, uint64_t x217 = mulx_u64(x204, 0xffffffffffffffffL);
  uint64_t x219, uint64_t x220 = mulx_u64(x204, 0xffffffffffffffffL);
  uint64_t x222, uint64_t x223 = mulx_u64(x204, 0xffffffffffffffffL);
- uint64_t x225, uint8_t x226 = mulx_u64_out_u8(x204, 0x1f);
+ uint64_t x225, uint8_t x226 = Op (Syntax.MulSplit 64 (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x204, 0x1f);
  uint64_t x228, uint8_t x229 = addcarryx_u64(0x0, x208, x210);
  uint64_t x231, uint8_t x232 = addcarryx_u64(x229, x211, x213);
  uint64_t x234, uint8_t x235 = addcarryx_u64(x232, x214, x216);
@@ -114,7 +114,7 @@ Interp-η
  uint64_t x350, uint64_t x351 = mulx_u64(x338, 0xffffffffffffffffL);
  uint64_t x353, uint64_t x354 = mulx_u64(x338, 0xffffffffffffffffL);
  uint64_t x356, uint64_t x357 = mulx_u64(x338, 0xffffffffffffffffL);
- uint64_t x359, uint8_t x360 = mulx_u64_out_u8(x338, 0x1f);
+ uint64_t x359, uint8_t x360 = Op (Syntax.MulSplit 64 (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x338, 0x1f);
  uint64_t x362, uint8_t x363 = addcarryx_u64(0x0, x342, x344);
  uint64_t x365, uint8_t x366 = addcarryx_u64(x363, x345, x347);
  uint64_t x368, uint8_t x369 = addcarryx_u64(x366, x348, x350);
@@ -160,7 +160,7 @@ Interp-η
  uint64_t x484, uint64_t x485 = mulx_u64(x472, 0xffffffffffffffffL);
  uint64_t x487, uint64_t x488 = mulx_u64(x472, 0xffffffffffffffffL);
  uint64_t x490, uint64_t x491 = mulx_u64(x472, 0xffffffffffffffffL);
- uint64_t x493, uint8_t x494 = mulx_u64_out_u8(x472, 0x1f);
+ uint64_t x493, uint8_t x494 = Op (Syntax.MulSplit 64 (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x472, 0x1f);
  uint64_t x496, uint8_t x497 = addcarryx_u64(0x0, x476, x478);
  uint64_t x499, uint8_t x500 = addcarryx_u64(x497, x479, x481);
  uint64_t x502, uint8_t x503 = addcarryx_u64(x500, x482, x484);
@@ -206,7 +206,7 @@ Interp-η
  uint64_t x618, uint64_t x619 = mulx_u64(x606, 0xffffffffffffffffL);
  uint64_t x621, uint64_t x622 = mulx_u64(x606, 0xffffffffffffffffL);
  uint64_t x624, uint64_t x625 = mulx_u64(x606, 0xffffffffffffffffL);
- uint64_t x627, uint8_t x628 = mulx_u64_out_u8(x606, 0x1f);
+ uint64_t x627, uint8_t x628 = Op (Syntax.MulSplit 64 (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x606, 0x1f);
  uint64_t x630, uint8_t x631 = addcarryx_u64(0x0, x610, x612);
  uint64_t x633, uint8_t x634 = addcarryx_u64(x631, x613, x615);
  uint64_t x636, uint8_t x637 = addcarryx_u64(x634, x616, x618);
@@ -252,7 +252,7 @@ Interp-η
  uint64_t x752, uint64_t x753 = mulx_u64(x740, 0xffffffffffffffffL);
  uint64_t x755, uint64_t x756 = mulx_u64(x740, 0xffffffffffffffffL);
  uint64_t x758, uint64_t x759 = mulx_u64(x740, 0xffffffffffffffffL);
- uint64_t x761, uint8_t x762 = mulx_u64_out_u8(x740, 0x1f);
+ uint64_t x761, uint8_t x762 = Op (Syntax.MulSplit 64 (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x740, 0x1f);
  uint64_t x764, uint8_t x765 = addcarryx_u64(0x0, x744, x746);
  uint64_t x767, uint8_t x768 = addcarryx_u64(x765, x747, x749);
  uint64_t x770, uint8_t x771 = addcarryx_u64(x768, x750, x752);
@@ -298,7 +298,7 @@ Interp-η
  uint64_t x886, uint64_t x887 = mulx_u64(x874, 0xffffffffffffffffL);
  uint64_t x889, uint64_t x890 = mulx_u64(x874, 0xffffffffffffffffL);
  uint64_t x892, uint64_t x893 = mulx_u64(x874, 0xffffffffffffffffL);
- uint64_t x895, uint8_t x896 = mulx_u64_out_u8(x874, 0x1f);
+ uint64_t x895, uint8_t x896 = Op (Syntax.MulSplit 64 (Syntax.TWord 6) (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x874, 0x1f);
  uint64_t x898, uint8_t x899 = addcarryx_u64(0x0, x878, x880);
  uint64_t x901, uint8_t x902 = addcarryx_u64(x899, x881, x883);
  uint64_t x904, uint8_t x905 = addcarryx_u64(x902, x884, x886);
diff --git a/src/Specific/solinas64_2e256m88x2e240m1/femulDisplay.log b/src/Specific/solinas64_2e256m88x2e240m1/femulDisplay.log
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/Specific/solinas64_2e256m88x2e240m1/femulDisplay.log