Update display logs and c files

2 files changed, 71 insertions, 83 deletions

diff --git a/src/Specific/montgomery64_2e450m2e225m1/feadd.c b/src/Specific/montgomery64_2e450m2e225m1/feadd.c
index 2e0e920dc..6a47c0239 100644
--- a/src/Specific/montgomery64_2e450m2e225m1/feadd.c
+++ b/src/Specific/montgomery64_2e450m2e225m1/feadd.c
@@ -1,54 +1,52 @@
-#include <stdint.h>
-#include <stdbool.h>
-#include <x86intrin.h>
-#include "liblow.h"
-
-#include "feadd.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 feadd(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 x33; uint8_t x34 = _addcarryx_u64(0x0, x5, x19, &x33);
-{  uint64_t x36; uint8_t x37 = _addcarryx_u64(x34, x7, x21, &x36);
-{  uint64_t x39; uint8_t x40 = _addcarryx_u64(x37, x9, x23, &x39);
-{  uint64_t x42; uint8_t x43 = _addcarryx_u64(x40, x11, x25, &x42);
-{  uint64_t x45; uint8_t x46 = _addcarryx_u64(x43, x13, x27, &x45);
-{  uint64_t x48; uint8_t x49 = _addcarryx_u64(x46, x15, x29, &x48);
-{  uint64_t x51; uint8_t x52 = _addcarryx_u64(x49, x17, x31, &x51);
-{  uint64_t x54; uint8_t x55 = _addcarryx_u64(x52, x16, x30, &x54);
-{  uint64_t x57; uint8_t x58 = _subborrow_u64(0x0, x33, 0xffffffffffffffffL, &x57);
-{  uint64_t x60; uint8_t x61 = _subborrow_u64(x58, x36, 0xffffffffffffffffL, &x60);
-{  uint64_t x63; uint8_t x64 = _subborrow_u64(x61, x39, 0xffffffffffffffffL, &x63);
-{  uint64_t x66; uint8_t x67 = _subborrow_u64(x64, x42, 0xfffffffdffffffffL, &x66);
-{  uint64_t x69; uint8_t x70 = _subborrow_u64(x67, x45, 0xffffffffffffffffL, &x69);
-{  uint64_t x72; uint8_t x73 = _subborrow_u64(x70, x48, 0xffffffffffffffffL, &x72);
-{  uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
-{  uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0x3, &x78);
-{  uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
-{  uint64_t x83 = cmovznz(x82, x78, x54);
-{  uint64_t x84 = cmovznz(x82, x75, x51);
-{  uint64_t x85 = cmovznz(x82, x72, x48);
-{  uint64_t x86 = cmovznz(x82, x69, x45);
-{  uint64_t x87 = cmovznz(x82, x66, x42);
-{  uint64_t x88 = cmovznz(x82, x63, x39);
-{  uint64_t x89 = cmovznz(x82, x60, x36);
-{  uint64_t x90 = cmovznz(x82, x57, x33);
-out[0] = x83;
-out[1] = x84;
-out[2] = x85;
-out[3] = x86;
-out[4] = x87;
-out[5] = x88;
-out[6] = x89;
-out[7] = x90;
-}}}}}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[8];
+static void feadd(uint64_t out[8], const uint64_t in1[8], const uint64_t in2[8]) {
+  { const uint64_t x16 = in1[7];
+  { const uint64_t x17 = in1[6];
+  { const uint64_t x15 = 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 x30 = in2[7];
+  { const uint64_t x31 = in2[6];
+  { const uint64_t x29 = in2[5];
+  { const uint64_t x27 = in2[4];
+  { const uint64_t x25 = in2[3];
+  { const uint64_t x23 = in2[2];
+  { const uint64_t x21 = in2[1];
+  { const uint64_t x19 = in2[0];
+  { uint64_t x33; uint8_t x34 = _addcarryx_u64(0x0, x5, x19, &x33);
+  { uint64_t x36; uint8_t x37 = _addcarryx_u64(x34, x7, x21, &x36);
+  { uint64_t x39; uint8_t x40 = _addcarryx_u64(x37, x9, x23, &x39);
+  { uint64_t x42; uint8_t x43 = _addcarryx_u64(x40, x11, x25, &x42);
+  { uint64_t x45; uint8_t x46 = _addcarryx_u64(x43, x13, x27, &x45);
+  { uint64_t x48; uint8_t x49 = _addcarryx_u64(x46, x15, x29, &x48);
+  { uint64_t x51; uint8_t x52 = _addcarryx_u64(x49, x17, x31, &x51);
+  { uint64_t x54; uint8_t x55 = _addcarryx_u64(x52, x16, x30, &x54);
+  { uint64_t x57; uint8_t x58 = _subborrow_u64(0x0, x33, 0xffffffffffffffffL, &x57);
+  { uint64_t x60; uint8_t x61 = _subborrow_u64(x58, x36, 0xffffffffffffffffL, &x60);
+  { uint64_t x63; uint8_t x64 = _subborrow_u64(x61, x39, 0xffffffffffffffffL, &x63);
+  { uint64_t x66; uint8_t x67 = _subborrow_u64(x64, x42, 0xfffffffdffffffffL, &x66);
+  { uint64_t x69; uint8_t x70 = _subborrow_u64(x67, x45, 0xffffffffffffffffL, &x69);
+  { uint64_t x72; uint8_t x73 = _subborrow_u64(x70, x48, 0xffffffffffffffffL, &x72);
+  { uint64_t x75; uint8_t x76 = _subborrow_u64(x73, x51, 0xffffffffffffffffL, &x75);
+  { uint64_t x78; uint8_t x79 = _subborrow_u64(x76, x54, 0x3, &x78);
+  { uint64_t _; uint8_t x82 = _subborrow_u64(x79, x55, 0x0, &_);
+  { uint64_t x83 = cmovznz(x82, x78, x54);
+  { uint64_t x84 = cmovznz(x82, x75, x51);
+  { uint64_t x85 = cmovznz(x82, x72, x48);
+  { uint64_t x86 = cmovznz(x82, x69, x45);
+  { uint64_t x87 = cmovznz(x82, x66, x42);
+  { uint64_t x88 = cmovznz(x82, x63, x39);
+  { uint64_t x89 = cmovznz(x82, x60, x36);
+  { uint64_t x90 = cmovznz(x82, x57, x33);
+  out[0] = x90;
+  out[1] = x89;
+  out[2] = x88;
+  out[3] = x87;
+  out[4] = x86;
+  out[5] = x85;
+  out[6] = x84;
+  out[7] = x83;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/montgomery64_2e450m2e225m1/fenz.c b/src/Specific/montgomery64_2e450m2e225m1/fenz.c
index 72878ca19..a07b0df9c 100644
--- a/src/Specific/montgomery64_2e450m2e225m1/fenz.c
+++ b/src/Specific/montgomery64_2e450m2e225m1/fenz.c
@@ -1,29 +1,19 @@
-#include <stdint.h>
-#include <stdbool.h>
-#include <x86intrin.h>
-#include "liblow.h"
-
-#include "fenz.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 fenz(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 = (x14 | x13);
-{  uint64_t x16 = (x12 | x15);
-{  uint64_t x17 = (x10 | x16);
-{  uint64_t x18 = (x8 | x17);
-{  uint64_t x19 = (x6 | x18);
-{  uint64_t x20 = (x4 | x19);
-{  uint64_t x21 = (x2 | x20);
-out[0] = x21;
-}}}}}}}
-// caller: uint64_t out[1];
+static void fenz(ReturnType uint64_t out[1], const uint64_t in1[8]) {
+  { const uint64_t x13 = in1[7];
+  { const uint64_t x14 = in1[6];
+  { const uint64_t x12 = 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 x15 = (x14 | x13);
+  { uint64_t x16 = (x12 | x15);
+  { uint64_t x17 = (x10 | x16);
+  { uint64_t x18 = (x8 | x17);
+  { uint64_t x19 = (x6 | x18);
+  { uint64_t x20 = (x4 | x19);
+  { uint64_t x21 = (x2 | x20);
+  out[0] = x21;
+  }}}}}}}}}}}}}}}
+}