Update display logs and c files

2 files changed, 87 insertions, 93 deletions

diff --git a/src/Specific/montgomery32_2e291m19/feadd.c b/src/Specific/montgomery32_2e291m19/feadd.c
index a589c0281..d8b4e10e6 100644
--- a/src/Specific/montgomery32_2e291m19/feadd.c
+++ b/src/Specific/montgomery32_2e291m19/feadd.c
@@ -1,62 +1,64 @@
-#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 x20, uint64_t x21, 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 x38, uint64_t x39, uint64_t x37, uint64_t x35, uint64_t x33, uint64_t x31, uint64_t x29, uint64_t x27, uint64_t x25, uint64_t x23)
-{  uint32_t x41; uint8_t x42 = _addcarryx_u32(0x0, x5, x23, &x41);
-{  uint32_t x44; uint8_t x45 = _addcarryx_u32(x42, x7, x25, &x44);
-{  uint32_t x47; uint8_t x48 = _addcarryx_u32(x45, x9, x27, &x47);
-{  uint32_t x50; uint8_t x51 = _addcarryx_u32(x48, x11, x29, &x50);
-{  uint32_t x53; uint8_t x54 = _addcarryx_u32(x51, x13, x31, &x53);
-{  uint32_t x56; uint8_t x57 = _addcarryx_u32(x54, x15, x33, &x56);
-{  uint32_t x59; uint8_t x60 = _addcarryx_u32(x57, x17, x35, &x59);
-{  uint32_t x62; uint8_t x63 = _addcarryx_u32(x60, x19, x37, &x62);
-{  uint32_t x65; uint8_t x66 = _addcarryx_u32(x63, x21, x39, &x65);
-{  uint32_t x68; uint8_t x69 = _addcarryx_u32(x66, x20, x38, &x68);
-{  uint32_t x71; uint8_t x72 = _subborrow_u32(0x0, x41, 0xffffffed, &x71);
-{  uint32_t x74; uint8_t x75 = _subborrow_u32(x72, x44, 0xffffffff, &x74);
-{  uint32_t x77; uint8_t x78 = _subborrow_u32(x75, x47, 0xffffffff, &x77);
-{  uint32_t x80; uint8_t x81 = _subborrow_u32(x78, x50, 0xffffffff, &x80);
-{  uint32_t x83; uint8_t x84 = _subborrow_u32(x81, x53, 0xffffffff, &x83);
-{  uint32_t x86; uint8_t x87 = _subborrow_u32(x84, x56, 0xffffffff, &x86);
-{  uint32_t x89; uint8_t x90 = _subborrow_u32(x87, x59, 0xffffffff, &x89);
-{  uint32_t x92; uint8_t x93 = _subborrow_u32(x90, x62, 0xffffffff, &x92);
-{  uint32_t x95; uint8_t x96 = _subborrow_u32(x93, x65, 0xffffffff, &x95);
-{  uint32_t x98; uint8_t x99 = _subborrow_u32(x96, x68, 0x7, &x98);
-{  uint32_t _; uint8_t x102 = _subborrow_u32(x99, x69, 0x0, &_);
-{  uint32_t x103 = cmovznz(x102, x98, x68);
-{  uint32_t x104 = cmovznz(x102, x95, x65);
-{  uint32_t x105 = cmovznz(x102, x92, x62);
-{  uint32_t x106 = cmovznz(x102, x89, x59);
-{  uint32_t x107 = cmovznz(x102, x86, x56);
-{  uint32_t x108 = cmovznz(x102, x83, x53);
-{  uint32_t x109 = cmovznz(x102, x80, x50);
-{  uint32_t x110 = cmovznz(x102, x77, x47);
-{  uint32_t x111 = cmovznz(x102, x74, x44);
-{  uint32_t x112 = cmovznz(x102, x71, x41);
-out[0] = x103;
-out[1] = x104;
-out[2] = x105;
-out[3] = x106;
-out[4] = x107;
-out[5] = x108;
-out[6] = x109;
-out[7] = x110;
-out[8] = x111;
-out[9] = x112;
-}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-// caller: uint64_t out[10];
+static void feadd(uint32_t out[10], const uint32_t in1[10], const uint32_t in2[10]) {
+  { const uint32_t x20 = in1[9];
+  { const uint32_t x21 = 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 x38 = in2[9];
+  { const uint32_t x39 = in2[8];
+  { const uint32_t x37 = in2[7];
+  { const uint32_t x35 = in2[6];
+  { const uint32_t x33 = in2[5];
+  { const uint32_t x31 = in2[4];
+  { const uint32_t x29 = in2[3];
+  { const uint32_t x27 = in2[2];
+  { const uint32_t x25 = in2[1];
+  { const uint32_t x23 = in2[0];
+  { uint32_t x41; uint8_t x42 = _addcarryx_u32(0x0, x5, x23, &x41);
+  { uint32_t x44; uint8_t x45 = _addcarryx_u32(x42, x7, x25, &x44);
+  { uint32_t x47; uint8_t x48 = _addcarryx_u32(x45, x9, x27, &x47);
+  { uint32_t x50; uint8_t x51 = _addcarryx_u32(x48, x11, x29, &x50);
+  { uint32_t x53; uint8_t x54 = _addcarryx_u32(x51, x13, x31, &x53);
+  { uint32_t x56; uint8_t x57 = _addcarryx_u32(x54, x15, x33, &x56);
+  { uint32_t x59; uint8_t x60 = _addcarryx_u32(x57, x17, x35, &x59);
+  { uint32_t x62; uint8_t x63 = _addcarryx_u32(x60, x19, x37, &x62);
+  { uint32_t x65; uint8_t x66 = _addcarryx_u32(x63, x21, x39, &x65);
+  { uint32_t x68; uint8_t x69 = _addcarryx_u32(x66, x20, x38, &x68);
+  { uint32_t x71; uint8_t x72 = _subborrow_u32(0x0, x41, 0xffffffed, &x71);
+  { uint32_t x74; uint8_t x75 = _subborrow_u32(x72, x44, 0xffffffff, &x74);
+  { uint32_t x77; uint8_t x78 = _subborrow_u32(x75, x47, 0xffffffff, &x77);
+  { uint32_t x80; uint8_t x81 = _subborrow_u32(x78, x50, 0xffffffff, &x80);
+  { uint32_t x83; uint8_t x84 = _subborrow_u32(x81, x53, 0xffffffff, &x83);
+  { uint32_t x86; uint8_t x87 = _subborrow_u32(x84, x56, 0xffffffff, &x86);
+  { uint32_t x89; uint8_t x90 = _subborrow_u32(x87, x59, 0xffffffff, &x89);
+  { uint32_t x92; uint8_t x93 = _subborrow_u32(x90, x62, 0xffffffff, &x92);
+  { uint32_t x95; uint8_t x96 = _subborrow_u32(x93, x65, 0xffffffff, &x95);
+  { uint32_t x98; uint8_t x99 = _subborrow_u32(x96, x68, 0x7, &x98);
+  { uint32_t _; uint8_t x102 = _subborrow_u32(x99, x69, 0x0, &_);
+  { uint32_t x103 = cmovznz(x102, x98, x68);
+  { uint32_t x104 = cmovznz(x102, x95, x65);
+  { uint32_t x105 = cmovznz(x102, x92, x62);
+  { uint32_t x106 = cmovznz(x102, x89, x59);
+  { uint32_t x107 = cmovznz(x102, x86, x56);
+  { uint32_t x108 = cmovznz(x102, x83, x53);
+  { uint32_t x109 = cmovznz(x102, x80, x50);
+  { uint32_t x110 = cmovznz(x102, x77, x47);
+  { uint32_t x111 = cmovznz(x102, x74, x44);
+  { uint32_t x112 = cmovznz(x102, x71, x41);
+  out[0] = x112;
+  out[1] = x111;
+  out[2] = x110;
+  out[3] = x109;
+  out[4] = x108;
+  out[5] = x107;
+  out[6] = x106;
+  out[7] = x105;
+  out[8] = x104;
+  out[9] = x103;
+  }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+}
diff --git a/src/Specific/montgomery32_2e291m19/fenz.c b/src/Specific/montgomery32_2e291m19/fenz.c
index cca29049c..4ad084ead 100644
--- a/src/Specific/montgomery32_2e291m19/fenz.c
+++ b/src/Specific/montgomery32_2e291m19/fenz.c
@@ -1,31 +1,23 @@
-#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 x17, uint64_t x18, 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 x19 = (x18 | x17);
-{  uint32_t x20 = (x16 | x19);
-{  uint32_t x21 = (x14 | x20);
-{  uint32_t x22 = (x12 | x21);
-{  uint32_t x23 = (x10 | x22);
-{  uint32_t x24 = (x8 | x23);
-{  uint32_t x25 = (x6 | x24);
-{  uint32_t x26 = (x4 | x25);
-{  uint32_t x27 = (x2 | x26);
-out[0] = x27;
-}}}}}}}}}
-// caller: uint64_t out[1];
+static void fenz(ReturnType uint32_t out[1], const uint32_t in1[10]) {
+  { const uint32_t x17 = in1[9];
+  { const uint32_t x18 = 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 x19 = (x18 | x17);
+  { uint32_t x20 = (x16 | x19);
+  { uint32_t x21 = (x14 | x20);
+  { uint32_t x22 = (x12 | x21);
+  { uint32_t x23 = (x10 | x22);
+  { uint32_t x24 = (x8 | x23);
+  { uint32_t x25 = (x6 | x24);
+  { uint32_t x26 = (x4 | x25);
+  { uint32_t x27 = (x2 | x26);
+  out[0] = x27;
+  }}}}}}}}}}}}}}}}}}}
+}