Update display logs and c files

3 files changed, 109 insertions, 126 deletions

diff --git a/src/Specific/solinas64_2e256m189/femul.c b/src/Specific/solinas64_2e256m189/femul.c
index 4c4e7a2e4..aa2dbbea0 100644
--- a/src/Specific/solinas64_2e256m189/femul.c
+++ b/src/Specific/solinas64_2e256m189/femul.c
@@ -1,51 +1,43 @@
-#include <stdint.h>
-#include <stdbool.h>
-#include <x86intrin.h>
-#include "liblow.h"
-
-#include "femul.h"
-
-typedef unsigned int uint128_t __attribute__((mode(TI)));
-
-#if (defined(__GNUC__) || defined(__GNUG__)) && !(defined(__clang__)||defined(__INTEL_COMPILER))
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81294
-#define _subborrow_u32 __builtin_ia32_sbb_u32
-#define _subborrow_u64 __builtin_ia32_sbb_u64
-#endif
-
-#undef force_inline
-#define force_inline __attribute__((always_inline))
-
-void force_inline femul(uint64_t* out, uint64_t x10, uint64_t x11, uint64_t x9, uint64_t x7, uint64_t x5, uint64_t x18, uint64_t x19, uint64_t x17, uint64_t x15, uint64_t x13)
-{  uint128_t x20 = (((uint128_t)x5 * x18) + ((0x2 * ((uint128_t)x7 * x19)) + ((0x2 * ((uint128_t)x9 * x17)) + ((0x2 * ((uint128_t)x11 * x15)) + ((uint128_t)x10 * x13)))));
-{  uint128_t x21 = ((((uint128_t)x5 * x19) + ((0x2 * ((uint128_t)x7 * x17)) + ((0x2 * ((uint128_t)x9 * x15)) + ((uint128_t)x11 * x13)))) + (0xbd * ((uint128_t)x10 * x18)));
-{  uint128_t x22 = ((((uint128_t)x5 * x17) + ((0x2 * ((uint128_t)x7 * x15)) + ((uint128_t)x9 * x13))) + (0xbd * (((uint128_t)x11 * x18) + ((uint128_t)x10 * x19))));
-{  uint128_t x23 = ((((uint128_t)x5 * x15) + ((uint128_t)x7 * x13)) + (0xbd * (((uint128_t)x9 * x18) + (((uint128_t)x11 * x19) + ((uint128_t)x10 * x17)))));
-{  uint128_t x24 = (((uint128_t)x5 * x13) + (0xbd * ((0x2 * ((uint128_t)x7 * x18)) + ((0x2 * ((uint128_t)x9 * x19)) + ((0x2 * ((uint128_t)x11 * x17)) + (0x2 * ((uint128_t)x10 * x15)))))));
-{  uint128_t x25 = (x24 >> 0x34);
-{  uint64_t x26 = ((uint64_t)x24 & 0xfffffffffffff);
-{  uint128_t x27 = (x25 + x23);
-{  uint64_t x28 = (uint64_t) (x27 >> 0x33);
-{  uint64_t x29 = ((uint64_t)x27 & 0x7ffffffffffff);
-{  uint128_t x30 = (x28 + x22);
-{  uint64_t x31 = (uint64_t) (x30 >> 0x33);
-{  uint64_t x32 = ((uint64_t)x30 & 0x7ffffffffffff);
-{  uint128_t x33 = (x31 + x21);
-{  uint64_t x34 = (uint64_t) (x33 >> 0x33);
-{  uint64_t x35 = ((uint64_t)x33 & 0x7ffffffffffff);
-{  uint128_t x36 = (x34 + x20);
-{  uint64_t x37 = (uint64_t) (x36 >> 0x33);
-{  uint64_t x38 = ((uint64_t)x36 & 0x7ffffffffffff);
-{  uint128_t x39 = (x26 + ((uint128_t)0xbd * x37));
-{  uint64_t x40 = (uint64_t) (x39 >> 0x34);
-{  uint64_t x41 = ((uint64_t)x39 & 0xfffffffffffff);
-{  uint64_t x42 = (x40 + x29);
-{  uint64_t x43 = (x42 >> 0x33);
-{  uint64_t x44 = (x42 & 0x7ffffffffffff);
-out[0] = x38;
-out[1] = x35;
-out[2] = x43 + x32;
-out[3] = x44;
-out[4] = x41;
-}}}}}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[5];
+static void femul(uint64_t out[5], const uint64_t in1[5], const uint64_t in2[5]) {
+  { const uint64_t x10 = in1[4];
+  { const uint64_t x11 = in1[3];
+  { const uint64_t x9 = in1[2];
+  { const uint64_t x7 = in1[1];
+  { const uint64_t x5 = in1[0];
+  { const uint64_t x18 = in2[4];
+  { const uint64_t x19 = in2[3];
+  { const uint64_t x17 = in2[2];
+  { const uint64_t x15 = in2[1];
+  { const uint64_t x13 = in2[0];
+  { uint128_t x20 = (((uint128_t)x5 * x18) + ((0x2 * ((uint128_t)x7 * x19)) + ((0x2 * ((uint128_t)x9 * x17)) + ((0x2 * ((uint128_t)x11 * x15)) + ((uint128_t)x10 * x13)))));
+  { uint128_t x21 = ((((uint128_t)x5 * x19) + ((0x2 * ((uint128_t)x7 * x17)) + ((0x2 * ((uint128_t)x9 * x15)) + ((uint128_t)x11 * x13)))) + (0xbd * ((uint128_t)x10 * x18)));
+  { uint128_t x22 = ((((uint128_t)x5 * x17) + ((0x2 * ((uint128_t)x7 * x15)) + ((uint128_t)x9 * x13))) + (0xbd * (((uint128_t)x11 * x18) + ((uint128_t)x10 * x19))));
+  { uint128_t x23 = ((((uint128_t)x5 * x15) + ((uint128_t)x7 * x13)) + (0xbd * (((uint128_t)x9 * x18) + (((uint128_t)x11 * x19) + ((uint128_t)x10 * x17)))));
+  { uint128_t x24 = (((uint128_t)x5 * x13) + (0xbd * ((0x2 * ((uint128_t)x7 * x18)) + ((0x2 * ((uint128_t)x9 * x19)) + ((0x2 * ((uint128_t)x11 * x17)) + (0x2 * ((uint128_t)x10 * x15)))))));
+  { uint128_t x25 = (x24 >> 0x34);
+  { uint64_t x26 = ((uint64_t)x24 & 0xfffffffffffff);
+  { uint128_t x27 = (x25 + x23);
+  { uint64_t x28 = (uint64_t) (x27 >> 0x33);
+  { uint64_t x29 = ((uint64_t)x27 & 0x7ffffffffffff);
+  { uint128_t x30 = (x28 + x22);
+  { uint64_t x31 = (uint64_t) (x30 >> 0x33);
+  { uint64_t x32 = ((uint64_t)x30 & 0x7ffffffffffff);
+  { uint128_t x33 = (x31 + x21);
+  { uint64_t x34 = (uint64_t) (x33 >> 0x33);
+  { uint64_t x35 = ((uint64_t)x33 & 0x7ffffffffffff);
+  { uint128_t x36 = (x34 + x20);
+  { uint64_t x37 = (uint64_t) (x36 >> 0x33);
+  { uint64_t x38 = ((uint64_t)x36 & 0x7ffffffffffff);
+  { uint128_t x39 = (x26 + ((uint128_t)0xbd * x37));
+  { uint64_t x40 = (uint64_t) (x39 >> 0x34);
+  { uint64_t x41 = ((uint64_t)x39 & 0xfffffffffffff);
+  { uint64_t x42 = (x40 + x29);
+  { uint64_t x43 = (x42 >> 0x33);
+  { uint64_t x44 = (x42 & 0x7ffffffffffff);
+  out[0] = x41;
+  out[1] = x44;
+  out[2] = (x43 + x32);
+  out[3] = x35;
+  out[4] = x38;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas64_2e256m189/fesquare.c b/src/Specific/solinas64_2e256m189/fesquare.c
index cc8808dc7..7eaafeefe 100644
--- a/src/Specific/solinas64_2e256m189/fesquare.c
+++ b/src/Specific/solinas64_2e256m189/fesquare.c
@@ -1,51 +1,38 @@
-#include <stdint.h>
-#include <stdbool.h>
-#include <x86intrin.h>
-#include "liblow.h"
-
-#include "fesquare.h"
-
-typedef unsigned int uint128_t __attribute__((mode(TI)));
-
-#if (defined(__GNUC__) || defined(__GNUG__)) && !(defined(__clang__)||defined(__INTEL_COMPILER))
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81294
-#define _subborrow_u32 __builtin_ia32_sbb_u32
-#define _subborrow_u64 __builtin_ia32_sbb_u64
-#endif
-
-#undef force_inline
-#define force_inline __attribute__((always_inline))
-
-void force_inline fesquare(uint64_t* out, uint64_t x7, uint64_t x8, uint64_t x6, uint64_t x4, uint64_t x2)
-{  uint128_t x9 = (((uint128_t)x2 * x7) + ((0x2 * ((uint128_t)x4 * x8)) + ((0x2 * ((uint128_t)x6 * x6)) + ((0x2 * ((uint128_t)x8 * x4)) + ((uint128_t)x7 * x2)))));
-{  uint128_t x10 = ((((uint128_t)x2 * x8) + ((0x2 * ((uint128_t)x4 * x6)) + ((0x2 * ((uint128_t)x6 * x4)) + ((uint128_t)x8 * x2)))) + (0xbd * ((uint128_t)x7 * x7)));
-{  uint128_t x11 = ((((uint128_t)x2 * x6) + ((0x2 * ((uint128_t)x4 * x4)) + ((uint128_t)x6 * x2))) + (0xbd * (((uint128_t)x8 * x7) + ((uint128_t)x7 * x8))));
-{  uint128_t x12 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0xbd * (((uint128_t)x6 * x7) + (((uint128_t)x8 * x8) + ((uint128_t)x7 * x6)))));
-{  uint128_t x13 = (((uint128_t)x2 * x2) + (0xbd * ((0x2 * ((uint128_t)x4 * x7)) + ((0x2 * ((uint128_t)x6 * x8)) + ((0x2 * ((uint128_t)x8 * x6)) + (0x2 * ((uint128_t)x7 * x4)))))));
-{  uint128_t x14 = (x13 >> 0x34);
-{  uint64_t x15 = ((uint64_t)x13 & 0xfffffffffffff);
-{  uint128_t x16 = (x14 + x12);
-{  uint64_t x17 = (uint64_t) (x16 >> 0x33);
-{  uint64_t x18 = ((uint64_t)x16 & 0x7ffffffffffff);
-{  uint128_t x19 = (x17 + x11);
-{  uint64_t x20 = (uint64_t) (x19 >> 0x33);
-{  uint64_t x21 = ((uint64_t)x19 & 0x7ffffffffffff);
-{  uint128_t x22 = (x20 + x10);
-{  uint64_t x23 = (uint64_t) (x22 >> 0x33);
-{  uint64_t x24 = ((uint64_t)x22 & 0x7ffffffffffff);
-{  uint128_t x25 = (x23 + x9);
-{  uint64_t x26 = (uint64_t) (x25 >> 0x33);
-{  uint64_t x27 = ((uint64_t)x25 & 0x7ffffffffffff);
-{  uint128_t x28 = (x15 + ((uint128_t)0xbd * x26));
-{  uint64_t x29 = (uint64_t) (x28 >> 0x34);
-{  uint64_t x30 = ((uint64_t)x28 & 0xfffffffffffff);
-{  uint64_t x31 = (x29 + x18);
-{  uint64_t x32 = (x31 >> 0x33);
-{  uint64_t x33 = (x31 & 0x7ffffffffffff);
-out[0] = x27;
-out[1] = x24;
-out[2] = x32 + x21;
-out[3] = x33;
-out[4] = x30;
-}}}}}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[5];
+static void fesquare(uint64_t out[5], const uint64_t in1[5]) {
+  { const uint64_t x7 = in1[4];
+  { const uint64_t x8 = in1[3];
+  { const uint64_t x6 = in1[2];
+  { const uint64_t x4 = in1[1];
+  { const uint64_t x2 = in1[0];
+  { uint128_t x9 = (((uint128_t)x2 * x7) + ((0x2 * ((uint128_t)x4 * x8)) + ((0x2 * ((uint128_t)x6 * x6)) + ((0x2 * ((uint128_t)x8 * x4)) + ((uint128_t)x7 * x2)))));
+  { uint128_t x10 = ((((uint128_t)x2 * x8) + ((0x2 * ((uint128_t)x4 * x6)) + ((0x2 * ((uint128_t)x6 * x4)) + ((uint128_t)x8 * x2)))) + (0xbd * ((uint128_t)x7 * x7)));
+  { uint128_t x11 = ((((uint128_t)x2 * x6) + ((0x2 * ((uint128_t)x4 * x4)) + ((uint128_t)x6 * x2))) + (0xbd * (((uint128_t)x8 * x7) + ((uint128_t)x7 * x8))));
+  { uint128_t x12 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0xbd * (((uint128_t)x6 * x7) + (((uint128_t)x8 * x8) + ((uint128_t)x7 * x6)))));
+  { uint128_t x13 = (((uint128_t)x2 * x2) + (0xbd * ((0x2 * ((uint128_t)x4 * x7)) + ((0x2 * ((uint128_t)x6 * x8)) + ((0x2 * ((uint128_t)x8 * x6)) + (0x2 * ((uint128_t)x7 * x4)))))));
+  { uint128_t x14 = (x13 >> 0x34);
+  { uint64_t x15 = ((uint64_t)x13 & 0xfffffffffffff);
+  { uint128_t x16 = (x14 + x12);
+  { uint64_t x17 = (uint64_t) (x16 >> 0x33);
+  { uint64_t x18 = ((uint64_t)x16 & 0x7ffffffffffff);
+  { uint128_t x19 = (x17 + x11);
+  { uint64_t x20 = (uint64_t) (x19 >> 0x33);
+  { uint64_t x21 = ((uint64_t)x19 & 0x7ffffffffffff);
+  { uint128_t x22 = (x20 + x10);
+  { uint64_t x23 = (uint64_t) (x22 >> 0x33);
+  { uint64_t x24 = ((uint64_t)x22 & 0x7ffffffffffff);
+  { uint128_t x25 = (x23 + x9);
+  { uint64_t x26 = (uint64_t) (x25 >> 0x33);
+  { uint64_t x27 = ((uint64_t)x25 & 0x7ffffffffffff);
+  { uint128_t x28 = (x15 + ((uint128_t)0xbd * x26));
+  { uint64_t x29 = (uint64_t) (x28 >> 0x34);
+  { uint64_t x30 = ((uint64_t)x28 & 0xfffffffffffff);
+  { uint64_t x31 = (x29 + x18);
+  { uint64_t x32 = (x31 >> 0x33);
+  { uint64_t x33 = (x31 & 0x7ffffffffffff);
+  out[0] = x30;
+  out[1] = x33;
+  out[2] = (x32 + x21);
+  out[3] = x24;
+  out[4] = x27;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas64_2e256m189/freeze.c b/src/Specific/solinas64_2e256m189/freeze.c
index 2278942df..174b1619d 100644
--- a/src/Specific/solinas64_2e256m189/freeze.c
+++ b/src/Specific/solinas64_2e256m189/freeze.c
@@ -1,25 +1,29 @@
-#include <stdint.h>
-#include <stdbool.h>
-#include <x86intrin.h>
-#include "liblow.h"
-
-#include "freeze.h"
-
-typedef unsigned int uint128_t __attribute__((mode(TI)));
-
-#if (defined(__GNUC__) || defined(__GNUG__)) && !(defined(__clang__)||defined(__INTEL_COMPILER))
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81294
-#define _subborrow_u32 __builtin_ia32_sbb_u32
-#define _subborrow_u64 __builtin_ia32_sbb_u64
-#endif
-
-#undef force_inline
-#define force_inline __attribute__((always_inline))
-
-void force_inline freeze(uint64_t* out, uint64_t x7, uint64_t x8, uint64_t x6, uint64_t x4, uint64_t x2)
-out[0] = uint64_t x10;
-out[1] = uint8_t x11 = Op Syntax.SubWithGetBorrow 52 Syntax.TWord 3 Syntax.TWord 6 Syntax.TWord 6 Syntax.TWord 6 Syntax.TWord 3 0x0;
-out[2] = x2;
-out[3] = 0xfffffffffff43;;
+static void freeze(uint64_t out[5], const uint64_t in1[5]) {
+  { const uint64_t x7 = in1[4];
+  { const uint64_t x8 = in1[3];
+  { const uint64_t x6 = in1[2];
+  { const uint64_t x4 = in1[1];
+  { const uint64_t x2 = in1[0];
+  { uint64_t x10, uint8_t x11 = Op (Syntax.SubWithGetBorrow 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0xfffffffffff43);
+  { uint64_t x13; uint8_t x14 = _subborrow_u51(x11, x4, 0x7ffffffffffff, &x13);
+  { uint64_t x16; uint8_t x17 = _subborrow_u51(x14, x6, 0x7ffffffffffff, &x16);
+  { uint64_t x19; uint8_t x20 = _subborrow_u51(x17, x8, 0x7ffffffffffff, &x19);
+  { uint64_t x22; uint8_t x23 = _subborrow_u51(x20, x7, 0x7ffffffffffff, &x22);
+  { uint64_t x24 = (uint64_t)cmovznz(x23, 0x0, 0xffffffffffffffffL);
+  { uint64_t x25 = (x24 & 0xfffffffffff43);
+  { uint64_t x27, uint8_t x28 = Op (Syntax.AddWithGetCarry 52 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x10, Return x25);
+  { uint64_t x29 = (x24 & 0x7ffffffffffff);
+  { uint64_t x31; uint8_t x32 = _addcarryx_u51(x28, x13, x29, &x31);
+  { uint64_t x33 = (x24 & 0x7ffffffffffff);
+  { uint64_t x35; uint8_t x36 = _addcarryx_u51(x32, x16, x33, &x35);
+  { uint64_t x37 = (x24 & 0x7ffffffffffff);
+  { uint64_t x39; uint8_t x40 = _addcarryx_u51(x36, x19, x37, &x39);
+  { uint64_t x41 = (x24 & 0x7ffffffffffff);
+  { uint64_t x43; uint8_t _ = _addcarryx_u51(x40, x22, x41, &x43);
+  out[0] = x27;
+  out[1] = x31;
+  out[2] = x35;
+  out[3] = x39;
+  out[4] = x43;
+  }}}}}}}}}}}}}}}}}}}}}
 }
-// caller: uint64_t out[4];