Update display logs and c files

3 files changed, 73 insertions, 106 deletions

diff --git a/src/Specific/solinas64_2e130m5/femul.c b/src/Specific/solinas64_2e130m5/femul.c
index db6eb8634..a14294d6d 100644
--- a/src/Specific/solinas64_2e130m5/femul.c
+++ b/src/Specific/solinas64_2e130m5/femul.c
@@ -1,41 +1,29 @@
-#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 x6, uint64_t x7, uint64_t x5, uint64_t x10, uint64_t x11, uint64_t x9)
-{  uint128_t x12 = (((uint128_t)x5 * x10) + ((0x2 * ((uint128_t)x7 * x11)) + ((uint128_t)x6 * x9)));
-{  uint128_t x13 = ((((uint128_t)x5 * x11) + ((uint128_t)x7 * x9)) + (0x5 * ((uint128_t)x6 * x10)));
-{  uint128_t x14 = (((uint128_t)x5 * x9) + (0x5 * ((0x2 * ((uint128_t)x7 * x10)) + (0x2 * ((uint128_t)x6 * x11)))));
-{  uint64_t x15 = (uint64_t) (x14 >> 0x2c);
-{  uint64_t x16 = ((uint64_t)x14 & 0xfffffffffff);
-{  uint128_t x17 = (x15 + x13);
-{  uint64_t x18 = (uint64_t) (x17 >> 0x2b);
-{  uint64_t x19 = ((uint64_t)x17 & 0x7ffffffffff);
-{  uint128_t x20 = (x18 + x12);
-{  uint64_t x21 = (uint64_t) (x20 >> 0x2b);
-{  uint64_t x22 = ((uint64_t)x20 & 0x7ffffffffff);
-{  uint64_t x23 = (x16 + (0x5 * x21));
-{  uint64_t x24 = (x23 >> 0x2c);
-{  uint64_t x25 = (x23 & 0xfffffffffff);
-{  uint64_t x26 = (x24 + x19);
-{  uint64_t x27 = (x26 >> 0x2b);
-{  uint64_t x28 = (x26 & 0x7ffffffffff);
-out[0] = x27 + x22;
-out[1] = x28;
-out[2] = x25;
-}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[3];
+static void femul(uint64_t out[3], const uint64_t in1[3], const uint64_t in2[3]) {
+  { const uint64_t x6 = in1[2];
+  { const uint64_t x7 = in1[1];
+  { const uint64_t x5 = in1[0];
+  { const uint64_t x10 = in2[2];
+  { const uint64_t x11 = in2[1];
+  { const uint64_t x9 = in2[0];
+  { uint128_t x12 = (((uint128_t)x5 * x10) + ((0x2 * ((uint128_t)x7 * x11)) + ((uint128_t)x6 * x9)));
+  { uint128_t x13 = ((((uint128_t)x5 * x11) + ((uint128_t)x7 * x9)) + (0x5 * ((uint128_t)x6 * x10)));
+  { uint128_t x14 = (((uint128_t)x5 * x9) + (0x5 * ((0x2 * ((uint128_t)x7 * x10)) + (0x2 * ((uint128_t)x6 * x11)))));
+  { uint64_t x15 = (uint64_t) (x14 >> 0x2c);
+  { uint64_t x16 = ((uint64_t)x14 & 0xfffffffffff);
+  { uint128_t x17 = (x15 + x13);
+  { uint64_t x18 = (uint64_t) (x17 >> 0x2b);
+  { uint64_t x19 = ((uint64_t)x17 & 0x7ffffffffff);
+  { uint128_t x20 = (x18 + x12);
+  { uint64_t x21 = (uint64_t) (x20 >> 0x2b);
+  { uint64_t x22 = ((uint64_t)x20 & 0x7ffffffffff);
+  { uint64_t x23 = (x16 + (0x5 * x21));
+  { uint64_t x24 = (x23 >> 0x2c);
+  { uint64_t x25 = (x23 & 0xfffffffffff);
+  { uint64_t x26 = (x24 + x19);
+  { uint64_t x27 = (x26 >> 0x2b);
+  { uint64_t x28 = (x26 & 0x7ffffffffff);
+  out[0] = x25;
+  out[1] = x28;
+  out[2] = (x27 + x22);
+  }}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas64_2e130m5/fesquare.c b/src/Specific/solinas64_2e130m5/fesquare.c
index d55560f0c..499c28d6d 100644
--- a/src/Specific/solinas64_2e130m5/fesquare.c
+++ b/src/Specific/solinas64_2e130m5/fesquare.c
@@ -1,41 +1,26 @@
-#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 x3, uint64_t x4, uint64_t x2)
-{  uint128_t x5 = (((uint128_t)x2 * x3) + ((0x2 * ((uint128_t)x4 * x4)) + ((uint128_t)x3 * x2)));
-{  uint128_t x6 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0x5 * ((uint128_t)x3 * x3)));
-{  uint128_t x7 = (((uint128_t)x2 * x2) + (0x5 * ((0x2 * ((uint128_t)x4 * x3)) + (0x2 * ((uint128_t)x3 * x4)))));
-{  uint64_t x8 = (uint64_t) (x7 >> 0x2c);
-{  uint64_t x9 = ((uint64_t)x7 & 0xfffffffffff);
-{  uint128_t x10 = (x8 + x6);
-{  uint64_t x11 = (uint64_t) (x10 >> 0x2b);
-{  uint64_t x12 = ((uint64_t)x10 & 0x7ffffffffff);
-{  uint128_t x13 = (x11 + x5);
-{  uint64_t x14 = (uint64_t) (x13 >> 0x2b);
-{  uint64_t x15 = ((uint64_t)x13 & 0x7ffffffffff);
-{  uint64_t x16 = (x9 + (0x5 * x14));
-{  uint64_t x17 = (x16 >> 0x2c);
-{  uint64_t x18 = (x16 & 0xfffffffffff);
-{  uint64_t x19 = (x17 + x12);
-{  uint64_t x20 = (x19 >> 0x2b);
-{  uint64_t x21 = (x19 & 0x7ffffffffff);
-out[0] = x20 + x15;
-out[1] = x21;
-out[2] = x18;
-}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[3];
+static void fesquare(uint64_t out[3], const uint64_t in1[3]) {
+  { const uint64_t x3 = in1[2];
+  { const uint64_t x4 = in1[1];
+  { const uint64_t x2 = in1[0];
+  { uint128_t x5 = (((uint128_t)x2 * x3) + ((0x2 * ((uint128_t)x4 * x4)) + ((uint128_t)x3 * x2)));
+  { uint128_t x6 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0x5 * ((uint128_t)x3 * x3)));
+  { uint128_t x7 = (((uint128_t)x2 * x2) + (0x5 * ((0x2 * ((uint128_t)x4 * x3)) + (0x2 * ((uint128_t)x3 * x4)))));
+  { uint64_t x8 = (uint64_t) (x7 >> 0x2c);
+  { uint64_t x9 = ((uint64_t)x7 & 0xfffffffffff);
+  { uint128_t x10 = (x8 + x6);
+  { uint64_t x11 = (uint64_t) (x10 >> 0x2b);
+  { uint64_t x12 = ((uint64_t)x10 & 0x7ffffffffff);
+  { uint128_t x13 = (x11 + x5);
+  { uint64_t x14 = (uint64_t) (x13 >> 0x2b);
+  { uint64_t x15 = ((uint64_t)x13 & 0x7ffffffffff);
+  { uint64_t x16 = (x9 + (0x5 * x14));
+  { uint64_t x17 = (x16 >> 0x2c);
+  { uint64_t x18 = (x16 & 0xfffffffffff);
+  { uint64_t x19 = (x17 + x12);
+  { uint64_t x20 = (x19 >> 0x2b);
+  { uint64_t x21 = (x19 & 0x7ffffffffff);
+  out[0] = x18;
+  out[1] = x21;
+  out[2] = (x20 + x15);
+  }}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas64_2e130m5/freeze.c b/src/Specific/solinas64_2e130m5/freeze.c
index 3ee95bba8..d6ee6998a 100644
--- a/src/Specific/solinas64_2e130m5/freeze.c
+++ b/src/Specific/solinas64_2e130m5/freeze.c
@@ -1,25 +1,19 @@
-#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 x3, uint64_t x4, uint64_t x2)
-out[0] = uint64_t x6;
-out[1] = uint8_t x7 = Op Syntax.SubWithGetBorrow 44 Syntax.TWord 3 Syntax.TWord 6 Syntax.TWord 6 Syntax.TWord 6 Syntax.TWord 3 0x0;
-out[2] = x2;
-out[3] = 0xffffffffffb;;
+static void freeze(uint64_t out[3], const uint64_t in1[3]) {
+  { const uint64_t x3 = in1[2];
+  { const uint64_t x4 = in1[1];
+  { const uint64_t x2 = in1[0];
+  { uint64_t x6, uint8_t x7 = Op (Syntax.SubWithGetBorrow 44 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0xffffffffffb);
+  { uint64_t x9, uint8_t x10 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x7, Return x4, 0x7ffffffffff);
+  { uint64_t x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x10, Return x3, 0x7ffffffffff);
+  { uint64_t x14 = (uint64_t)cmovznz(x13, 0x0, 0xffffffffffffffffL);
+  { uint64_t x15 = (x14 & 0xffffffffffb);
+  { uint64_t x17, uint8_t x18 = Op (Syntax.AddWithGetCarry 44 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x6, Return x15);
+  { uint64_t x19 = (x14 & 0x7ffffffffff);
+  { uint64_t x21, uint8_t x22 = Op (Syntax.AddWithGetCarry 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x18, Return x9, Return x19);
+  { uint64_t x23 = (x14 & 0x7ffffffffff);
+  { uint64_t x25, uint8_t _ = Op (Syntax.AddWithGetCarry 43 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x12, Return x23);
+  out[0] = x17;
+  out[1] = x21;
+  out[2] = x25;
+  }}}}}}}}}}}}}
 }
-// caller: uint64_t out[4];