Update display logs and c files

2 files changed, 79 insertions, 88 deletions

diff --git a/src/Specific/montgomery32_2e266m3/feadd.c b/src/Specific/montgomery32_2e266m3/feadd.c
index 4ec364754..d3ccc7460 100644
--- a/src/Specific/montgomery32_2e266m3/feadd.c
+++ b/src/Specific/montgomery32_2e266m3/feadd.c
@@ -1,58 +1,58 @@
-#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 x18, uint64_t x19, uint64_t x17, uint64_t x15, uint64_t x13, uint64_t x11, uint64_t x9, uint64_t x7, uint64_t x5, uint64_t x34, uint64_t x35, uint64_t x33, uint64_t x31, uint64_t x29, uint64_t x27, uint64_t x25, uint64_t x23, uint64_t x21)
-{  uint32_t x37; uint8_t x38 = _addcarryx_u32(0x0, x5, x21, &x37);
-{  uint32_t x40; uint8_t x41 = _addcarryx_u32(x38, x7, x23, &x40);
-{  uint32_t x43; uint8_t x44 = _addcarryx_u32(x41, x9, x25, &x43);
-{  uint32_t x46; uint8_t x47 = _addcarryx_u32(x44, x11, x27, &x46);
-{  uint32_t x49; uint8_t x50 = _addcarryx_u32(x47, x13, x29, &x49);
-{  uint32_t x52; uint8_t x53 = _addcarryx_u32(x50, x15, x31, &x52);
-{  uint32_t x55; uint8_t x56 = _addcarryx_u32(x53, x17, x33, &x55);
-{  uint32_t x58; uint8_t x59 = _addcarryx_u32(x56, x19, x35, &x58);
-{  uint32_t x61; uint8_t x62 = _addcarryx_u32(x59, x18, x34, &x61);
-{  uint32_t x64; uint8_t x65 = _subborrow_u32(0x0, x37, 0xfffffffd, &x64);
-{  uint32_t x67; uint8_t x68 = _subborrow_u32(x65, x40, 0xffffffff, &x67);
-{  uint32_t x70; uint8_t x71 = _subborrow_u32(x68, x43, 0xffffffff, &x70);
-{  uint32_t x73; uint8_t x74 = _subborrow_u32(x71, x46, 0xffffffff, &x73);
-{  uint32_t x76; uint8_t x77 = _subborrow_u32(x74, x49, 0xffffffff, &x76);
-{  uint32_t x79; uint8_t x80 = _subborrow_u32(x77, x52, 0xffffffff, &x79);
-{  uint32_t x82; uint8_t x83 = _subborrow_u32(x80, x55, 0xffffffff, &x82);
-{  uint32_t x85; uint8_t x86 = _subborrow_u32(x83, x58, 0xffffffff, &x85);
-{  uint32_t x88; uint8_t x89 = _subborrow_u32(x86, x61, 0x3ff, &x88);
-{  uint32_t _; uint8_t x92 = _subborrow_u32(x89, x62, 0x0, &_);
-{  uint32_t x93 = cmovznz(x92, x88, x61);
-{  uint32_t x94 = cmovznz(x92, x85, x58);
-{  uint32_t x95 = cmovznz(x92, x82, x55);
-{  uint32_t x96 = cmovznz(x92, x79, x52);
-{  uint32_t x97 = cmovznz(x92, x76, x49);
-{  uint32_t x98 = cmovznz(x92, x73, x46);
-{  uint32_t x99 = cmovznz(x92, x70, x43);
-{  uint32_t x100 = cmovznz(x92, x67, x40);
-{  uint32_t x101 = cmovznz(x92, x64, x37);
-out[0] = x93;
-out[1] = x94;
-out[2] = x95;
-out[3] = x96;
-out[4] = x97;
-out[5] = x98;
-out[6] = x99;
-out[7] = x100;
-out[8] = x101;
-}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[9];
+static void feadd(uint32_t out[9], const uint32_t in1[9], const uint32_t in2[9]) {
+  { const uint32_t x18 = in1[8];
+  { const uint32_t x19 = 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 x34 = in2[8];
+  { const uint32_t x35 = in2[7];
+  { const uint32_t x33 = in2[6];
+  { const uint32_t x31 = in2[5];
+  { const uint32_t x29 = in2[4];
+  { const uint32_t x27 = in2[3];
+  { const uint32_t x25 = in2[2];
+  { const uint32_t x23 = in2[1];
+  { const uint32_t x21 = in2[0];
+  { uint32_t x37; uint8_t x38 = _addcarryx_u32(0x0, x5, x21, &x37);
+  { uint32_t x40; uint8_t x41 = _addcarryx_u32(x38, x7, x23, &x40);
+  { uint32_t x43; uint8_t x44 = _addcarryx_u32(x41, x9, x25, &x43);
+  { uint32_t x46; uint8_t x47 = _addcarryx_u32(x44, x11, x27, &x46);
+  { uint32_t x49; uint8_t x50 = _addcarryx_u32(x47, x13, x29, &x49);
+  { uint32_t x52; uint8_t x53 = _addcarryx_u32(x50, x15, x31, &x52);
+  { uint32_t x55; uint8_t x56 = _addcarryx_u32(x53, x17, x33, &x55);
+  { uint32_t x58; uint8_t x59 = _addcarryx_u32(x56, x19, x35, &x58);
+  { uint32_t x61; uint8_t x62 = _addcarryx_u32(x59, x18, x34, &x61);
+  { uint32_t x64; uint8_t x65 = _subborrow_u32(0x0, x37, 0xfffffffd, &x64);
+  { uint32_t x67; uint8_t x68 = _subborrow_u32(x65, x40, 0xffffffff, &x67);
+  { uint32_t x70; uint8_t x71 = _subborrow_u32(x68, x43, 0xffffffff, &x70);
+  { uint32_t x73; uint8_t x74 = _subborrow_u32(x71, x46, 0xffffffff, &x73);
+  { uint32_t x76; uint8_t x77 = _subborrow_u32(x74, x49, 0xffffffff, &x76);
+  { uint32_t x79; uint8_t x80 = _subborrow_u32(x77, x52, 0xffffffff, &x79);
+  { uint32_t x82; uint8_t x83 = _subborrow_u32(x80, x55, 0xffffffff, &x82);
+  { uint32_t x85; uint8_t x86 = _subborrow_u32(x83, x58, 0xffffffff, &x85);
+  { uint32_t x88; uint8_t x89 = _subborrow_u32(x86, x61, 0x3ff, &x88);
+  { uint32_t _; uint8_t x92 = _subborrow_u32(x89, x62, 0x0, &_);
+  { uint32_t x93 = cmovznz(x92, x88, x61);
+  { uint32_t x94 = cmovznz(x92, x85, x58);
+  { uint32_t x95 = cmovznz(x92, x82, x55);
+  { uint32_t x96 = cmovznz(x92, x79, x52);
+  { uint32_t x97 = cmovznz(x92, x76, x49);
+  { uint32_t x98 = cmovznz(x92, x73, x46);
+  { uint32_t x99 = cmovznz(x92, x70, x43);
+  { uint32_t x100 = cmovznz(x92, x67, x40);
+  { uint32_t x101 = cmovznz(x92, x64, x37);
+  out[0] = x101;
+  out[1] = x100;
+  out[2] = x99;
+  out[3] = x98;
+  out[4] = x97;
+  out[5] = x96;
+  out[6] = x95;
+  out[7] = x94;
+  out[8] = x93;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/montgomery32_2e266m3/fenz.c b/src/Specific/montgomery32_2e266m3/fenz.c
index 2566ebcbc..c10600790 100644
--- a/src/Specific/montgomery32_2e266m3/fenz.c
+++ b/src/Specific/montgomery32_2e266m3/fenz.c
@@ -1,30 +1,21 @@
-#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 x15, uint64_t x16, uint64_t x14, uint64_t x12, uint64_t x10, uint64_t x8, uint64_t x6, uint64_t x4, uint64_t x2)
-{  uint32_t x17 = (x16 | x15);
-{  uint32_t x18 = (x14 | x17);
-{  uint32_t x19 = (x12 | x18);
-{  uint32_t x20 = (x10 | x19);
-{  uint32_t x21 = (x8 | x20);
-{  uint32_t x22 = (x6 | x21);
-{  uint32_t x23 = (x4 | x22);
-{  uint32_t x24 = (x2 | x23);
-out[0] = x24;
-}}}}}}}}
-// caller: uint64_t out[1];
+static void fenz(ReturnType uint32_t out[1], const uint32_t in1[9]) {
+  { const uint32_t x15 = in1[8];
+  { const uint32_t x16 = 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 x17 = (x16 | x15);
+  { uint32_t x18 = (x14 | x17);
+  { uint32_t x19 = (x12 | x18);
+  { uint32_t x20 = (x10 | x19);
+  { uint32_t x21 = (x8 | x20);
+  { uint32_t x22 = (x6 | x21);
+  { uint32_t x23 = (x4 | x22);
+  { uint32_t x24 = (x2 | x23);
+  out[0] = x24;
+  }}}}}}}}}}}}}}}}}
+}