Update display logs and c files

13 files changed, 55 insertions, 55 deletions

diff --git a/src/Specific/montgomery32_2e130m5/femul.c b/src/Specific/montgomery32_2e130m5/femul.c
index a47e589e5..9fcadff88 100644
--- a/src/Specific/montgomery32_2e130m5/femul.c
+++ b/src/Specific/montgomery32_2e130m5/femul.c
@@ -24,7 +24,7 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x58;  uint32_t x57 = _mulx_u32(x51, 0xffffffff, &x58);
   { uint32_t x61;  uint32_t x60 = _mulx_u32(x51, 0xffffffff, &x61);
   { uint32_t x64;  uint32_t x63 = _mulx_u32(x51, 0xffffffff, &x64);
-  { uint8_t x67;  uint32_t x66 = (uint8_t)_mulx_u32(x51, 0x3, &x67);
+  { uint8_t x67;  uint32_t x66 = _mulx_u32_out_u8(x51, 0x3, &x67);
   { uint32_t x69; uint8_t x70 = _addcarryx_u32(0x0, x55, x57, &x69);
   { uint32_t x72; uint8_t x73 = _addcarryx_u32(x70, x58, x60, &x72);
   { uint32_t x75; uint8_t x76 = _addcarryx_u32(x73, x61, x63, &x75);
@@ -57,7 +57,7 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x155;  uint32_t x154 = _mulx_u32(x148, 0xffffffff, &x155);
   { uint32_t x158;  uint32_t x157 = _mulx_u32(x148, 0xffffffff, &x158);
   { uint32_t x161;  uint32_t x160 = _mulx_u32(x148, 0xffffffff, &x161);
-  { uint8_t x164;  uint32_t x163 = (uint8_t)_mulx_u32(x148, 0x3, &x164);
+  { uint8_t x164;  uint32_t x163 = _mulx_u32_out_u8(x148, 0x3, &x164);
   { uint32_t x166; uint8_t x167 = _addcarryx_u32(0x0, x152, x154, &x166);
   { uint32_t x169; uint8_t x170 = _addcarryx_u32(x167, x155, x157, &x169);
   { uint32_t x172; uint8_t x173 = _addcarryx_u32(x170, x158, x160, &x172);
@@ -91,7 +91,7 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x253;  uint32_t x252 = _mulx_u32(x246, 0xffffffff, &x253);
   { uint32_t x256;  uint32_t x255 = _mulx_u32(x246, 0xffffffff, &x256);
   { uint32_t x259;  uint32_t x258 = _mulx_u32(x246, 0xffffffff, &x259);
-  { uint8_t x262;  uint32_t x261 = (uint8_t)_mulx_u32(x246, 0x3, &x262);
+  { uint8_t x262;  uint32_t x261 = _mulx_u32_out_u8(x246, 0x3, &x262);
   { uint32_t x264; uint8_t x265 = _addcarryx_u32(0x0, x250, x252, &x264);
   { uint32_t x267; uint8_t x268 = _addcarryx_u32(x265, x253, x255, &x267);
   { uint32_t x270; uint8_t x271 = _addcarryx_u32(x268, x256, x258, &x270);
@@ -125,7 +125,7 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x351;  uint32_t x350 = _mulx_u32(x344, 0xffffffff, &x351);
   { uint32_t x354;  uint32_t x353 = _mulx_u32(x344, 0xffffffff, &x354);
   { uint32_t x357;  uint32_t x356 = _mulx_u32(x344, 0xffffffff, &x357);
-  { uint8_t x360;  uint32_t x359 = (uint8_t)_mulx_u32(x344, 0x3, &x360);
+  { uint8_t x360;  uint32_t x359 = _mulx_u32_out_u8(x344, 0x3, &x360);
   { uint32_t x362; uint8_t x363 = _addcarryx_u32(0x0, x348, x350, &x362);
   { uint32_t x365; uint8_t x366 = _addcarryx_u32(x363, x351, x353, &x365);
   { uint32_t x368; uint8_t x369 = _addcarryx_u32(x366, x354, x356, &x368);
@@ -159,7 +159,7 @@ static void femul(uint32_t out[5], const uint32_t in1[5], const uint32_t in2[5])
   { uint32_t x449;  uint32_t x448 = _mulx_u32(x442, 0xffffffff, &x449);
   { uint32_t x452;  uint32_t x451 = _mulx_u32(x442, 0xffffffff, &x452);
   { uint32_t x455;  uint32_t x454 = _mulx_u32(x442, 0xffffffff, &x455);
-  { uint8_t x458;  uint32_t x457 = (uint8_t)_mulx_u32(x442, 0x3, &x458);
+  { uint8_t x458;  uint32_t x457 = _mulx_u32_out_u8(x442, 0x3, &x458);
   { uint32_t x460; uint8_t x461 = _addcarryx_u32(0x0, x446, x448, &x460);
   { uint32_t x463; uint8_t x464 = _addcarryx_u32(x461, x449, x451, &x463);
   { uint32_t x466; uint8_t x467 = _addcarryx_u32(x464, x452, x454, &x466);
diff --git a/src/Specific/montgomery32_2e165m25/femul.c b/src/Specific/montgomery32_2e165m25/femul.c
index 9c91454e6..7aeda2e2f 100644
--- a/src/Specific/montgomery32_2e165m25/femul.c
+++ b/src/Specific/montgomery32_2e165m25/femul.c
@@ -29,7 +29,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x71;  uint32_t x70 = _mulx_u32(x61, 0xffffffff, &x71);
   { uint32_t x74;  uint32_t x73 = _mulx_u32(x61, 0xffffffff, &x74);
   { uint32_t x77;  uint32_t x76 = _mulx_u32(x61, 0xffffffff, &x77);
-  { uint8_t x80;  uint32_t x79 = (uint8_t)_mulx_u32(x61, 0x1f, &x80);
+  { uint8_t x80;  uint32_t x79 = _mulx_u32_out_u8(x61, 0x1f, &x80);
   { uint32_t x82; uint8_t x83 = _addcarryx_u32(0x0, x65, x67, &x82);
   { uint32_t x85; uint8_t x86 = _addcarryx_u32(x83, x68, x70, &x85);
   { uint32_t x88; uint8_t x89 = _addcarryx_u32(x86, x71, x73, &x88);
@@ -68,7 +68,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x186;  uint32_t x185 = _mulx_u32(x176, 0xffffffff, &x186);
   { uint32_t x189;  uint32_t x188 = _mulx_u32(x176, 0xffffffff, &x189);
   { uint32_t x192;  uint32_t x191 = _mulx_u32(x176, 0xffffffff, &x192);
-  { uint8_t x195;  uint32_t x194 = (uint8_t)_mulx_u32(x176, 0x1f, &x195);
+  { uint8_t x195;  uint32_t x194 = _mulx_u32_out_u8(x176, 0x1f, &x195);
   { uint32_t x197; uint8_t x198 = _addcarryx_u32(0x0, x180, x182, &x197);
   { uint32_t x200; uint8_t x201 = _addcarryx_u32(x198, x183, x185, &x200);
   { uint32_t x203; uint8_t x204 = _addcarryx_u32(x201, x186, x188, &x203);
@@ -108,7 +108,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x302;  uint32_t x301 = _mulx_u32(x292, 0xffffffff, &x302);
   { uint32_t x305;  uint32_t x304 = _mulx_u32(x292, 0xffffffff, &x305);
   { uint32_t x308;  uint32_t x307 = _mulx_u32(x292, 0xffffffff, &x308);
-  { uint8_t x311;  uint32_t x310 = (uint8_t)_mulx_u32(x292, 0x1f, &x311);
+  { uint8_t x311;  uint32_t x310 = _mulx_u32_out_u8(x292, 0x1f, &x311);
   { uint32_t x313; uint8_t x314 = _addcarryx_u32(0x0, x296, x298, &x313);
   { uint32_t x316; uint8_t x317 = _addcarryx_u32(x314, x299, x301, &x316);
   { uint32_t x319; uint8_t x320 = _addcarryx_u32(x317, x302, x304, &x319);
@@ -148,7 +148,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x418;  uint32_t x417 = _mulx_u32(x408, 0xffffffff, &x418);
   { uint32_t x421;  uint32_t x420 = _mulx_u32(x408, 0xffffffff, &x421);
   { uint32_t x424;  uint32_t x423 = _mulx_u32(x408, 0xffffffff, &x424);
-  { uint8_t x427;  uint32_t x426 = (uint8_t)_mulx_u32(x408, 0x1f, &x427);
+  { uint8_t x427;  uint32_t x426 = _mulx_u32_out_u8(x408, 0x1f, &x427);
   { uint32_t x429; uint8_t x430 = _addcarryx_u32(0x0, x412, x414, &x429);
   { uint32_t x432; uint8_t x433 = _addcarryx_u32(x430, x415, x417, &x432);
   { uint32_t x435; uint8_t x436 = _addcarryx_u32(x433, x418, x420, &x435);
@@ -188,7 +188,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x534;  uint32_t x533 = _mulx_u32(x524, 0xffffffff, &x534);
   { uint32_t x537;  uint32_t x536 = _mulx_u32(x524, 0xffffffff, &x537);
   { uint32_t x540;  uint32_t x539 = _mulx_u32(x524, 0xffffffff, &x540);
-  { uint8_t x543;  uint32_t x542 = (uint8_t)_mulx_u32(x524, 0x1f, &x543);
+  { uint8_t x543;  uint32_t x542 = _mulx_u32_out_u8(x524, 0x1f, &x543);
   { uint32_t x545; uint8_t x546 = _addcarryx_u32(0x0, x528, x530, &x545);
   { uint32_t x548; uint8_t x549 = _addcarryx_u32(x546, x531, x533, &x548);
   { uint32_t x551; uint8_t x552 = _addcarryx_u32(x549, x534, x536, &x551);
@@ -228,7 +228,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x650;  uint32_t x649 = _mulx_u32(x640, 0xffffffff, &x650);
   { uint32_t x653;  uint32_t x652 = _mulx_u32(x640, 0xffffffff, &x653);
   { uint32_t x656;  uint32_t x655 = _mulx_u32(x640, 0xffffffff, &x656);
-  { uint8_t x659;  uint32_t x658 = (uint8_t)_mulx_u32(x640, 0x1f, &x659);
+  { uint8_t x659;  uint32_t x658 = _mulx_u32_out_u8(x640, 0x1f, &x659);
   { uint32_t x661; uint8_t x662 = _addcarryx_u32(0x0, x644, x646, &x661);
   { uint32_t x664; uint8_t x665 = _addcarryx_u32(x662, x647, x649, &x664);
   { uint32_t x667; uint8_t x668 = _addcarryx_u32(x665, x650, x652, &x667);
diff --git a/src/Specific/montgomery32_2e166m5/femul.c b/src/Specific/montgomery32_2e166m5/femul.c
index aaf41b2c1..0a7324b5b 100644
--- a/src/Specific/montgomery32_2e166m5/femul.c
+++ b/src/Specific/montgomery32_2e166m5/femul.c
@@ -29,7 +29,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x71;  uint32_t x70 = _mulx_u32(x61, 0xffffffff, &x71);
   { uint32_t x74;  uint32_t x73 = _mulx_u32(x61, 0xffffffff, &x74);
   { uint32_t x77;  uint32_t x76 = _mulx_u32(x61, 0xffffffff, &x77);
-  { uint8_t x80;  uint32_t x79 = (uint8_t)_mulx_u32(x61, 0x3f, &x80);
+  { uint8_t x80;  uint32_t x79 = _mulx_u32_out_u8(x61, 0x3f, &x80);
   { uint32_t x82; uint8_t x83 = _addcarryx_u32(0x0, x65, x67, &x82);
   { uint32_t x85; uint8_t x86 = _addcarryx_u32(x83, x68, x70, &x85);
   { uint32_t x88; uint8_t x89 = _addcarryx_u32(x86, x71, x73, &x88);
@@ -68,7 +68,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x186;  uint32_t x185 = _mulx_u32(x176, 0xffffffff, &x186);
   { uint32_t x189;  uint32_t x188 = _mulx_u32(x176, 0xffffffff, &x189);
   { uint32_t x192;  uint32_t x191 = _mulx_u32(x176, 0xffffffff, &x192);
-  { uint8_t x195;  uint32_t x194 = (uint8_t)_mulx_u32(x176, 0x3f, &x195);
+  { uint8_t x195;  uint32_t x194 = _mulx_u32_out_u8(x176, 0x3f, &x195);
   { uint32_t x197; uint8_t x198 = _addcarryx_u32(0x0, x180, x182, &x197);
   { uint32_t x200; uint8_t x201 = _addcarryx_u32(x198, x183, x185, &x200);
   { uint32_t x203; uint8_t x204 = _addcarryx_u32(x201, x186, x188, &x203);
@@ -108,7 +108,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x302;  uint32_t x301 = _mulx_u32(x292, 0xffffffff, &x302);
   { uint32_t x305;  uint32_t x304 = _mulx_u32(x292, 0xffffffff, &x305);
   { uint32_t x308;  uint32_t x307 = _mulx_u32(x292, 0xffffffff, &x308);
-  { uint8_t x311;  uint32_t x310 = (uint8_t)_mulx_u32(x292, 0x3f, &x311);
+  { uint8_t x311;  uint32_t x310 = _mulx_u32_out_u8(x292, 0x3f, &x311);
   { uint32_t x313; uint8_t x314 = _addcarryx_u32(0x0, x296, x298, &x313);
   { uint32_t x316; uint8_t x317 = _addcarryx_u32(x314, x299, x301, &x316);
   { uint32_t x319; uint8_t x320 = _addcarryx_u32(x317, x302, x304, &x319);
@@ -148,7 +148,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x418;  uint32_t x417 = _mulx_u32(x408, 0xffffffff, &x418);
   { uint32_t x421;  uint32_t x420 = _mulx_u32(x408, 0xffffffff, &x421);
   { uint32_t x424;  uint32_t x423 = _mulx_u32(x408, 0xffffffff, &x424);
-  { uint8_t x427;  uint32_t x426 = (uint8_t)_mulx_u32(x408, 0x3f, &x427);
+  { uint8_t x427;  uint32_t x426 = _mulx_u32_out_u8(x408, 0x3f, &x427);
   { uint32_t x429; uint8_t x430 = _addcarryx_u32(0x0, x412, x414, &x429);
   { uint32_t x432; uint8_t x433 = _addcarryx_u32(x430, x415, x417, &x432);
   { uint32_t x435; uint8_t x436 = _addcarryx_u32(x433, x418, x420, &x435);
@@ -188,7 +188,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x534;  uint32_t x533 = _mulx_u32(x524, 0xffffffff, &x534);
   { uint32_t x537;  uint32_t x536 = _mulx_u32(x524, 0xffffffff, &x537);
   { uint32_t x540;  uint32_t x539 = _mulx_u32(x524, 0xffffffff, &x540);
-  { uint8_t x543;  uint32_t x542 = (uint8_t)_mulx_u32(x524, 0x3f, &x543);
+  { uint8_t x543;  uint32_t x542 = _mulx_u32_out_u8(x524, 0x3f, &x543);
   { uint32_t x545; uint8_t x546 = _addcarryx_u32(0x0, x528, x530, &x545);
   { uint32_t x548; uint8_t x549 = _addcarryx_u32(x546, x531, x533, &x548);
   { uint32_t x551; uint8_t x552 = _addcarryx_u32(x549, x534, x536, &x551);
@@ -228,7 +228,7 @@ static void femul(uint32_t out[6], const uint32_t in1[6], const uint32_t in2[6])
   { uint32_t x650;  uint32_t x649 = _mulx_u32(x640, 0xffffffff, &x650);
   { uint32_t x653;  uint32_t x652 = _mulx_u32(x640, 0xffffffff, &x653);
   { uint32_t x656;  uint32_t x655 = _mulx_u32(x640, 0xffffffff, &x656);
-  { uint8_t x659;  uint32_t x658 = (uint8_t)_mulx_u32(x640, 0x3f, &x659);
+  { uint8_t x659;  uint32_t x658 = _mulx_u32_out_u8(x640, 0x3f, &x659);
   { uint32_t x661; uint8_t x662 = _addcarryx_u32(0x0, x644, x646, &x661);
   { uint32_t x664; uint8_t x665 = _addcarryx_u32(x662, x647, x649, &x664);
   { uint32_t x667; uint8_t x668 = _addcarryx_u32(x665, x650, x652, &x667);
diff --git a/src/Specific/montgomery64_2e194m33/femul.c b/src/Specific/montgomery64_2e194m33/femul.c
index 8d2ba5a7e..ead21d7d1 100644
--- a/src/Specific/montgomery64_2e194m33/femul.c
+++ b/src/Specific/montgomery64_2e194m33/femul.c
@@ -19,7 +19,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x45;  uint64_t x44 = _mulx_u64(x41, 0xffffffffffffffdfL, &x45);
   { uint64_t x48;  uint64_t x47 = _mulx_u64(x41, 0xffffffffffffffffL, &x48);
   { uint64_t x51;  uint64_t x50 = _mulx_u64(x41, 0xffffffffffffffffL, &x51);
-  { uint8_t x54;  uint64_t x53 = (uint8_t)_mulx_u64(x41, 0x3, &x54);
+  { uint8_t x54;  uint64_t x53 = _mulx_u64_out_u8(x41, 0x3, &x54);
   { uint64_t x56; uint8_t x57 = _addcarryx_u64(0x0, x45, x47, &x56);
   { uint64_t x59; uint8_t x60 = _addcarryx_u64(x57, x48, x50, &x59);
   { uint64_t x62; uint8_t x63 = _addcarryx_u64(x60, x51, x53, &x62);
@@ -46,7 +46,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x124;  uint64_t x123 = _mulx_u64(x120, 0xffffffffffffffdfL, &x124);
   { uint64_t x127;  uint64_t x126 = _mulx_u64(x120, 0xffffffffffffffffL, &x127);
   { uint64_t x130;  uint64_t x129 = _mulx_u64(x120, 0xffffffffffffffffL, &x130);
-  { uint8_t x133;  uint64_t x132 = (uint8_t)_mulx_u64(x120, 0x3, &x133);
+  { uint8_t x133;  uint64_t x132 = _mulx_u64_out_u8(x120, 0x3, &x133);
   { uint64_t x135; uint8_t x136 = _addcarryx_u64(0x0, x124, x126, &x135);
   { uint64_t x138; uint8_t x139 = _addcarryx_u64(x136, x127, x129, &x138);
   { uint64_t x141; uint8_t x142 = _addcarryx_u64(x139, x130, x132, &x141);
@@ -74,7 +74,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x204;  uint64_t x203 = _mulx_u64(x200, 0xffffffffffffffdfL, &x204);
   { uint64_t x207;  uint64_t x206 = _mulx_u64(x200, 0xffffffffffffffffL, &x207);
   { uint64_t x210;  uint64_t x209 = _mulx_u64(x200, 0xffffffffffffffffL, &x210);
-  { uint8_t x213;  uint64_t x212 = (uint8_t)_mulx_u64(x200, 0x3, &x213);
+  { uint8_t x213;  uint64_t x212 = _mulx_u64_out_u8(x200, 0x3, &x213);
   { uint64_t x215; uint8_t x216 = _addcarryx_u64(0x0, x204, x206, &x215);
   { uint64_t x218; uint8_t x219 = _addcarryx_u64(x216, x207, x209, &x218);
   { uint64_t x221; uint8_t x222 = _addcarryx_u64(x219, x210, x212, &x221);
@@ -102,7 +102,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x284;  uint64_t x283 = _mulx_u64(x280, 0xffffffffffffffdfL, &x284);
   { uint64_t x287;  uint64_t x286 = _mulx_u64(x280, 0xffffffffffffffffL, &x287);
   { uint64_t x290;  uint64_t x289 = _mulx_u64(x280, 0xffffffffffffffffL, &x290);
-  { uint8_t x293;  uint64_t x292 = (uint8_t)_mulx_u64(x280, 0x3, &x293);
+  { uint8_t x293;  uint64_t x292 = _mulx_u64_out_u8(x280, 0x3, &x293);
   { uint64_t x295; uint8_t x296 = _addcarryx_u64(0x0, x284, x286, &x295);
   { uint64_t x298; uint8_t x299 = _addcarryx_u64(x296, x287, x289, &x298);
   { uint64_t x301; uint8_t x302 = _addcarryx_u64(x299, x290, x292, &x301);
diff --git a/src/Specific/montgomery64_2e194m33/femulDisplay.log b/src/Specific/montgomery64_2e194m33/femulDisplay.log
index 41449b1bb..075bacf43 100644
--- a/src/Specific/montgomery64_2e194m33/femulDisplay.log
+++ b/src/Specific/montgomery64_2e194m33/femulDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint64_t x44, uint64_t x45 = mulx_u64(x41, 0xffffffffffffffdfL);
  uint64_t x47, uint64_t x48 = mulx_u64(x41, 0xffffffffffffffffL);
  uint64_t x50, uint64_t x51 = mulx_u64(x41, 0xffffffffffffffffL);
- uint64_t x53, uint8_t x54 = (uint8_t)mulx_u64(x41, 0x3);
+ uint64_t x53, uint8_t x54 = mulx_u64_out_u8(x41, 0x3);
  uint64_t x56, uint8_t x57 = addcarryx_u64(0x0, x45, x47);
  uint64_t x59, uint8_t x60 = addcarryx_u64(x57, x48, x50);
  uint64_t x62, uint8_t x63 = addcarryx_u64(x60, x51, x53);
@@ -41,7 +41,7 @@ Interp-η
  uint64_t x123, uint64_t x124 = mulx_u64(x120, 0xffffffffffffffdfL);
  uint64_t x126, uint64_t x127 = mulx_u64(x120, 0xffffffffffffffffL);
  uint64_t x129, uint64_t x130 = mulx_u64(x120, 0xffffffffffffffffL);
- uint64_t x132, uint8_t x133 = (uint8_t)mulx_u64(x120, 0x3);
+ uint64_t x132, uint8_t x133 = mulx_u64_out_u8(x120, 0x3);
  uint64_t x135, uint8_t x136 = addcarryx_u64(0x0, x124, x126);
  uint64_t x138, uint8_t x139 = addcarryx_u64(x136, x127, x129);
  uint64_t x141, uint8_t x142 = addcarryx_u64(x139, x130, x132);
@@ -69,7 +69,7 @@ Interp-η
  uint64_t x203, uint64_t x204 = mulx_u64(x200, 0xffffffffffffffdfL);
  uint64_t x206, uint64_t x207 = mulx_u64(x200, 0xffffffffffffffffL);
  uint64_t x209, uint64_t x210 = mulx_u64(x200, 0xffffffffffffffffL);
- uint64_t x212, uint8_t x213 = (uint8_t)mulx_u64(x200, 0x3);
+ uint64_t x212, uint8_t x213 = mulx_u64_out_u8(x200, 0x3);
  uint64_t x215, uint8_t x216 = addcarryx_u64(0x0, x204, x206);
  uint64_t x218, uint8_t x219 = addcarryx_u64(x216, x207, x209);
  uint64_t x221, uint8_t x222 = addcarryx_u64(x219, x210, x212);
@@ -97,7 +97,7 @@ Interp-η
  uint64_t x283, uint64_t x284 = mulx_u64(x280, 0xffffffffffffffdfL);
  uint64_t x286, uint64_t x287 = mulx_u64(x280, 0xffffffffffffffffL);
  uint64_t x289, uint64_t x290 = mulx_u64(x280, 0xffffffffffffffffL);
- uint64_t x292, uint8_t x293 = (uint8_t)mulx_u64(x280, 0x3);
+ uint64_t x292, uint8_t x293 = mulx_u64_out_u8(x280, 0x3);
  uint64_t x295, uint8_t x296 = addcarryx_u64(0x0, x284, x286);
  uint64_t x298, uint8_t x299 = addcarryx_u64(x296, x287, x289);
  uint64_t x301, uint8_t x302 = addcarryx_u64(x299, x290, x292);
diff --git a/src/Specific/montgomery64_2e196m15/femul.c b/src/Specific/montgomery64_2e196m15/femul.c
index 6945eabcc..df786c4c7 100644
--- a/src/Specific/montgomery64_2e196m15/femul.c
+++ b/src/Specific/montgomery64_2e196m15/femul.c
@@ -19,7 +19,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x45;  uint64_t x44 = _mulx_u64(x41, 0xfffffffffffffff1L, &x45);
   { uint64_t x48;  uint64_t x47 = _mulx_u64(x41, 0xffffffffffffffffL, &x48);
   { uint64_t x51;  uint64_t x50 = _mulx_u64(x41, 0xffffffffffffffffL, &x51);
-  { uint8_t x54;  uint64_t x53 = (uint8_t)_mulx_u64(x41, 0xf, &x54);
+  { uint8_t x54;  uint64_t x53 = _mulx_u64_out_u8(x41, 0xf, &x54);
   { uint64_t x56; uint8_t x57 = _addcarryx_u64(0x0, x45, x47, &x56);
   { uint64_t x59; uint8_t x60 = _addcarryx_u64(x57, x48, x50, &x59);
   { uint64_t x62; uint8_t x63 = _addcarryx_u64(x60, x51, x53, &x62);
@@ -46,7 +46,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x124;  uint64_t x123 = _mulx_u64(x120, 0xfffffffffffffff1L, &x124);
   { uint64_t x127;  uint64_t x126 = _mulx_u64(x120, 0xffffffffffffffffL, &x127);
   { uint64_t x130;  uint64_t x129 = _mulx_u64(x120, 0xffffffffffffffffL, &x130);
-  { uint8_t x133;  uint64_t x132 = (uint8_t)_mulx_u64(x120, 0xf, &x133);
+  { uint8_t x133;  uint64_t x132 = _mulx_u64_out_u8(x120, 0xf, &x133);
   { uint64_t x135; uint8_t x136 = _addcarryx_u64(0x0, x124, x126, &x135);
   { uint64_t x138; uint8_t x139 = _addcarryx_u64(x136, x127, x129, &x138);
   { uint64_t x141; uint8_t x142 = _addcarryx_u64(x139, x130, x132, &x141);
@@ -74,7 +74,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x204;  uint64_t x203 = _mulx_u64(x200, 0xfffffffffffffff1L, &x204);
   { uint64_t x207;  uint64_t x206 = _mulx_u64(x200, 0xffffffffffffffffL, &x207);
   { uint64_t x210;  uint64_t x209 = _mulx_u64(x200, 0xffffffffffffffffL, &x210);
-  { uint8_t x213;  uint64_t x212 = (uint8_t)_mulx_u64(x200, 0xf, &x213);
+  { uint8_t x213;  uint64_t x212 = _mulx_u64_out_u8(x200, 0xf, &x213);
   { uint64_t x215; uint8_t x216 = _addcarryx_u64(0x0, x204, x206, &x215);
   { uint64_t x218; uint8_t x219 = _addcarryx_u64(x216, x207, x209, &x218);
   { uint64_t x221; uint8_t x222 = _addcarryx_u64(x219, x210, x212, &x221);
@@ -102,7 +102,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x284;  uint64_t x283 = _mulx_u64(x280, 0xfffffffffffffff1L, &x284);
   { uint64_t x287;  uint64_t x286 = _mulx_u64(x280, 0xffffffffffffffffL, &x287);
   { uint64_t x290;  uint64_t x289 = _mulx_u64(x280, 0xffffffffffffffffL, &x290);
-  { uint8_t x293;  uint64_t x292 = (uint8_t)_mulx_u64(x280, 0xf, &x293);
+  { uint8_t x293;  uint64_t x292 = _mulx_u64_out_u8(x280, 0xf, &x293);
   { uint64_t x295; uint8_t x296 = _addcarryx_u64(0x0, x284, x286, &x295);
   { uint64_t x298; uint8_t x299 = _addcarryx_u64(x296, x287, x289, &x298);
   { uint64_t x301; uint8_t x302 = _addcarryx_u64(x299, x290, x292, &x301);
diff --git a/src/Specific/montgomery64_2e196m15/femulDisplay.log b/src/Specific/montgomery64_2e196m15/femulDisplay.log
index 56ccefe3c..6b2d1a05d 100644
--- a/src/Specific/montgomery64_2e196m15/femulDisplay.log
+++ b/src/Specific/montgomery64_2e196m15/femulDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint64_t x44, uint64_t x45 = mulx_u64(x41, 0xfffffffffffffff1L);
  uint64_t x47, uint64_t x48 = mulx_u64(x41, 0xffffffffffffffffL);
  uint64_t x50, uint64_t x51 = mulx_u64(x41, 0xffffffffffffffffL);
- uint64_t x53, uint8_t x54 = (uint8_t)mulx_u64(x41, 0xf);
+ uint64_t x53, uint8_t x54 = mulx_u64_out_u8(x41, 0xf);
  uint64_t x56, uint8_t x57 = addcarryx_u64(0x0, x45, x47);
  uint64_t x59, uint8_t x60 = addcarryx_u64(x57, x48, x50);
  uint64_t x62, uint8_t x63 = addcarryx_u64(x60, x51, x53);
@@ -41,7 +41,7 @@ Interp-η
  uint64_t x123, uint64_t x124 = mulx_u64(x120, 0xfffffffffffffff1L);
  uint64_t x126, uint64_t x127 = mulx_u64(x120, 0xffffffffffffffffL);
  uint64_t x129, uint64_t x130 = mulx_u64(x120, 0xffffffffffffffffL);
- uint64_t x132, uint8_t x133 = (uint8_t)mulx_u64(x120, 0xf);
+ uint64_t x132, uint8_t x133 = mulx_u64_out_u8(x120, 0xf);
  uint64_t x135, uint8_t x136 = addcarryx_u64(0x0, x124, x126);
  uint64_t x138, uint8_t x139 = addcarryx_u64(x136, x127, x129);
  uint64_t x141, uint8_t x142 = addcarryx_u64(x139, x130, x132);
@@ -69,7 +69,7 @@ Interp-η
  uint64_t x203, uint64_t x204 = mulx_u64(x200, 0xfffffffffffffff1L);
  uint64_t x206, uint64_t x207 = mulx_u64(x200, 0xffffffffffffffffL);
  uint64_t x209, uint64_t x210 = mulx_u64(x200, 0xffffffffffffffffL);
- uint64_t x212, uint8_t x213 = (uint8_t)mulx_u64(x200, 0xf);
+ uint64_t x212, uint8_t x213 = mulx_u64_out_u8(x200, 0xf);
  uint64_t x215, uint8_t x216 = addcarryx_u64(0x0, x204, x206);
  uint64_t x218, uint8_t x219 = addcarryx_u64(x216, x207, x209);
  uint64_t x221, uint8_t x222 = addcarryx_u64(x219, x210, x212);
@@ -97,7 +97,7 @@ Interp-η
  uint64_t x283, uint64_t x284 = mulx_u64(x280, 0xfffffffffffffff1L);
  uint64_t x286, uint64_t x287 = mulx_u64(x280, 0xffffffffffffffffL);
  uint64_t x289, uint64_t x290 = mulx_u64(x280, 0xffffffffffffffffL);
- uint64_t x292, uint8_t x293 = (uint8_t)mulx_u64(x280, 0xf);
+ uint64_t x292, uint8_t x293 = mulx_u64_out_u8(x280, 0xf);
  uint64_t x295, uint8_t x296 = addcarryx_u64(0x0, x284, x286);
  uint64_t x298, uint8_t x299 = addcarryx_u64(x296, x287, x289);
  uint64_t x301, uint8_t x302 = addcarryx_u64(x299, x290, x292);
diff --git a/src/Specific/montgomery64_2e198m17/femul.c b/src/Specific/montgomery64_2e198m17/femul.c
index d13f71cf4..9a0c04ac9 100644
--- a/src/Specific/montgomery64_2e198m17/femul.c
+++ b/src/Specific/montgomery64_2e198m17/femul.c
@@ -19,7 +19,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x45;  uint64_t x44 = _mulx_u64(x41, 0xffffffffffffffefL, &x45);
   { uint64_t x48;  uint64_t x47 = _mulx_u64(x41, 0xffffffffffffffffL, &x48);
   { uint64_t x51;  uint64_t x50 = _mulx_u64(x41, 0xffffffffffffffffL, &x51);
-  { uint8_t x54;  uint64_t x53 = (uint8_t)_mulx_u64(x41, 0x3f, &x54);
+  { uint8_t x54;  uint64_t x53 = _mulx_u64_out_u8(x41, 0x3f, &x54);
   { uint64_t x56; uint8_t x57 = _addcarryx_u64(0x0, x45, x47, &x56);
   { uint64_t x59; uint8_t x60 = _addcarryx_u64(x57, x48, x50, &x59);
   { uint64_t x62; uint8_t x63 = _addcarryx_u64(x60, x51, x53, &x62);
@@ -46,7 +46,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x124;  uint64_t x123 = _mulx_u64(x120, 0xffffffffffffffefL, &x124);
   { uint64_t x127;  uint64_t x126 = _mulx_u64(x120, 0xffffffffffffffffL, &x127);
   { uint64_t x130;  uint64_t x129 = _mulx_u64(x120, 0xffffffffffffffffL, &x130);
-  { uint8_t x133;  uint64_t x132 = (uint8_t)_mulx_u64(x120, 0x3f, &x133);
+  { uint8_t x133;  uint64_t x132 = _mulx_u64_out_u8(x120, 0x3f, &x133);
   { uint64_t x135; uint8_t x136 = _addcarryx_u64(0x0, x124, x126, &x135);
   { uint64_t x138; uint8_t x139 = _addcarryx_u64(x136, x127, x129, &x138);
   { uint64_t x141; uint8_t x142 = _addcarryx_u64(x139, x130, x132, &x141);
@@ -74,7 +74,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x204;  uint64_t x203 = _mulx_u64(x200, 0xffffffffffffffefL, &x204);
   { uint64_t x207;  uint64_t x206 = _mulx_u64(x200, 0xffffffffffffffffL, &x207);
   { uint64_t x210;  uint64_t x209 = _mulx_u64(x200, 0xffffffffffffffffL, &x210);
-  { uint8_t x213;  uint64_t x212 = (uint8_t)_mulx_u64(x200, 0x3f, &x213);
+  { uint8_t x213;  uint64_t x212 = _mulx_u64_out_u8(x200, 0x3f, &x213);
   { uint64_t x215; uint8_t x216 = _addcarryx_u64(0x0, x204, x206, &x215);
   { uint64_t x218; uint8_t x219 = _addcarryx_u64(x216, x207, x209, &x218);
   { uint64_t x221; uint8_t x222 = _addcarryx_u64(x219, x210, x212, &x221);
@@ -102,7 +102,7 @@ static void femul(uint64_t out[4], const uint64_t in1[4], const uint64_t in2[4])
   { uint64_t x284;  uint64_t x283 = _mulx_u64(x280, 0xffffffffffffffefL, &x284);
   { uint64_t x287;  uint64_t x286 = _mulx_u64(x280, 0xffffffffffffffffL, &x287);
   { uint64_t x290;  uint64_t x289 = _mulx_u64(x280, 0xffffffffffffffffL, &x290);
-  { uint8_t x293;  uint64_t x292 = (uint8_t)_mulx_u64(x280, 0x3f, &x293);
+  { uint8_t x293;  uint64_t x292 = _mulx_u64_out_u8(x280, 0x3f, &x293);
   { uint64_t x295; uint8_t x296 = _addcarryx_u64(0x0, x284, x286, &x295);
   { uint64_t x298; uint8_t x299 = _addcarryx_u64(x296, x287, x289, &x298);
   { uint64_t x301; uint8_t x302 = _addcarryx_u64(x299, x290, x292, &x301);
diff --git a/src/Specific/montgomery64_2e198m17/femulDisplay.log b/src/Specific/montgomery64_2e198m17/femulDisplay.log
index 4583d57ac..3092c8b9a 100644
--- a/src/Specific/montgomery64_2e198m17/femulDisplay.log
+++ b/src/Specific/montgomery64_2e198m17/femulDisplay.log
@@ -14,7 +14,7 @@ Interp-η
  uint64_t x44, uint64_t x45 = mulx_u64(x41, 0xffffffffffffffefL);
  uint64_t x47, uint64_t x48 = mulx_u64(x41, 0xffffffffffffffffL);
  uint64_t x50, uint64_t x51 = mulx_u64(x41, 0xffffffffffffffffL);
- uint64_t x53, uint8_t x54 = (uint8_t)mulx_u64(x41, 0x3f);
+ uint64_t x53, uint8_t x54 = mulx_u64_out_u8(x41, 0x3f);
  uint64_t x56, uint8_t x57 = addcarryx_u64(0x0, x45, x47);
  uint64_t x59, uint8_t x60 = addcarryx_u64(x57, x48, x50);
  uint64_t x62, uint8_t x63 = addcarryx_u64(x60, x51, x53);
@@ -41,7 +41,7 @@ Interp-η
  uint64_t x123, uint64_t x124 = mulx_u64(x120, 0xffffffffffffffefL);
  uint64_t x126, uint64_t x127 = mulx_u64(x120, 0xffffffffffffffffL);
  uint64_t x129, uint64_t x130 = mulx_u64(x120, 0xffffffffffffffffL);
- uint64_t x132, uint8_t x133 = (uint8_t)mulx_u64(x120, 0x3f);
+ uint64_t x132, uint8_t x133 = mulx_u64_out_u8(x120, 0x3f);
  uint64_t x135, uint8_t x136 = addcarryx_u64(0x0, x124, x126);
  uint64_t x138, uint8_t x139 = addcarryx_u64(x136, x127, x129);
  uint64_t x141, uint8_t x142 = addcarryx_u64(x139, x130, x132);
@@ -69,7 +69,7 @@ Interp-η
  uint64_t x203, uint64_t x204 = mulx_u64(x200, 0xffffffffffffffefL);
  uint64_t x206, uint64_t x207 = mulx_u64(x200, 0xffffffffffffffffL);
  uint64_t x209, uint64_t x210 = mulx_u64(x200, 0xffffffffffffffffL);
- uint64_t x212, uint8_t x213 = (uint8_t)mulx_u64(x200, 0x3f);
+ uint64_t x212, uint8_t x213 = mulx_u64_out_u8(x200, 0x3f);
  uint64_t x215, uint8_t x216 = addcarryx_u64(0x0, x204, x206);
  uint64_t x218, uint8_t x219 = addcarryx_u64(x216, x207, x209);
  uint64_t x221, uint8_t x222 = addcarryx_u64(x219, x210, x212);
@@ -97,7 +97,7 @@ Interp-η
  uint64_t x283, uint64_t x284 = mulx_u64(x280, 0xffffffffffffffefL);
  uint64_t x286, uint64_t x287 = mulx_u64(x280, 0xffffffffffffffffL);
  uint64_t x289, uint64_t x290 = mulx_u64(x280, 0xffffffffffffffffL);
- uint64_t x292, uint8_t x293 = (uint8_t)mulx_u64(x280, 0x3f);
+ uint64_t x292, uint8_t x293 = mulx_u64_out_u8(x280, 0x3f);
  uint64_t x295, uint8_t x296 = addcarryx_u64(0x0, x284, x286);
  uint64_t x298, uint8_t x299 = addcarryx_u64(x296, x287, x289);
  uint64_t x301, uint8_t x302 = addcarryx_u64(x299, x290, x292);
diff --git a/src/Specific/montgomery64_2e322m2e161m1/femul.c b/src/Specific/montgomery64_2e322m2e161m1/femul.c
index 4fcc978fe..0652874d0 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/femul.c
+++ b/src/Specific/montgomery64_2e322m2e161m1/femul.c
@@ -28,7 +28,7 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x68;  uint64_t x67 = _mulx_u64(x25, 0xfffffffdffffffffL, &x68);
   { uint64_t x71;  uint64_t x70 = _mulx_u64(x25, 0xffffffffffffffffL, &x71);
   { uint64_t x74;  uint64_t x73 = _mulx_u64(x25, 0xffffffffffffffffL, &x74);
-  { uint8_t x77;  uint64_t x76 = (uint8_t)_mulx_u64(x25, 0x3, &x77);
+  { uint8_t x77;  uint64_t x76 = _mulx_u64_out_u8(x25, 0x3, &x77);
   { uint64_t x79; uint8_t x80 = _addcarryx_u64(0x0, x62, x64, &x79);
   { uint64_t x82; uint8_t x83 = _addcarryx_u64(x80, x65, x67, &x82);
   { uint64_t x85; uint8_t x86 = _addcarryx_u64(x83, x68, x70, &x85);
@@ -66,7 +66,7 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x180;  uint64_t x179 = _mulx_u64(x152, 0xfffffffdffffffffL, &x180);
   { uint64_t x183;  uint64_t x182 = _mulx_u64(x152, 0xffffffffffffffffL, &x183);
   { uint64_t x186;  uint64_t x185 = _mulx_u64(x152, 0xffffffffffffffffL, &x186);
-  { uint8_t x189;  uint64_t x188 = (uint8_t)_mulx_u64(x152, 0x3, &x189);
+  { uint8_t x189;  uint64_t x188 = _mulx_u64_out_u8(x152, 0x3, &x189);
   { uint64_t x191; uint8_t x192 = _addcarryx_u64(0x0, x174, x176, &x191);
   { uint64_t x194; uint8_t x195 = _addcarryx_u64(x192, x177, x179, &x194);
   { uint64_t x197; uint8_t x198 = _addcarryx_u64(x195, x180, x182, &x197);
@@ -105,7 +105,7 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x293;  uint64_t x292 = _mulx_u64(x265, 0xfffffffdffffffffL, &x293);
   { uint64_t x296;  uint64_t x295 = _mulx_u64(x265, 0xffffffffffffffffL, &x296);
   { uint64_t x299;  uint64_t x298 = _mulx_u64(x265, 0xffffffffffffffffL, &x299);
-  { uint8_t x302;  uint64_t x301 = (uint8_t)_mulx_u64(x265, 0x3, &x302);
+  { uint8_t x302;  uint64_t x301 = _mulx_u64_out_u8(x265, 0x3, &x302);
   { uint64_t x304; uint8_t x305 = _addcarryx_u64(0x0, x287, x289, &x304);
   { uint64_t x307; uint8_t x308 = _addcarryx_u64(x305, x290, x292, &x307);
   { uint64_t x310; uint8_t x311 = _addcarryx_u64(x308, x293, x295, &x310);
@@ -144,7 +144,7 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x406;  uint64_t x405 = _mulx_u64(x378, 0xfffffffdffffffffL, &x406);
   { uint64_t x409;  uint64_t x408 = _mulx_u64(x378, 0xffffffffffffffffL, &x409);
   { uint64_t x412;  uint64_t x411 = _mulx_u64(x378, 0xffffffffffffffffL, &x412);
-  { uint8_t x415;  uint64_t x414 = (uint8_t)_mulx_u64(x378, 0x3, &x415);
+  { uint8_t x415;  uint64_t x414 = _mulx_u64_out_u8(x378, 0x3, &x415);
   { uint64_t x417; uint8_t x418 = _addcarryx_u64(0x0, x400, x402, &x417);
   { uint64_t x420; uint8_t x421 = _addcarryx_u64(x418, x403, x405, &x420);
   { uint64_t x423; uint8_t x424 = _addcarryx_u64(x421, x406, x408, &x423);
@@ -183,7 +183,7 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x519;  uint64_t x518 = _mulx_u64(x491, 0xfffffffdffffffffL, &x519);
   { uint64_t x522;  uint64_t x521 = _mulx_u64(x491, 0xffffffffffffffffL, &x522);
   { uint64_t x525;  uint64_t x524 = _mulx_u64(x491, 0xffffffffffffffffL, &x525);
-  { uint8_t x528;  uint64_t x527 = (uint8_t)_mulx_u64(x491, 0x3, &x528);
+  { uint8_t x528;  uint64_t x527 = _mulx_u64_out_u8(x491, 0x3, &x528);
   { uint64_t x530; uint8_t x531 = _addcarryx_u64(0x0, x513, x515, &x530);
   { uint64_t x533; uint8_t x534 = _addcarryx_u64(x531, x516, x518, &x533);
   { uint64_t x536; uint8_t x537 = _addcarryx_u64(x534, x519, x521, &x536);
@@ -222,7 +222,7 @@ static void femul(uint64_t out[6], const uint64_t in1[6], const uint64_t in2[6])
   { uint64_t x632;  uint64_t x631 = _mulx_u64(x604, 0xfffffffdffffffffL, &x632);
   { uint64_t x635;  uint64_t x634 = _mulx_u64(x604, 0xffffffffffffffffL, &x635);
   { uint64_t x638;  uint64_t x637 = _mulx_u64(x604, 0xffffffffffffffffL, &x638);
-  { uint8_t x641;  uint64_t x640 = (uint8_t)_mulx_u64(x604, 0x3, &x641);
+  { uint8_t x641;  uint64_t x640 = _mulx_u64_out_u8(x604, 0x3, &x641);
   { uint64_t x643; uint8_t x644 = _addcarryx_u64(0x0, x626, x628, &x643);
   { uint64_t x646; uint8_t x647 = _addcarryx_u64(x644, x629, x631, &x646);
   { uint64_t x649; uint8_t x650 = _addcarryx_u64(x647, x632, x634, &x649);
diff --git a/src/Specific/montgomery64_2e322m2e161m1/femulDisplay.log b/src/Specific/montgomery64_2e322m2e161m1/femulDisplay.log
index 71bfe0ee6..a36b29ec1 100644
--- a/src/Specific/montgomery64_2e322m2e161m1/femulDisplay.log
+++ b/src/Specific/montgomery64_2e322m2e161m1/femulDisplay.log
@@ -19,7 +19,7 @@ Interp-η
  uint64_t x67, uint64_t x68 = mulx_u64(x25, 0xfffffffdffffffffL);
  uint64_t x70, uint64_t x71 = mulx_u64(x25, 0xffffffffffffffffL);
  uint64_t x73, uint64_t x74 = mulx_u64(x25, 0xffffffffffffffffL);
- uint64_t x76, uint8_t x77 = (uint8_t)mulx_u64(x25, 0x3);
+ uint64_t x76, uint8_t x77 = mulx_u64_out_u8(x25, 0x3);
  uint64_t x79, uint8_t x80 = addcarryx_u64(0x0, x62, x64);
  uint64_t x82, uint8_t x83 = addcarryx_u64(x80, x65, x67);
  uint64_t x85, uint8_t x86 = addcarryx_u64(x83, x68, x70);
@@ -57,7 +57,7 @@ Interp-η
  uint64_t x179, uint64_t x180 = mulx_u64(x152, 0xfffffffdffffffffL);
  uint64_t x182, uint64_t x183 = mulx_u64(x152, 0xffffffffffffffffL);
  uint64_t x185, uint64_t x186 = mulx_u64(x152, 0xffffffffffffffffL);
- uint64_t x188, uint8_t x189 = (uint8_t)mulx_u64(x152, 0x3);
+ uint64_t x188, uint8_t x189 = mulx_u64_out_u8(x152, 0x3);
  uint64_t x191, uint8_t x192 = addcarryx_u64(0x0, x174, x176);
  uint64_t x194, uint8_t x195 = addcarryx_u64(x192, x177, x179);
  uint64_t x197, uint8_t x198 = addcarryx_u64(x195, x180, x182);
@@ -96,7 +96,7 @@ Interp-η
  uint64_t x292, uint64_t x293 = mulx_u64(x265, 0xfffffffdffffffffL);
  uint64_t x295, uint64_t x296 = mulx_u64(x265, 0xffffffffffffffffL);
  uint64_t x298, uint64_t x299 = mulx_u64(x265, 0xffffffffffffffffL);
- uint64_t x301, uint8_t x302 = (uint8_t)mulx_u64(x265, 0x3);
+ uint64_t x301, uint8_t x302 = mulx_u64_out_u8(x265, 0x3);
  uint64_t x304, uint8_t x305 = addcarryx_u64(0x0, x287, x289);
  uint64_t x307, uint8_t x308 = addcarryx_u64(x305, x290, x292);
  uint64_t x310, uint8_t x311 = addcarryx_u64(x308, x293, x295);
@@ -135,7 +135,7 @@ Interp-η
  uint64_t x405, uint64_t x406 = mulx_u64(x378, 0xfffffffdffffffffL);
  uint64_t x408, uint64_t x409 = mulx_u64(x378, 0xffffffffffffffffL);
  uint64_t x411, uint64_t x412 = mulx_u64(x378, 0xffffffffffffffffL);
- uint64_t x414, uint8_t x415 = (uint8_t)mulx_u64(x378, 0x3);
+ uint64_t x414, uint8_t x415 = mulx_u64_out_u8(x378, 0x3);
  uint64_t x417, uint8_t x418 = addcarryx_u64(0x0, x400, x402);
  uint64_t x420, uint8_t x421 = addcarryx_u64(x418, x403, x405);
  uint64_t x423, uint8_t x424 = addcarryx_u64(x421, x406, x408);
@@ -174,7 +174,7 @@ Interp-η
  uint64_t x518, uint64_t x519 = mulx_u64(x491, 0xfffffffdffffffffL);
  uint64_t x521, uint64_t x522 = mulx_u64(x491, 0xffffffffffffffffL);
  uint64_t x524, uint64_t x525 = mulx_u64(x491, 0xffffffffffffffffL);
- uint64_t x527, uint8_t x528 = (uint8_t)mulx_u64(x491, 0x3);
+ uint64_t x527, uint8_t x528 = mulx_u64_out_u8(x491, 0x3);
  uint64_t x530, uint8_t x531 = addcarryx_u64(0x0, x513, x515);
  uint64_t x533, uint8_t x534 = addcarryx_u64(x531, x516, x518);
  uint64_t x536, uint8_t x537 = addcarryx_u64(x534, x519, x521);
@@ -213,7 +213,7 @@ Interp-η
  uint64_t x631, uint64_t x632 = mulx_u64(x604, 0xfffffffdffffffffL);
  uint64_t x634, uint64_t x635 = mulx_u64(x604, 0xffffffffffffffffL);
  uint64_t x637, uint64_t x638 = mulx_u64(x604, 0xffffffffffffffffL);
- uint64_t x640, uint8_t x641 = (uint8_t)mulx_u64(x604, 0x3);
+ uint64_t x640, uint8_t x641 = mulx_u64_out_u8(x604, 0x3);
  uint64_t x643, uint8_t x644 = addcarryx_u64(0x0, x626, x628);
  uint64_t x646, uint8_t x647 = addcarryx_u64(x644, x629, x631);
  uint64_t x649, uint8_t x650 = addcarryx_u64(x647, x632, x634);
diff --git a/src/Specific/solinas32_2e510m290x2e496m1/fesub.c b/src/Specific/solinas32_2e510m290x2e496m1/fesub.c
index 3ccaeaf46..a7f6fb53a 100644
--- a/src/Specific/solinas32_2e510m290x2e496m1/fesub.c
+++ b/src/Specific/solinas32_2e510m290x2e496m1/fesub.c
@@ -70,6 +70,6 @@ static void fesub(uint32_t out[24], const uint32_t in1[24], const uint32_t in2[2
   out[20] = ((0x7ffffe + x45) - x91);
   out[21] = ((0x3ffffe + x47) - x93);
   out[22] = ((0x3ffffe + x49) - x95);
-  out[23] = ((Const 4120062 + x48) - x94);
+  out[23] = ((0x3eddfe + x48) - x94);
   }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 }
diff --git a/src/Specific/solinas32_2e512m491x2e496m1/fesub.c b/src/Specific/solinas32_2e512m491x2e496m1/fesub.c
index ff5b9b9cb..b8728068e 100644
--- a/src/Specific/solinas32_2e512m491x2e496m1/fesub.c
+++ b/src/Specific/solinas32_2e512m491x2e496m1/fesub.c
@@ -70,6 +70,6 @@ static void fesub(uint32_t out[24], const uint32_t in1[24], const uint32_t in2[2
   out[20] = ((0x3ffffe + x45) - x91);
   out[21] = ((0x7ffffe + x47) - x93);
   out[22] = ((0x3ffffe + x49) - x95);
-  out[23] = ((Const 4162878 + x48) - x94);
+  out[23] = ((0x3f853e + x48) - x94);
   }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 }