make display on p256

4 files changed, 36 insertions, 30 deletions

diff --git a/src/Specific/IntegrationTestMontgomeryP256_128Display.log b/src/Specific/IntegrationTestMontgomeryP256_128Display.log
index edbd68b94..ff714ff16 100644
--- a/src/Specific/IntegrationTestMontgomeryP256_128Display.log
+++ b/src/Specific/IntegrationTestMontgomeryP256_128Display.log
@@ -30,11 +30,12 @@ Interp-η
  uint128_t x84, uint8_t x85 = addcarryx_u128(x82, x60, x75);
  uint128_t x87, uint8_t x88 = addcarryx_u128(x85, x63, x78);
  uint8_t x89 = x88 + x64;
- uint128_t x90 = (uint128_t) (x89 == 0 ? 0x0 : 0xffffffffffffffffffffffffffffffffL);
- uint128_t x91 = x90 & 0xffffffffffffffffffffffffL;
- uint128_t x93, uint8_t x94 = subborrow_u128(0x0, x84, x91);
- uint128_t x95 = x90 & 0xffffffff000000010000000000000000L;
- uint128_t x97, uint8_t _ = subborrow_u128(x94, x87, x95);
- (Return x97, Return x93))
+ uint128_t x91, uint8_t x92 = subborrow_u128(0x0, x84, 0xffffffffffffffffffffffffL);
+ uint128_t x94, uint8_t x95 = subborrow_u128(x92, x87, 0xffffffff000000010000000000000000L);
+ ℤ x96 = Op (Syntax.Opp (Syntax.TWord 3) Syntax.TZ) (Return x95);
+ uint128_t _, ℤ x99 = addcarryx_u128ℤ(0x0, x96, x89);
+ uint128_t x100 = x99 == 0 ? x94 : x87;
+ uint128_t x101 = x99 == 0 ? x91 : x84;
+ return (x100, x101))
 (x, x0)%core
      : word128 * word128 → word128 * word128 → ReturnType (uint128_t * uint128_t)
diff --git a/src/Specific/IntegrationTestMontgomeryP256_128_AddDisplay.log b/src/Specific/IntegrationTestMontgomeryP256_128_AddDisplay.log
index 094e97fdb..ea170fc85 100644
--- a/src/Specific/IntegrationTestMontgomeryP256_128_AddDisplay.log
+++ b/src/Specific/IntegrationTestMontgomeryP256_128_AddDisplay.log
@@ -4,11 +4,12 @@ Interp-η
  λ '(x4, x5, (x6, x7))%core,
  uint128_t x9, uint8_t x10 = addcarryx_u128(0x0, x5, x7);
  uint128_t x12, uint8_t x13 = addcarryx_u128(x10, x4, x6);
- uint128_t x14 = (uint128_t) (x13 == 0 ? 0x0 : 0xffffffffffffffffffffffffffffffffL);
- uint128_t x15 = x14 & 0xffffffffffffffffffffffffL;
- uint128_t x17, uint8_t x18 = subborrow_u128(0x0, x9, x15);
- uint128_t x19 = x14 & 0xffffffff000000010000000000000000L;
- uint128_t x21, uint8_t _ = subborrow_u128(x18, x12, x19);
- (Return x21, Return x17))
+ uint128_t x15, uint8_t x16 = subborrow_u128(0x0, x9, 0xffffffffffffffffffffffffL);
+ uint128_t x18, uint8_t x19 = subborrow_u128(x16, x12, 0xffffffff000000010000000000000000L);
+ ℤ x20 = Op (Syntax.Opp (Syntax.TWord 3) Syntax.TZ) (Return x19);
+ uint128_t _, ℤ x23 = addcarryx_u128ℤ(0x0, x20, x13);
+ uint128_t x24 = x23 == 0 ? x18 : x12;
+ uint128_t x25 = x23 == 0 ? x15 : x9;
+ return (x24, x25))
 (x, x0)%core
      : word128 * word128 → word128 * word128 → ReturnType (uint128_t * uint128_t)
diff --git a/src/Specific/NISTP256/AMD64/IntegrationTestMontgomeryP256Display.log b/src/Specific/NISTP256/AMD64/IntegrationTestMontgomeryP256Display.log
index 48cc4785d..3c47f3fc9 100644
--- a/src/Specific/NISTP256/AMD64/IntegrationTestMontgomeryP256Display.log
+++ b/src/Specific/NISTP256/AMD64/IntegrationTestMontgomeryP256Display.log
@@ -100,14 +100,16 @@ Interp-η
  uint64_t x298, uint8_t x299 = addcarryx_u64(x296, x262, x283);
  uint64_t x301, uint8_t x302 = addcarryx_u64(x299, x265, x286);
  uint8_t x303 = x302 + x266;
- uint64_t x304 = (uint64_t) (x303 == 0 ? 0x0 : 0xffffffffffffffffL);
- uint64_t x305 = x304 & 0xffffffffffffffffL;
- uint64_t x307, uint8_t x308 = subborrow_u64(0x0, x292, x305);
- uint64_t x309 = x304 & 0xffffffff;
- uint64_t x311, uint8_t x312 = subborrow_u64(x308, x295, x309);
- uint64_t x314, uint8_t x315 = subborrow_u64(x312, x298, 0x0);
- uint64_t x316 = x304 & 0xffffffff00000001L;
- uint64_t x318, uint8_t _ = subborrow_u64(x315, x301, x316);
- (Return x318, Return x314, Return x311, Return x307))
+ uint64_t x305, uint8_t x306 = subborrow_u64(0x0, x292, 0xffffffffffffffffL);
+ uint64_t x308, uint8_t x309 = subborrow_u64(x306, x295, 0xffffffff);
+ uint64_t x311, uint8_t x312 = subborrow_u64(x309, x298, 0x0);
+ uint64_t x314, uint8_t x315 = subborrow_u64(x312, x301, 0xffffffff00000001L);
+ ℤ x316 = Op (Syntax.Opp (Syntax.TWord 3) Syntax.TZ) (Return x315);
+ uint64_t _, ℤ x319 = addcarryx_u64ℤ(0x0, x316, x303);
+ uint64_t x320 = x319 == 0 ? x314 : x301;
+ uint64_t x321 = x319 == 0 ? x311 : x298;
+ uint64_t x322 = x319 == 0 ? x308 : x295;
+ uint64_t x323 = x319 == 0 ? x305 : x292;
+ return (x320, x321, x322, x323))
 (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/IntegrationTestMontgomeryP256_AddDisplay.log b/src/Specific/NISTP256/AMD64/IntegrationTestMontgomeryP256_AddDisplay.log
index 289227f85..0f46e27f6 100644
--- a/src/Specific/NISTP256/AMD64/IntegrationTestMontgomeryP256_AddDisplay.log
+++ b/src/Specific/NISTP256/AMD64/IntegrationTestMontgomeryP256_AddDisplay.log
@@ -6,14 +6,16 @@ Interp-η
  uint64_t x20, uint8_t x21 = addcarryx_u64(x18, x7, x13);
  uint64_t x23, uint8_t x24 = addcarryx_u64(x21, x9, x15);
  uint64_t x26, uint8_t x27 = addcarryx_u64(x24, x8, x14);
- uint64_t x28 = (uint64_t) (x27 == 0 ? 0x0 : 0xffffffffffffffffL);
- uint64_t x29 = x28 & 0xffffffffffffffffL;
- uint64_t x31, uint8_t x32 = subborrow_u64(0x0, x17, x29);
- uint64_t x33 = x28 & 0xffffffff;
- uint64_t x35, uint8_t x36 = subborrow_u64(x32, x20, x33);
- uint64_t x38, uint8_t x39 = subborrow_u64(x36, x23, 0x0);
- uint64_t x40 = x28 & 0xffffffff00000001L;
- uint64_t x42, uint8_t _ = subborrow_u64(x39, x26, x40);
- (Return x42, Return x38, Return x35, Return x31))
+ uint64_t x29, uint8_t x30 = subborrow_u64(0x0, x17, 0xffffffffffffffffL);
+ uint64_t x32, uint8_t x33 = subborrow_u64(x30, x20, 0xffffffff);
+ uint64_t x35, uint8_t x36 = subborrow_u64(x33, x23, 0x0);
+ uint64_t x38, uint8_t x39 = subborrow_u64(x36, x26, 0xffffffff00000001L);
+ ℤ x40 = Op (Syntax.Opp (Syntax.TWord 3) Syntax.TZ) (Return x39);
+ uint64_t _, ℤ x43 = addcarryx_u64ℤ(0x0, x40, x27);
+ uint64_t x44 = x43 == 0 ? x38 : x26;
+ uint64_t x45 = x43 == 0 ? x35 : x23;
+ uint64_t x46 = x43 == 0 ? x32 : x20;
+ uint64_t x47 = x43 == 0 ? x29 : x17;
+ return (x44, x45, x46, x47))
 (x, x0)%core
      : word64 * word64 * word64 * word64 → word64 * word64 * word64 * word64 → ReturnType (uint64_t * uint64_t * uint64_t * uint64_t)