Update display logs and c files

3 files changed, 163 insertions, 156 deletions

diff --git a/src/Specific/solinas32_2e137m13/femul.c b/src/Specific/solinas32_2e137m13/femul.c
index 67bc63d33..f2a69d86a 100644
--- a/src/Specific/solinas32_2e137m13/femul.c
+++ b/src/Specific/solinas32_2e137m13/femul.c
@@ -1,66 +1,64 @@
-#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 x16, uint64_t x17, uint64_t x15, uint64_t x13, uint64_t x11, uint64_t x9, uint64_t x7, uint64_t x5, uint64_t x30, uint64_t x31, uint64_t x29, uint64_t x27, uint64_t x25, uint64_t x23, uint64_t x21, uint64_t x19)
-{  uint64_t x32 = (((uint64_t)x5 * x30) + ((0x2 * ((uint64_t)x7 * x31)) + ((0x2 * ((uint64_t)x9 * x29)) + ((0x2 * ((uint64_t)x11 * x27)) + ((0x2 * ((uint64_t)x13 * x25)) + ((0x2 * ((uint64_t)x15 * x23)) + ((0x2 * ((uint64_t)x17 * x21)) + ((uint64_t)x16 * x19))))))));
-{  uint64_t x33 = ((((uint64_t)x5 * x31) + ((0x2 * ((uint64_t)x7 * x29)) + ((0x2 * ((uint64_t)x9 * x27)) + ((0x2 * ((uint64_t)x11 * x25)) + ((0x2 * ((uint64_t)x13 * x23)) + ((0x2 * ((uint64_t)x15 * x21)) + ((uint64_t)x17 * x19))))))) + (0xd * ((uint64_t)x16 * x30)));
-{  uint64_t x34 = ((((uint64_t)x5 * x29) + ((0x2 * ((uint64_t)x7 * x27)) + ((0x2 * ((uint64_t)x9 * x25)) + ((0x2 * ((uint64_t)x11 * x23)) + ((0x2 * ((uint64_t)x13 * x21)) + ((uint64_t)x15 * x19)))))) + (0xd * (((uint64_t)x17 * x30) + ((uint64_t)x16 * x31))));
-{  uint64_t x35 = ((((uint64_t)x5 * x27) + ((0x2 * ((uint64_t)x7 * x25)) + ((0x2 * ((uint64_t)x9 * x23)) + ((0x2 * ((uint64_t)x11 * x21)) + ((uint64_t)x13 * x19))))) + (0xd * (((uint64_t)x15 * x30) + (((uint64_t)x17 * x31) + ((uint64_t)x16 * x29)))));
-{  uint64_t x36 = ((((uint64_t)x5 * x25) + ((0x2 * ((uint64_t)x7 * x23)) + ((0x2 * ((uint64_t)x9 * x21)) + ((uint64_t)x11 * x19)))) + (0xd * (((uint64_t)x13 * x30) + (((uint64_t)x15 * x31) + (((uint64_t)x17 * x29) + ((uint64_t)x16 * x27))))));
-{  uint64_t x37 = ((((uint64_t)x5 * x23) + ((0x2 * ((uint64_t)x7 * x21)) + ((uint64_t)x9 * x19))) + (0xd * (((uint64_t)x11 * x30) + (((uint64_t)x13 * x31) + (((uint64_t)x15 * x29) + (((uint64_t)x17 * x27) + ((uint64_t)x16 * x25)))))));
-{  uint64_t x38 = ((((uint64_t)x5 * x21) + ((uint64_t)x7 * x19)) + (0xd * (((uint64_t)x9 * x30) + (((uint64_t)x11 * x31) + (((uint64_t)x13 * x29) + (((uint64_t)x15 * x27) + (((uint64_t)x17 * x25) + ((uint64_t)x16 * x23))))))));
-{  uint64_t x39 = (((uint64_t)x5 * x19) + (0xd * ((0x2 * ((uint64_t)x7 * x30)) + ((0x2 * ((uint64_t)x9 * x31)) + ((0x2 * ((uint64_t)x11 * x29)) + ((0x2 * ((uint64_t)x13 * x27)) + ((0x2 * ((uint64_t)x15 * x25)) + ((0x2 * ((uint64_t)x17 * x23)) + (0x2 * ((uint64_t)x16 * x21))))))))));
-{  uint32_t x40 = (uint32_t) (x39 >> 0x12);
-{  uint32_t x41 = ((uint32_t)x39 & 0x3ffff);
-{  uint64_t x42 = (x40 + x38);
-{  uint32_t x43 = (uint32_t) (x42 >> 0x11);
-{  uint32_t x44 = ((uint32_t)x42 & 0x1ffff);
-{  uint64_t x45 = (x43 + x37);
-{  uint32_t x46 = (uint32_t) (x45 >> 0x11);
-{  uint32_t x47 = ((uint32_t)x45 & 0x1ffff);
-{  uint64_t x48 = (x46 + x36);
-{  uint32_t x49 = (uint32_t) (x48 >> 0x11);
-{  uint32_t x50 = ((uint32_t)x48 & 0x1ffff);
-{  uint64_t x51 = (x49 + x35);
-{  uint32_t x52 = (uint32_t) (x51 >> 0x11);
-{  uint32_t x53 = ((uint32_t)x51 & 0x1ffff);
-{  uint64_t x54 = (x52 + x34);
-{  uint32_t x55 = (uint32_t) (x54 >> 0x11);
-{  uint32_t x56 = ((uint32_t)x54 & 0x1ffff);
-{  uint64_t x57 = (x55 + x33);
-{  uint32_t x58 = (uint32_t) (x57 >> 0x11);
-{  uint32_t x59 = ((uint32_t)x57 & 0x1ffff);
-{  uint64_t x60 = (x58 + x32);
-{  uint32_t x61 = (uint32_t) (x60 >> 0x11);
-{  uint32_t x62 = ((uint32_t)x60 & 0x1ffff);
-{  uint32_t x63 = (x41 + (0xd * x61));
-{  uint32_t x64 = (x63 >> 0x12);
-{  uint32_t x65 = (x63 & 0x3ffff);
-{  uint32_t x66 = (x64 + x44);
-{  uint32_t x67 = (x66 >> 0x11);
-{  uint32_t x68 = (x66 & 0x1ffff);
-out[0] = x62;
-out[1] = x59;
-out[2] = x56;
-out[3] = x53;
-out[4] = x50;
-out[5] = x67 + x47;
-out[6] = x68;
-out[7] = x65;
-}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[8];
+static void femul(uint32_t out[8], const uint32_t in1[8], const uint32_t in2[8]) {
+  { const uint32_t x16 = in1[7];
+  { const uint32_t x17 = in1[6];
+  { const uint32_t x15 = in1[5];
+  { const uint32_t x13 = in1[4];
+  { const uint32_t x11 = in1[3];
+  { const uint32_t x9 = in1[2];
+  { const uint32_t x7 = in1[1];
+  { const uint32_t x5 = in1[0];
+  { const uint32_t x30 = in2[7];
+  { const uint32_t x31 = in2[6];
+  { const uint32_t x29 = in2[5];
+  { const uint32_t x27 = in2[4];
+  { const uint32_t x25 = in2[3];
+  { const uint32_t x23 = in2[2];
+  { const uint32_t x21 = in2[1];
+  { const uint32_t x19 = in2[0];
+  { uint64_t x32 = (((uint64_t)x5 * x30) + ((0x2 * ((uint64_t)x7 * x31)) + ((0x2 * ((uint64_t)x9 * x29)) + ((0x2 * ((uint64_t)x11 * x27)) + ((0x2 * ((uint64_t)x13 * x25)) + ((0x2 * ((uint64_t)x15 * x23)) + ((0x2 * ((uint64_t)x17 * x21)) + ((uint64_t)x16 * x19))))))));
+  { uint64_t x33 = ((((uint64_t)x5 * x31) + ((0x2 * ((uint64_t)x7 * x29)) + ((0x2 * ((uint64_t)x9 * x27)) + ((0x2 * ((uint64_t)x11 * x25)) + ((0x2 * ((uint64_t)x13 * x23)) + ((0x2 * ((uint64_t)x15 * x21)) + ((uint64_t)x17 * x19))))))) + (0xd * ((uint64_t)x16 * x30)));
+  { uint64_t x34 = ((((uint64_t)x5 * x29) + ((0x2 * ((uint64_t)x7 * x27)) + ((0x2 * ((uint64_t)x9 * x25)) + ((0x2 * ((uint64_t)x11 * x23)) + ((0x2 * ((uint64_t)x13 * x21)) + ((uint64_t)x15 * x19)))))) + (0xd * (((uint64_t)x17 * x30) + ((uint64_t)x16 * x31))));
+  { uint64_t x35 = ((((uint64_t)x5 * x27) + ((0x2 * ((uint64_t)x7 * x25)) + ((0x2 * ((uint64_t)x9 * x23)) + ((0x2 * ((uint64_t)x11 * x21)) + ((uint64_t)x13 * x19))))) + (0xd * (((uint64_t)x15 * x30) + (((uint64_t)x17 * x31) + ((uint64_t)x16 * x29)))));
+  { uint64_t x36 = ((((uint64_t)x5 * x25) + ((0x2 * ((uint64_t)x7 * x23)) + ((0x2 * ((uint64_t)x9 * x21)) + ((uint64_t)x11 * x19)))) + (0xd * (((uint64_t)x13 * x30) + (((uint64_t)x15 * x31) + (((uint64_t)x17 * x29) + ((uint64_t)x16 * x27))))));
+  { uint64_t x37 = ((((uint64_t)x5 * x23) + ((0x2 * ((uint64_t)x7 * x21)) + ((uint64_t)x9 * x19))) + (0xd * (((uint64_t)x11 * x30) + (((uint64_t)x13 * x31) + (((uint64_t)x15 * x29) + (((uint64_t)x17 * x27) + ((uint64_t)x16 * x25)))))));
+  { uint64_t x38 = ((((uint64_t)x5 * x21) + ((uint64_t)x7 * x19)) + (0xd * (((uint64_t)x9 * x30) + (((uint64_t)x11 * x31) + (((uint64_t)x13 * x29) + (((uint64_t)x15 * x27) + (((uint64_t)x17 * x25) + ((uint64_t)x16 * x23))))))));
+  { uint64_t x39 = (((uint64_t)x5 * x19) + (0xd * ((0x2 * ((uint64_t)x7 * x30)) + ((0x2 * ((uint64_t)x9 * x31)) + ((0x2 * ((uint64_t)x11 * x29)) + ((0x2 * ((uint64_t)x13 * x27)) + ((0x2 * ((uint64_t)x15 * x25)) + ((0x2 * ((uint64_t)x17 * x23)) + (0x2 * ((uint64_t)x16 * x21))))))))));
+  { uint32_t x40 = (uint32_t) (x39 >> 0x12);
+  { uint32_t x41 = ((uint32_t)x39 & 0x3ffff);
+  { uint64_t x42 = (x40 + x38);
+  { uint32_t x43 = (uint32_t) (x42 >> 0x11);
+  { uint32_t x44 = ((uint32_t)x42 & 0x1ffff);
+  { uint64_t x45 = (x43 + x37);
+  { uint32_t x46 = (uint32_t) (x45 >> 0x11);
+  { uint32_t x47 = ((uint32_t)x45 & 0x1ffff);
+  { uint64_t x48 = (x46 + x36);
+  { uint32_t x49 = (uint32_t) (x48 >> 0x11);
+  { uint32_t x50 = ((uint32_t)x48 & 0x1ffff);
+  { uint64_t x51 = (x49 + x35);
+  { uint32_t x52 = (uint32_t) (x51 >> 0x11);
+  { uint32_t x53 = ((uint32_t)x51 & 0x1ffff);
+  { uint64_t x54 = (x52 + x34);
+  { uint32_t x55 = (uint32_t) (x54 >> 0x11);
+  { uint32_t x56 = ((uint32_t)x54 & 0x1ffff);
+  { uint64_t x57 = (x55 + x33);
+  { uint32_t x58 = (uint32_t) (x57 >> 0x11);
+  { uint32_t x59 = ((uint32_t)x57 & 0x1ffff);
+  { uint64_t x60 = (x58 + x32);
+  { uint32_t x61 = (uint32_t) (x60 >> 0x11);
+  { uint32_t x62 = ((uint32_t)x60 & 0x1ffff);
+  { uint32_t x63 = (x41 + (0xd * x61));
+  { uint32_t x64 = (x63 >> 0x12);
+  { uint32_t x65 = (x63 & 0x3ffff);
+  { uint32_t x66 = (x64 + x44);
+  { uint32_t x67 = (x66 >> 0x11);
+  { uint32_t x68 = (x66 & 0x1ffff);
+  out[0] = x65;
+  out[1] = x68;
+  out[2] = (x67 + x47);
+  out[3] = x50;
+  out[4] = x53;
+  out[5] = x56;
+  out[6] = x59;
+  out[7] = x62;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas32_2e137m13/fesquare.c b/src/Specific/solinas32_2e137m13/fesquare.c
index 805e9790e..95472900d 100644
--- a/src/Specific/solinas32_2e137m13/fesquare.c
+++ b/src/Specific/solinas32_2e137m13/fesquare.c
@@ -1,66 +1,56 @@
-#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 x13, uint64_t x14, uint64_t x12, uint64_t x10, uint64_t x8, uint64_t x6, uint64_t x4, uint64_t x2)
-{  uint64_t x15 = (((uint64_t)x2 * x13) + ((0x2 * ((uint64_t)x4 * x14)) + ((0x2 * ((uint64_t)x6 * x12)) + ((0x2 * ((uint64_t)x8 * x10)) + ((0x2 * ((uint64_t)x10 * x8)) + ((0x2 * ((uint64_t)x12 * x6)) + ((0x2 * ((uint64_t)x14 * x4)) + ((uint64_t)x13 * x2))))))));
-{  uint64_t x16 = ((((uint64_t)x2 * x14) + ((0x2 * ((uint64_t)x4 * x12)) + ((0x2 * ((uint64_t)x6 * x10)) + ((0x2 * ((uint64_t)x8 * x8)) + ((0x2 * ((uint64_t)x10 * x6)) + ((0x2 * ((uint64_t)x12 * x4)) + ((uint64_t)x14 * x2))))))) + (0xd * ((uint64_t)x13 * x13)));
-{  uint64_t x17 = ((((uint64_t)x2 * x12) + ((0x2 * ((uint64_t)x4 * x10)) + ((0x2 * ((uint64_t)x6 * x8)) + ((0x2 * ((uint64_t)x8 * x6)) + ((0x2 * ((uint64_t)x10 * x4)) + ((uint64_t)x12 * x2)))))) + (0xd * (((uint64_t)x14 * x13) + ((uint64_t)x13 * x14))));
-{  uint64_t x18 = ((((uint64_t)x2 * x10) + ((0x2 * ((uint64_t)x4 * x8)) + ((0x2 * ((uint64_t)x6 * x6)) + ((0x2 * ((uint64_t)x8 * x4)) + ((uint64_t)x10 * x2))))) + (0xd * (((uint64_t)x12 * x13) + (((uint64_t)x14 * x14) + ((uint64_t)x13 * x12)))));
-{  uint64_t x19 = ((((uint64_t)x2 * x8) + ((0x2 * ((uint64_t)x4 * x6)) + ((0x2 * ((uint64_t)x6 * x4)) + ((uint64_t)x8 * x2)))) + (0xd * (((uint64_t)x10 * x13) + (((uint64_t)x12 * x14) + (((uint64_t)x14 * x12) + ((uint64_t)x13 * x10))))));
-{  uint64_t x20 = ((((uint64_t)x2 * x6) + ((0x2 * ((uint64_t)x4 * x4)) + ((uint64_t)x6 * x2))) + (0xd * (((uint64_t)x8 * x13) + (((uint64_t)x10 * x14) + (((uint64_t)x12 * x12) + (((uint64_t)x14 * x10) + ((uint64_t)x13 * x8)))))));
-{  uint64_t x21 = ((((uint64_t)x2 * x4) + ((uint64_t)x4 * x2)) + (0xd * (((uint64_t)x6 * x13) + (((uint64_t)x8 * x14) + (((uint64_t)x10 * x12) + (((uint64_t)x12 * x10) + (((uint64_t)x14 * x8) + ((uint64_t)x13 * x6))))))));
-{  uint64_t x22 = (((uint64_t)x2 * x2) + (0xd * ((0x2 * ((uint64_t)x4 * x13)) + ((0x2 * ((uint64_t)x6 * x14)) + ((0x2 * ((uint64_t)x8 * x12)) + ((0x2 * ((uint64_t)x10 * x10)) + ((0x2 * ((uint64_t)x12 * x8)) + ((0x2 * ((uint64_t)x14 * x6)) + (0x2 * ((uint64_t)x13 * x4))))))))));
-{  uint32_t x23 = (uint32_t) (x22 >> 0x12);
-{  uint32_t x24 = ((uint32_t)x22 & 0x3ffff);
-{  uint64_t x25 = (x23 + x21);
-{  uint32_t x26 = (uint32_t) (x25 >> 0x11);
-{  uint32_t x27 = ((uint32_t)x25 & 0x1ffff);
-{  uint64_t x28 = (x26 + x20);
-{  uint32_t x29 = (uint32_t) (x28 >> 0x11);
-{  uint32_t x30 = ((uint32_t)x28 & 0x1ffff);
-{  uint64_t x31 = (x29 + x19);
-{  uint32_t x32 = (uint32_t) (x31 >> 0x11);
-{  uint32_t x33 = ((uint32_t)x31 & 0x1ffff);
-{  uint64_t x34 = (x32 + x18);
-{  uint32_t x35 = (uint32_t) (x34 >> 0x11);
-{  uint32_t x36 = ((uint32_t)x34 & 0x1ffff);
-{  uint64_t x37 = (x35 + x17);
-{  uint32_t x38 = (uint32_t) (x37 >> 0x11);
-{  uint32_t x39 = ((uint32_t)x37 & 0x1ffff);
-{  uint64_t x40 = (x38 + x16);
-{  uint32_t x41 = (uint32_t) (x40 >> 0x11);
-{  uint32_t x42 = ((uint32_t)x40 & 0x1ffff);
-{  uint64_t x43 = (x41 + x15);
-{  uint32_t x44 = (uint32_t) (x43 >> 0x11);
-{  uint32_t x45 = ((uint32_t)x43 & 0x1ffff);
-{  uint32_t x46 = (x24 + (0xd * x44));
-{  uint32_t x47 = (x46 >> 0x12);
-{  uint32_t x48 = (x46 & 0x3ffff);
-{  uint32_t x49 = (x47 + x27);
-{  uint32_t x50 = (x49 >> 0x11);
-{  uint32_t x51 = (x49 & 0x1ffff);
-out[0] = x45;
-out[1] = x42;
-out[2] = x39;
-out[3] = x36;
-out[4] = x33;
-out[5] = x50 + x30;
-out[6] = x51;
-out[7] = x48;
-}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[8];
+static void fesquare(uint32_t out[8], const uint32_t in1[8]) {
+  { const uint32_t x13 = in1[7];
+  { const uint32_t x14 = in1[6];
+  { const uint32_t x12 = in1[5];
+  { const uint32_t x10 = in1[4];
+  { const uint32_t x8 = in1[3];
+  { const uint32_t x6 = in1[2];
+  { const uint32_t x4 = in1[1];
+  { const uint32_t x2 = in1[0];
+  { uint64_t x15 = (((uint64_t)x2 * x13) + ((0x2 * ((uint64_t)x4 * x14)) + ((0x2 * ((uint64_t)x6 * x12)) + ((0x2 * ((uint64_t)x8 * x10)) + ((0x2 * ((uint64_t)x10 * x8)) + ((0x2 * ((uint64_t)x12 * x6)) + ((0x2 * ((uint64_t)x14 * x4)) + ((uint64_t)x13 * x2))))))));
+  { uint64_t x16 = ((((uint64_t)x2 * x14) + ((0x2 * ((uint64_t)x4 * x12)) + ((0x2 * ((uint64_t)x6 * x10)) + ((0x2 * ((uint64_t)x8 * x8)) + ((0x2 * ((uint64_t)x10 * x6)) + ((0x2 * ((uint64_t)x12 * x4)) + ((uint64_t)x14 * x2))))))) + (0xd * ((uint64_t)x13 * x13)));
+  { uint64_t x17 = ((((uint64_t)x2 * x12) + ((0x2 * ((uint64_t)x4 * x10)) + ((0x2 * ((uint64_t)x6 * x8)) + ((0x2 * ((uint64_t)x8 * x6)) + ((0x2 * ((uint64_t)x10 * x4)) + ((uint64_t)x12 * x2)))))) + (0xd * (((uint64_t)x14 * x13) + ((uint64_t)x13 * x14))));
+  { uint64_t x18 = ((((uint64_t)x2 * x10) + ((0x2 * ((uint64_t)x4 * x8)) + ((0x2 * ((uint64_t)x6 * x6)) + ((0x2 * ((uint64_t)x8 * x4)) + ((uint64_t)x10 * x2))))) + (0xd * (((uint64_t)x12 * x13) + (((uint64_t)x14 * x14) + ((uint64_t)x13 * x12)))));
+  { uint64_t x19 = ((((uint64_t)x2 * x8) + ((0x2 * ((uint64_t)x4 * x6)) + ((0x2 * ((uint64_t)x6 * x4)) + ((uint64_t)x8 * x2)))) + (0xd * (((uint64_t)x10 * x13) + (((uint64_t)x12 * x14) + (((uint64_t)x14 * x12) + ((uint64_t)x13 * x10))))));
+  { uint64_t x20 = ((((uint64_t)x2 * x6) + ((0x2 * ((uint64_t)x4 * x4)) + ((uint64_t)x6 * x2))) + (0xd * (((uint64_t)x8 * x13) + (((uint64_t)x10 * x14) + (((uint64_t)x12 * x12) + (((uint64_t)x14 * x10) + ((uint64_t)x13 * x8)))))));
+  { uint64_t x21 = ((((uint64_t)x2 * x4) + ((uint64_t)x4 * x2)) + (0xd * (((uint64_t)x6 * x13) + (((uint64_t)x8 * x14) + (((uint64_t)x10 * x12) + (((uint64_t)x12 * x10) + (((uint64_t)x14 * x8) + ((uint64_t)x13 * x6))))))));
+  { uint64_t x22 = (((uint64_t)x2 * x2) + (0xd * ((0x2 * ((uint64_t)x4 * x13)) + ((0x2 * ((uint64_t)x6 * x14)) + ((0x2 * ((uint64_t)x8 * x12)) + ((0x2 * ((uint64_t)x10 * x10)) + ((0x2 * ((uint64_t)x12 * x8)) + ((0x2 * ((uint64_t)x14 * x6)) + (0x2 * ((uint64_t)x13 * x4))))))))));
+  { uint32_t x23 = (uint32_t) (x22 >> 0x12);
+  { uint32_t x24 = ((uint32_t)x22 & 0x3ffff);
+  { uint64_t x25 = (x23 + x21);
+  { uint32_t x26 = (uint32_t) (x25 >> 0x11);
+  { uint32_t x27 = ((uint32_t)x25 & 0x1ffff);
+  { uint64_t x28 = (x26 + x20);
+  { uint32_t x29 = (uint32_t) (x28 >> 0x11);
+  { uint32_t x30 = ((uint32_t)x28 & 0x1ffff);
+  { uint64_t x31 = (x29 + x19);
+  { uint32_t x32 = (uint32_t) (x31 >> 0x11);
+  { uint32_t x33 = ((uint32_t)x31 & 0x1ffff);
+  { uint64_t x34 = (x32 + x18);
+  { uint32_t x35 = (uint32_t) (x34 >> 0x11);
+  { uint32_t x36 = ((uint32_t)x34 & 0x1ffff);
+  { uint64_t x37 = (x35 + x17);
+  { uint32_t x38 = (uint32_t) (x37 >> 0x11);
+  { uint32_t x39 = ((uint32_t)x37 & 0x1ffff);
+  { uint64_t x40 = (x38 + x16);
+  { uint32_t x41 = (uint32_t) (x40 >> 0x11);
+  { uint32_t x42 = ((uint32_t)x40 & 0x1ffff);
+  { uint64_t x43 = (x41 + x15);
+  { uint32_t x44 = (uint32_t) (x43 >> 0x11);
+  { uint32_t x45 = ((uint32_t)x43 & 0x1ffff);
+  { uint32_t x46 = (x24 + (0xd * x44));
+  { uint32_t x47 = (x46 >> 0x12);
+  { uint32_t x48 = (x46 & 0x3ffff);
+  { uint32_t x49 = (x47 + x27);
+  { uint32_t x50 = (x49 >> 0x11);
+  { uint32_t x51 = (x49 & 0x1ffff);
+  out[0] = x48;
+  out[1] = x51;
+  out[2] = (x50 + x30);
+  out[3] = x33;
+  out[4] = x36;
+  out[5] = x39;
+  out[6] = x42;
+  out[7] = x45;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/solinas32_2e137m13/freeze.c b/src/Specific/solinas32_2e137m13/freeze.c
index 041ae06fe..57df7987e 100644
--- a/src/Specific/solinas32_2e137m13/freeze.c
+++ b/src/Specific/solinas32_2e137m13/freeze.c
@@ -1,25 +1,44 @@
-#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 x13, uint64_t x14, uint64_t x12, uint64_t x10, uint64_t x8, uint64_t x6, uint64_t x4, uint64_t x2)
-out[0] = uint32_t x16;
-out[1] = uint8_t x17 = Op Syntax.SubWithGetBorrow 18 Syntax.TWord 3 Syntax.TWord 5 Syntax.TWord 5 Syntax.TWord 5 Syntax.TWord 3 0x0;
-out[2] = x2;
-out[3] = 0x3fff3;;
+static void freeze(uint32_t out[8], const uint32_t in1[8]) {
+  { const uint32_t x13 = in1[7];
+  { const uint32_t x14 = in1[6];
+  { const uint32_t x12 = in1[5];
+  { const uint32_t x10 = in1[4];
+  { const uint32_t x8 = in1[3];
+  { const uint32_t x6 = in1[2];
+  { const uint32_t x4 = in1[1];
+  { const uint32_t x2 = in1[0];
+  { uint32_t x16, uint8_t x17 = Op (Syntax.SubWithGetBorrow 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x2, 0x3fff3);
+  { uint32_t x19, uint8_t x20 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x17, Return x4, 0x1ffff);
+  { uint32_t x22, uint8_t x23 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x20, Return x6, 0x1ffff);
+  { uint32_t x25, uint8_t x26 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x23, Return x8, 0x1ffff);
+  { uint32_t x28, uint8_t x29 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x26, Return x10, 0x1ffff);
+  { uint32_t x31, uint8_t x32 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x29, Return x12, 0x1ffff);
+  { uint32_t x34, uint8_t x35 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x32, Return x14, 0x1ffff);
+  { uint32_t x37, uint8_t x38 = Op (Syntax.SubWithGetBorrow 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x35, Return x13, 0x1ffff);
+  { uint32_t x39 = (uint32_t)cmovznz(x38, 0x0, 0xffffffff);
+  { uint32_t x40 = (x39 & 0x3fff3);
+  { uint32_t x42, uint8_t x43 = Op (Syntax.AddWithGetCarry 18 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (0x0, Return x16, Return x40);
+  { uint32_t x44 = (x39 & 0x1ffff);
+  { uint32_t x46, uint8_t x47 = Op (Syntax.AddWithGetCarry 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x43, Return x19, Return x44);
+  { uint32_t x48 = (x39 & 0x1ffff);
+  { uint32_t x50, uint8_t x51 = Op (Syntax.AddWithGetCarry 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x47, Return x22, Return x48);
+  { uint32_t x52 = (x39 & 0x1ffff);
+  { uint32_t x54, uint8_t x55 = Op (Syntax.AddWithGetCarry 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x51, Return x25, Return x52);
+  { uint32_t x56 = (x39 & 0x1ffff);
+  { uint32_t x58, uint8_t x59 = Op (Syntax.AddWithGetCarry 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x55, Return x28, Return x56);
+  { uint32_t x60 = (x39 & 0x1ffff);
+  { uint32_t x62, uint8_t x63 = Op (Syntax.AddWithGetCarry 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x59, Return x31, Return x60);
+  { uint32_t x64 = (x39 & 0x1ffff);
+  { uint32_t x66, uint8_t x67 = Op (Syntax.AddWithGetCarry 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x63, Return x34, Return x64);
+  { uint32_t x68 = (x39 & 0x1ffff);
+  { uint32_t x70, uint8_t _ = Op (Syntax.AddWithGetCarry 17 (Syntax.TWord 3) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 5) (Syntax.TWord 3)) (Return x67, Return x37, Return x68);
+  out[0] = x42;
+  out[1] = x46;
+  out[2] = x50;
+  out[3] = x54;
+  out[4] = x58;
+  out[5] = x62;
+  out[6] = x66;
+  out[7] = x70;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 }
-// caller: uint64_t out[4];