Update display logs and c files

3 files changed, 91 insertions, 116 deletions

diff --git a/src/Specific/solinas64_2e152m17/femul.c b/src/Specific/solinas64_2e152m17/femul.c
index d3005d0da..c351efd1e 100644
--- a/src/Specific/solinas64_2e152m17/femul.c
+++ b/src/Specific/solinas64_2e152m17/femul.c
@@ -1,46 +1,36 @@
-#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 x8, uint64_t x9, uint64_t x7, uint64_t x5, uint64_t x14, uint64_t x15, uint64_t x13, uint64_t x11)
-{  uint128_t x16 = (((uint128_t)x5 * x14) + (((uint128_t)x7 * x15) + (((uint128_t)x9 * x13) + ((uint128_t)x8 * x11))));
-{  uint128_t x17 = ((((uint128_t)x5 * x15) + (((uint128_t)x7 * x13) + ((uint128_t)x9 * x11))) + (0x11 * ((uint128_t)x8 * x14)));
-{  uint128_t x18 = ((((uint128_t)x5 * x13) + ((uint128_t)x7 * x11)) + (0x11 * (((uint128_t)x9 * x14) + ((uint128_t)x8 * x15))));
-{  uint128_t x19 = (((uint128_t)x5 * x11) + (0x11 * (((uint128_t)x7 * x14) + (((uint128_t)x9 * x15) + ((uint128_t)x8 * x13)))));
-{  uint64_t x20 = (uint64_t) (x19 >> 0x26);
-{  uint64_t x21 = ((uint64_t)x19 & 0x3fffffffff);
-{  uint128_t x22 = (x20 + x18);
-{  uint64_t x23 = (uint64_t) (x22 >> 0x26);
-{  uint64_t x24 = ((uint64_t)x22 & 0x3fffffffff);
-{  uint128_t x25 = (x23 + x17);
-{  uint64_t x26 = (uint64_t) (x25 >> 0x26);
-{  uint64_t x27 = ((uint64_t)x25 & 0x3fffffffff);
-{  uint128_t x28 = (x26 + x16);
-{  uint64_t x29 = (uint64_t) (x28 >> 0x26);
-{  uint64_t x30 = ((uint64_t)x28 & 0x3fffffffff);
-{  uint64_t x31 = (x21 + (0x11 * x29));
-{  uint64_t x32 = (x31 >> 0x26);
-{  uint64_t x33 = (x31 & 0x3fffffffff);
-{  uint64_t x34 = (x32 + x24);
-{  uint64_t x35 = (x34 >> 0x26);
-{  uint64_t x36 = (x34 & 0x3fffffffff);
-out[0] = x30;
-out[1] = x35 + x27;
-out[2] = x36;
-out[3] = x33;
-}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[4];
+static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4]) {
+  { const uint64_t x8 = in1[3];
+  { const uint64_t x9 = in1[2];
+  { const uint64_t x7 = in1[1];
+  { const uint64_t x5 = in1[0];
+  { const uint64_t x14 = in2[3];
+  { const uint64_t x15 = in2[2];
+  { const uint64_t x13 = in2[1];
+  { const uint64_t x11 = in2[0];
+  { uint128_t x16 = (((uint128_t)x5 * x14) + (((uint128_t)x7 * x15) + (((uint128_t)x9 * x13) + ((uint128_t)x8 * x11))));
+  { uint128_t x17 = ((((uint128_t)x5 * x15) + (((uint128_t)x7 * x13) + ((uint128_t)x9 * x11))) + (0x11 * ((uint128_t)x8 * x14)));
+  { uint128_t x18 = ((((uint128_t)x5 * x13) + ((uint128_t)x7 * x11)) + (0x11 * (((uint128_t)x9 * x14) + ((uint128_t)x8 * x15))));
+  { uint128_t x19 = (((uint128_t)x5 * x11) + (0x11 * (((uint128_t)x7 * x14) + (((uint128_t)x9 * x15) + ((uint128_t)x8 * x13)))));
+  { uint64_t x20 = (uint64_t) (x19 >> 0x26);
+  { uint64_t x21 = ((uint64_t)x19 & 0x3fffffffff);
+  { uint128_t x22 = (x20 + x18);
+  { uint64_t x23 = (uint64_t) (x22 >> 0x26);
+  { uint64_t x24 = ((uint64_t)x22 & 0x3fffffffff);
+  { uint128_t x25 = (x23 + x17);
+  { uint64_t x26 = (uint64_t) (x25 >> 0x26);
+  { uint64_t x27 = ((uint64_t)x25 & 0x3fffffffff);
+  { uint128_t x28 = (x26 + x16);
+  { uint64_t x29 = (uint64_t) (x28 >> 0x26);
+  { uint64_t x30 = ((uint64_t)x28 & 0x3fffffffff);
+  { uint64_t x31 = (x21 + (0x11 * x29));
+  { uint64_t x32 = (x31 >> 0x26);
+  { uint64_t x33 = (x31 & 0x3fffffffff);
+  { uint64_t x34 = (x32 + x24);
+  { uint64_t x35 = (x34 >> 0x26);
+  { uint64_t x36 = (x34 & 0x3fffffffff);
+  out[0] = x33;
+  out[1] = x36;
+  out[2] = (x35 + x27);
+  out[3] = x30;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas64_2e152m17/fesquare.c b/src/Specific/solinas64_2e152m17/fesquare.c
index f265f13d1..d8cf4dafa 100644
--- a/src/Specific/solinas64_2e152m17/fesquare.c
+++ b/src/Specific/solinas64_2e152m17/fesquare.c
@@ -1,46 +1,32 @@
-#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 x5, uint64_t x6, uint64_t x4, uint64_t x2)
-{  uint128_t x7 = (((uint128_t)x2 * x5) + (((uint128_t)x4 * x6) + (((uint128_t)x6 * x4) + ((uint128_t)x5 * x2))));
-{  uint128_t x8 = ((((uint128_t)x2 * x6) + (((uint128_t)x4 * x4) + ((uint128_t)x6 * x2))) + (0x11 * ((uint128_t)x5 * x5)));
-{  uint128_t x9 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0x11 * (((uint128_t)x6 * x5) + ((uint128_t)x5 * x6))));
-{  uint128_t x10 = (((uint128_t)x2 * x2) + (0x11 * (((uint128_t)x4 * x5) + (((uint128_t)x6 * x6) + ((uint128_t)x5 * x4)))));
-{  uint64_t x11 = (uint64_t) (x10 >> 0x26);
-{  uint64_t x12 = ((uint64_t)x10 & 0x3fffffffff);
-{  uint128_t x13 = (x11 + x9);
-{  uint64_t x14 = (uint64_t) (x13 >> 0x26);
-{  uint64_t x15 = ((uint64_t)x13 & 0x3fffffffff);
-{  uint128_t x16 = (x14 + x8);
-{  uint64_t x17 = (uint64_t) (x16 >> 0x26);
-{  uint64_t x18 = ((uint64_t)x16 & 0x3fffffffff);
-{  uint128_t x19 = (x17 + x7);
-{  uint64_t x20 = (uint64_t) (x19 >> 0x26);
-{  uint64_t x21 = ((uint64_t)x19 & 0x3fffffffff);
-{  uint64_t x22 = (x12 + (0x11 * x20));
-{  uint64_t x23 = (x22 >> 0x26);
-{  uint64_t x24 = (x22 & 0x3fffffffff);
-{  uint64_t x25 = (x23 + x15);
-{  uint64_t x26 = (x25 >> 0x26);
-{  uint64_t x27 = (x25 & 0x3fffffffff);
-out[0] = x21;
-out[1] = x26 + x18;
-out[2] = x27;
-out[3] = x24;
-}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[4];
+static void fesquare(uint64_t out[4], const uint64_t in1[4]) {
+  { const uint64_t x5 = in1[3];
+  { const uint64_t x6 = in1[2];
+  { const uint64_t x4 = in1[1];
+  { const uint64_t x2 = in1[0];
+  { uint128_t x7 = (((uint128_t)x2 * x5) + (((uint128_t)x4 * x6) + (((uint128_t)x6 * x4) + ((uint128_t)x5 * x2))));
+  { uint128_t x8 = ((((uint128_t)x2 * x6) + (((uint128_t)x4 * x4) + ((uint128_t)x6 * x2))) + (0x11 * ((uint128_t)x5 * x5)));
+  { uint128_t x9 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0x11 * (((uint128_t)x6 * x5) + ((uint128_t)x5 * x6))));
+  { uint128_t x10 = (((uint128_t)x2 * x2) + (0x11 * (((uint128_t)x4 * x5) + (((uint128_t)x6 * x6) + ((uint128_t)x5 * x4)))));
+  { uint64_t x11 = (uint64_t) (x10 >> 0x26);
+  { uint64_t x12 = ((uint64_t)x10 & 0x3fffffffff);
+  { uint128_t x13 = (x11 + x9);
+  { uint64_t x14 = (uint64_t) (x13 >> 0x26);
+  { uint64_t x15 = ((uint64_t)x13 & 0x3fffffffff);
+  { uint128_t x16 = (x14 + x8);
+  { uint64_t x17 = (uint64_t) (x16 >> 0x26);
+  { uint64_t x18 = ((uint64_t)x16 & 0x3fffffffff);
+  { uint128_t x19 = (x17 + x7);
+  { uint64_t x20 = (uint64_t) (x19 >> 0x26);
+  { uint64_t x21 = ((uint64_t)x19 & 0x3fffffffff);
+  { uint64_t x22 = (x12 + (0x11 * x20));
+  { uint64_t x23 = (x22 >> 0x26);
+  { uint64_t x24 = (x22 & 0x3fffffffff);
+  { uint64_t x25 = (x23 + x15);
+  { uint64_t x26 = (x25 >> 0x26);
+  { uint64_t x27 = (x25 & 0x3fffffffff);
+  out[0] = x24;
+  out[1] = x27;
+  out[2] = (x26 + x18);
+  out[3] = x21;
+  }}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas64_2e152m17/freeze.c b/src/Specific/solinas64_2e152m17/freeze.c
index 7ca849a69..0a08e7145 100644
--- a/src/Specific/solinas64_2e152m17/freeze.c
+++ b/src/Specific/solinas64_2e152m17/freeze.c
@@ -1,25 +1,24 @@
-#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 x5, uint64_t x6, uint64_t x4, uint64_t x2)
-out[0] = uint64_t x8;
-out[1] = uint8_t x9 = Op Syntax.SubWithGetBorrow 38 Syntax.TWord 3 Syntax.TWord 6 Syntax.TWord 6 Syntax.TWord 6 Syntax.TWord 3 0x0;
-out[2] = x2;
-out[3] = 0x3fffffffef;;
+static void freeze(uint64_t out[4], const uint64_t in1[4]) {
+  { const uint64_t x5 = in1[3];
+  { const uint64_t x6 = in1[2];
+  { const uint64_t x4 = in1[1];
+  { const uint64_t x2 = in1[0];
+  { uint64_t x8, uint8_t x9 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0x3fffffffef);
+  { uint64_t x11, uint8_t x12 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x9, Return x4, 0x3fffffffff);
+  { uint64_t x14, uint8_t x15 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x12, Return x6, 0x3fffffffff);
+  { uint64_t x17, uint8_t x18 = Op (Syntax.SubWithGetBorrow 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x15, Return x5, 0x3fffffffff);
+  { uint64_t x19 = (uint64_t)cmovznz(x18, 0x0, 0xffffffffffffffffL);
+  { uint64_t x20 = (x19 & 0x3fffffffef);
+  { uint64_t x22, uint8_t x23 = Op (Syntax.AddWithGetCarry 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x8, Return x20);
+  { uint64_t x24 = (x19 & 0x3fffffffff);
+  { uint64_t x26, uint8_t x27 = Op (Syntax.AddWithGetCarry 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x23, Return x11, Return x24);
+  { uint64_t x28 = (x19 & 0x3fffffffff);
+  { uint64_t x30, uint8_t x31 = Op (Syntax.AddWithGetCarry 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x27, Return x14, Return x28);
+  { uint64_t x32 = (x19 & 0x3fffffffff);
+  { uint64_t x34, uint8_t _ = Op (Syntax.AddWithGetCarry 38 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x31, Return x17, Return x32);
+  out[0] = x22;
+  out[1] = x26;
+  out[2] = x30;
+  out[3] = x34;
+  }}}}}}}}}}}}}}}}}
 }
-// caller: uint64_t out[4];