Update display logs and c files

3 files changed, 127 insertions, 136 deletions

diff --git a/src/Specific/solinas64_2e336m17/femul.c b/src/Specific/solinas64_2e336m17/femul.c
index d1bdecab7..9e663e79f 100644
--- a/src/Specific/solinas64_2e336m17/femul.c
+++ b/src/Specific/solinas64_2e336m17/femul.c
@@ -1,56 +1,50 @@
-#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 x12, uint64_t x13, uint64_t x11, uint64_t x9, uint64_t x7, uint64_t x5, uint64_t x22, uint64_t x23, uint64_t x21, uint64_t x19, uint64_t x17, uint64_t x15)
-{  uint128_t x24 = (((uint128_t)x5 * x22) + (((uint128_t)x7 * x23) + (((uint128_t)x9 * x21) + (((uint128_t)x11 * x19) + (((uint128_t)x13 * x17) + ((uint128_t)x12 * x15))))));
-{  uint128_t x25 = ((((uint128_t)x5 * x23) + (((uint128_t)x7 * x21) + (((uint128_t)x9 * x19) + (((uint128_t)x11 * x17) + ((uint128_t)x13 * x15))))) + (0x11 * ((uint128_t)x12 * x22)));
-{  uint128_t x26 = ((((uint128_t)x5 * x21) + (((uint128_t)x7 * x19) + (((uint128_t)x9 * x17) + ((uint128_t)x11 * x15)))) + (0x11 * (((uint128_t)x13 * x22) + ((uint128_t)x12 * x23))));
-{  uint128_t x27 = ((((uint128_t)x5 * x19) + (((uint128_t)x7 * x17) + ((uint128_t)x9 * x15))) + (0x11 * (((uint128_t)x11 * x22) + (((uint128_t)x13 * x23) + ((uint128_t)x12 * x21)))));
-{  uint128_t x28 = ((((uint128_t)x5 * x17) + ((uint128_t)x7 * x15)) + (0x11 * (((uint128_t)x9 * x22) + (((uint128_t)x11 * x23) + (((uint128_t)x13 * x21) + ((uint128_t)x12 * x19))))));
-{  uint128_t x29 = (((uint128_t)x5 * x15) + (0x11 * (((uint128_t)x7 * x22) + (((uint128_t)x9 * x23) + (((uint128_t)x11 * x21) + (((uint128_t)x13 * x19) + ((uint128_t)x12 * x17)))))));
-{  uint128_t x30 = (x29 >> 0x38);
-{  uint64_t x31 = ((uint64_t)x29 & 0xffffffffffffff);
-{  uint128_t x32 = (x30 + x28);
-{  uint128_t x33 = (x32 >> 0x38);
-{  uint64_t x34 = ((uint64_t)x32 & 0xffffffffffffff);
-{  uint128_t x35 = (x33 + x27);
-{  uint128_t x36 = (x35 >> 0x38);
-{  uint64_t x37 = ((uint64_t)x35 & 0xffffffffffffff);
-{  uint128_t x38 = (x36 + x26);
-{  uint128_t x39 = (x38 >> 0x38);
-{  uint64_t x40 = ((uint64_t)x38 & 0xffffffffffffff);
-{  uint128_t x41 = (x39 + x25);
-{  uint64_t x42 = (uint64_t) (x41 >> 0x38);
-{  uint64_t x43 = ((uint64_t)x41 & 0xffffffffffffff);
-{  uint128_t x44 = (x42 + x24);
-{  uint64_t x45 = (uint64_t) (x44 >> 0x38);
-{  uint64_t x46 = ((uint64_t)x44 & 0xffffffffffffff);
-{  uint128_t x47 = (x31 + ((uint128_t)0x11 * x45));
-{  uint64_t x48 = (uint64_t) (x47 >> 0x38);
-{  uint64_t x49 = ((uint64_t)x47 & 0xffffffffffffff);
-{  uint64_t x50 = (x48 + x34);
-{  uint64_t x51 = (x50 >> 0x38);
-{  uint64_t x52 = (x50 & 0xffffffffffffff);
-out[0] = x46;
-out[1] = x43;
-out[2] = x40;
-out[3] = x51 + x37;
-out[4] = x52;
-out[5] = x49;
-}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[6];
+static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6]) {
+  { const uint64_t x12 = in1[5];
+  { const uint64_t x13 = 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 x22 = in2[5];
+  { const uint64_t x23 = in2[4];
+  { const uint64_t x21 = in2[3];
+  { const uint64_t x19 = in2[2];
+  { const uint64_t x17 = in2[1];
+  { const uint64_t x15 = in2[0];
+  { uint128_t x24 = (((uint128_t)x5 * x22) + (((uint128_t)x7 * x23) + (((uint128_t)x9 * x21) + (((uint128_t)x11 * x19) + (((uint128_t)x13 * x17) + ((uint128_t)x12 * x15))))));
+  { uint128_t x25 = ((((uint128_t)x5 * x23) + (((uint128_t)x7 * x21) + (((uint128_t)x9 * x19) + (((uint128_t)x11 * x17) + ((uint128_t)x13 * x15))))) + (0x11 * ((uint128_t)x12 * x22)));
+  { uint128_t x26 = ((((uint128_t)x5 * x21) + (((uint128_t)x7 * x19) + (((uint128_t)x9 * x17) + ((uint128_t)x11 * x15)))) + (0x11 * (((uint128_t)x13 * x22) + ((uint128_t)x12 * x23))));
+  { uint128_t x27 = ((((uint128_t)x5 * x19) + (((uint128_t)x7 * x17) + ((uint128_t)x9 * x15))) + (0x11 * (((uint128_t)x11 * x22) + (((uint128_t)x13 * x23) + ((uint128_t)x12 * x21)))));
+  { uint128_t x28 = ((((uint128_t)x5 * x17) + ((uint128_t)x7 * x15)) + (0x11 * (((uint128_t)x9 * x22) + (((uint128_t)x11 * x23) + (((uint128_t)x13 * x21) + ((uint128_t)x12 * x19))))));
+  { uint128_t x29 = (((uint128_t)x5 * x15) + (0x11 * (((uint128_t)x7 * x22) + (((uint128_t)x9 * x23) + (((uint128_t)x11 * x21) + (((uint128_t)x13 * x19) + ((uint128_t)x12 * x17)))))));
+  { uint128_t x30 = (x29 >> 0x38);
+  { uint64_t x31 = ((uint64_t)x29 & 0xffffffffffffff);
+  { uint128_t x32 = (x30 + x28);
+  { uint128_t x33 = (x32 >> 0x38);
+  { uint64_t x34 = ((uint64_t)x32 & 0xffffffffffffff);
+  { uint128_t x35 = (x33 + x27);
+  { uint128_t x36 = (x35 >> 0x38);
+  { uint64_t x37 = ((uint64_t)x35 & 0xffffffffffffff);
+  { uint128_t x38 = (x36 + x26);
+  { uint128_t x39 = (x38 >> 0x38);
+  { uint64_t x40 = ((uint64_t)x38 & 0xffffffffffffff);
+  { uint128_t x41 = (x39 + x25);
+  { uint64_t x42 = (uint64_t) (x41 >> 0x38);
+  { uint64_t x43 = ((uint64_t)x41 & 0xffffffffffffff);
+  { uint128_t x44 = (x42 + x24);
+  { uint64_t x45 = (uint64_t) (x44 >> 0x38);
+  { uint64_t x46 = ((uint64_t)x44 & 0xffffffffffffff);
+  { uint128_t x47 = (x31 + ((uint128_t)0x11 * x45));
+  { uint64_t x48 = (uint64_t) (x47 >> 0x38);
+  { uint64_t x49 = ((uint64_t)x47 & 0xffffffffffffff);
+  { uint64_t x50 = (x48 + x34);
+  { uint64_t x51 = (x50 >> 0x38);
+  { uint64_t x52 = (x50 & 0xffffffffffffff);
+  out[0] = x49;
+  out[1] = x52;
+  out[2] = (x51 + x37);
+  out[3] = x40;
+  out[4] = x43;
+  out[5] = x46;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas64_2e336m17/fesquare.c b/src/Specific/solinas64_2e336m17/fesquare.c
index 7f903cd78..86e650785 100644
--- a/src/Specific/solinas64_2e336m17/fesquare.c
+++ b/src/Specific/solinas64_2e336m17/fesquare.c
@@ -1,56 +1,44 @@
-#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 x9, uint64_t x10, uint64_t x8, uint64_t x6, uint64_t x4, uint64_t x2)
-{  uint128_t x11 = (((uint128_t)x2 * x9) + (((uint128_t)x4 * x10) + (((uint128_t)x6 * x8) + (((uint128_t)x8 * x6) + (((uint128_t)x10 * x4) + ((uint128_t)x9 * x2))))));
-{  uint128_t x12 = ((((uint128_t)x2 * x10) + (((uint128_t)x4 * x8) + (((uint128_t)x6 * x6) + (((uint128_t)x8 * x4) + ((uint128_t)x10 * x2))))) + (0x11 * ((uint128_t)x9 * x9)));
-{  uint128_t x13 = ((((uint128_t)x2 * x8) + (((uint128_t)x4 * x6) + (((uint128_t)x6 * x4) + ((uint128_t)x8 * x2)))) + (0x11 * (((uint128_t)x10 * x9) + ((uint128_t)x9 * x10))));
-{  uint128_t x14 = ((((uint128_t)x2 * x6) + (((uint128_t)x4 * x4) + ((uint128_t)x6 * x2))) + (0x11 * (((uint128_t)x8 * x9) + (((uint128_t)x10 * x10) + ((uint128_t)x9 * x8)))));
-{  uint128_t x15 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0x11 * (((uint128_t)x6 * x9) + (((uint128_t)x8 * x10) + (((uint128_t)x10 * x8) + ((uint128_t)x9 * x6))))));
-{  uint128_t x16 = (((uint128_t)x2 * x2) + (0x11 * (((uint128_t)x4 * x9) + (((uint128_t)x6 * x10) + (((uint128_t)x8 * x8) + (((uint128_t)x10 * x6) + ((uint128_t)x9 * x4)))))));
-{  uint128_t x17 = (x16 >> 0x38);
-{  uint64_t x18 = ((uint64_t)x16 & 0xffffffffffffff);
-{  uint128_t x19 = (x17 + x15);
-{  uint128_t x20 = (x19 >> 0x38);
-{  uint64_t x21 = ((uint64_t)x19 & 0xffffffffffffff);
-{  uint128_t x22 = (x20 + x14);
-{  uint128_t x23 = (x22 >> 0x38);
-{  uint64_t x24 = ((uint64_t)x22 & 0xffffffffffffff);
-{  uint128_t x25 = (x23 + x13);
-{  uint128_t x26 = (x25 >> 0x38);
-{  uint64_t x27 = ((uint64_t)x25 & 0xffffffffffffff);
-{  uint128_t x28 = (x26 + x12);
-{  uint64_t x29 = (uint64_t) (x28 >> 0x38);
-{  uint64_t x30 = ((uint64_t)x28 & 0xffffffffffffff);
-{  uint128_t x31 = (x29 + x11);
-{  uint64_t x32 = (uint64_t) (x31 >> 0x38);
-{  uint64_t x33 = ((uint64_t)x31 & 0xffffffffffffff);
-{  uint128_t x34 = (x18 + ((uint128_t)0x11 * x32));
-{  uint64_t x35 = (uint64_t) (x34 >> 0x38);
-{  uint64_t x36 = ((uint64_t)x34 & 0xffffffffffffff);
-{  uint64_t x37 = (x35 + x21);
-{  uint64_t x38 = (x37 >> 0x38);
-{  uint64_t x39 = (x37 & 0xffffffffffffff);
-out[0] = x33;
-out[1] = x30;
-out[2] = x27;
-out[3] = x38 + x24;
-out[4] = x39;
-out[5] = x36;
-}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[6];
+static void fesquare(uint64_t out[6], const uint64_t in1[6]) {
+  { const uint64_t x9 = in1[5];
+  { const uint64_t x10 = 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 x11 = (((uint128_t)x2 * x9) + (((uint128_t)x4 * x10) + (((uint128_t)x6 * x8) + (((uint128_t)x8 * x6) + (((uint128_t)x10 * x4) + ((uint128_t)x9 * x2))))));
+  { uint128_t x12 = ((((uint128_t)x2 * x10) + (((uint128_t)x4 * x8) + (((uint128_t)x6 * x6) + (((uint128_t)x8 * x4) + ((uint128_t)x10 * x2))))) + (0x11 * ((uint128_t)x9 * x9)));
+  { uint128_t x13 = ((((uint128_t)x2 * x8) + (((uint128_t)x4 * x6) + (((uint128_t)x6 * x4) + ((uint128_t)x8 * x2)))) + (0x11 * (((uint128_t)x10 * x9) + ((uint128_t)x9 * x10))));
+  { uint128_t x14 = ((((uint128_t)x2 * x6) + (((uint128_t)x4 * x4) + ((uint128_t)x6 * x2))) + (0x11 * (((uint128_t)x8 * x9) + (((uint128_t)x10 * x10) + ((uint128_t)x9 * x8)))));
+  { uint128_t x15 = ((((uint128_t)x2 * x4) + ((uint128_t)x4 * x2)) + (0x11 * (((uint128_t)x6 * x9) + (((uint128_t)x8 * x10) + (((uint128_t)x10 * x8) + ((uint128_t)x9 * x6))))));
+  { uint128_t x16 = (((uint128_t)x2 * x2) + (0x11 * (((uint128_t)x4 * x9) + (((uint128_t)x6 * x10) + (((uint128_t)x8 * x8) + (((uint128_t)x10 * x6) + ((uint128_t)x9 * x4)))))));
+  { uint128_t x17 = (x16 >> 0x38);
+  { uint64_t x18 = ((uint64_t)x16 & 0xffffffffffffff);
+  { uint128_t x19 = (x17 + x15);
+  { uint128_t x20 = (x19 >> 0x38);
+  { uint64_t x21 = ((uint64_t)x19 & 0xffffffffffffff);
+  { uint128_t x22 = (x20 + x14);
+  { uint128_t x23 = (x22 >> 0x38);
+  { uint64_t x24 = ((uint64_t)x22 & 0xffffffffffffff);
+  { uint128_t x25 = (x23 + x13);
+  { uint128_t x26 = (x25 >> 0x38);
+  { uint64_t x27 = ((uint64_t)x25 & 0xffffffffffffff);
+  { uint128_t x28 = (x26 + x12);
+  { uint64_t x29 = (uint64_t) (x28 >> 0x38);
+  { uint64_t x30 = ((uint64_t)x28 & 0xffffffffffffff);
+  { uint128_t x31 = (x29 + x11);
+  { uint64_t x32 = (uint64_t) (x31 >> 0x38);
+  { uint64_t x33 = ((uint64_t)x31 & 0xffffffffffffff);
+  { uint128_t x34 = (x18 + ((uint128_t)0x11 * x32));
+  { uint64_t x35 = (uint64_t) (x34 >> 0x38);
+  { uint64_t x36 = ((uint64_t)x34 & 0xffffffffffffff);
+  { uint64_t x37 = (x35 + x21);
+  { uint64_t x38 = (x37 >> 0x38);
+  { uint64_t x39 = (x37 & 0xffffffffffffff);
+  out[0] = x36;
+  out[1] = x39;
+  out[2] = (x38 + x24);
+  out[3] = x27;
+  out[4] = x30;
+  out[5] = x33;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas64_2e336m17/freeze.c b/src/Specific/solinas64_2e336m17/freeze.c
index 7f9c2afb6..2ea95eb06 100644
--- a/src/Specific/solinas64_2e336m17/freeze.c
+++ b/src/Specific/solinas64_2e336m17/freeze.c
@@ -1,25 +1,34 @@
-#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 x9, uint64_t x10, uint64_t x8, uint64_t x6, uint64_t x4, uint64_t x2)
-out[0] = uint64_t x12;
-out[1] = uint8_t x13 = Op Syntax.SubWithGetBorrow 56 Syntax.TWord 3 Syntax.TWord 6 Syntax.TWord 6 Syntax.TWord 6 Syntax.TWord 3 0x0;
-out[2] = x2;
-out[3] = 0xffffffffffffef;;
+static void freeze(uint64_t out[6], const uint64_t in1[6]) {
+  { const uint64_t x9 = in1[5];
+  { const uint64_t x10 = 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 x12, uint8_t x13 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x2, 0xffffffffffffef);
+  { uint64_t x15, uint8_t x16 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x13, Return x4, 0xffffffffffffff);
+  { uint64_t x18, uint8_t x19 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x16, Return x6, 0xffffffffffffff);
+  { uint64_t x21, uint8_t x22 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x19, Return x8, 0xffffffffffffff);
+  { uint64_t x24, uint8_t x25 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x22, Return x10, 0xffffffffffffff);
+  { uint64_t x27, uint8_t x28 = Op (Syntax.SubWithGetBorrow 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x25, Return x9, 0xffffffffffffff);
+  { uint64_t x29 = (uint64_t)cmovznz(x28, 0x0, 0xffffffffffffffffL);
+  { uint64_t x30 = (x29 & 0xffffffffffffef);
+  { uint64_t x32, uint8_t x33 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (0x0, Return x12, Return x30);
+  { uint64_t x34 = (x29 & 0xffffffffffffff);
+  { uint64_t x36, uint8_t x37 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x33, Return x15, Return x34);
+  { uint64_t x38 = (x29 & 0xffffffffffffff);
+  { uint64_t x40, uint8_t x41 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x37, Return x18, Return x38);
+  { uint64_t x42 = (x29 & 0xffffffffffffff);
+  { uint64_t x44, uint8_t x45 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x41, Return x21, Return x42);
+  { uint64_t x46 = (x29 & 0xffffffffffffff);
+  { uint64_t x48, uint8_t x49 = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x45, Return x24, Return x46);
+  { uint64_t x50 = (x29 & 0xffffffffffffff);
+  { uint64_t x52, uint8_t _ = Op (Syntax.AddWithGetCarry 56 (Syntax.TWord 3) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 6) (Syntax.TWord 3)) (Return x49, Return x27, Return x50);
+  out[0] = x32;
+  out[1] = x36;
+  out[2] = x40;
+  out[3] = x44;
+  out[4] = x48;
+  out[5] = x52;
+  }}}}}}}}}}}}}}}}}}}}}}}}}
 }
-// caller: uint64_t out[4];