Rebuild .c files

It seems some commutativity has changed

1 files changed, 444 insertions, 444 deletions

diff --git a/p384_64.c b/p384_64.c
index 49c264b60..e10938f1c 100644
--- a/p384_64.c
+++ b/p384_64.c
@@ -144,22 +144,22 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x17, &x18, x6, (arg2[0]));
   uint64_t x19;
   fiat_p384_uint1 x20;
-  fiat_p384_addcarryx_u64(&x19, &x20, 0x0, x15, x18);
+  fiat_p384_addcarryx_u64(&x19, &x20, 0x0, x18, x15);
   uint64_t x21;
   fiat_p384_uint1 x22;
-  fiat_p384_addcarryx_u64(&x21, &x22, x20, x13, x16);
+  fiat_p384_addcarryx_u64(&x21, &x22, x20, x16, x13);
   uint64_t x23;
   fiat_p384_uint1 x24;
-  fiat_p384_addcarryx_u64(&x23, &x24, x22, x11, x14);
+  fiat_p384_addcarryx_u64(&x23, &x24, x22, x14, x11);
   uint64_t x25;
   fiat_p384_uint1 x26;
-  fiat_p384_addcarryx_u64(&x25, &x26, x24, x9, x12);
+  fiat_p384_addcarryx_u64(&x25, &x26, x24, x12, x9);
   uint64_t x27;
   fiat_p384_uint1 x28;
-  fiat_p384_addcarryx_u64(&x27, &x28, x26, x7, x10);
+  fiat_p384_addcarryx_u64(&x27, &x28, x26, x10, x7);
   uint64_t x29;
   fiat_p384_uint1 x30;
-  fiat_p384_addcarryx_u64(&x29, &x30, x28, 0x0, x8);
+  fiat_p384_addcarryx_u64(&x29, &x30, x28, x8, 0x0);
   uint64_t x31;
   uint64_t x32;
   fiat_p384_mulx_u64(&x31, &x32, x17, UINT64_C(0x100000001));
@@ -183,43 +183,43 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x43, &x44, x31, UINT32_C(0xffffffff));
   uint64_t x45;
   fiat_p384_uint1 x46;
-  fiat_p384_addcarryx_u64(&x45, &x46, 0x0, x41, x44);
+  fiat_p384_addcarryx_u64(&x45, &x46, 0x0, x44, x41);
   uint64_t x47;
   fiat_p384_uint1 x48;
-  fiat_p384_addcarryx_u64(&x47, &x48, x46, x39, x42);
+  fiat_p384_addcarryx_u64(&x47, &x48, x46, x42, x39);
   uint64_t x49;
   fiat_p384_uint1 x50;
-  fiat_p384_addcarryx_u64(&x49, &x50, x48, x37, x40);
+  fiat_p384_addcarryx_u64(&x49, &x50, x48, x40, x37);
   uint64_t x51;
   fiat_p384_uint1 x52;
-  fiat_p384_addcarryx_u64(&x51, &x52, x50, x35, x38);
+  fiat_p384_addcarryx_u64(&x51, &x52, x50, x38, x35);
   uint64_t x53;
   fiat_p384_uint1 x54;
-  fiat_p384_addcarryx_u64(&x53, &x54, x52, x33, x36);
+  fiat_p384_addcarryx_u64(&x53, &x54, x52, x36, x33);
   uint64_t x55;
   fiat_p384_uint1 x56;
-  fiat_p384_addcarryx_u64(&x55, &x56, x54, 0x0, x34);
+  fiat_p384_addcarryx_u64(&x55, &x56, x54, x34, 0x0);
   uint64_t x57;
   fiat_p384_uint1 x58;
-  fiat_p384_addcarryx_u64(&x57, &x58, 0x0, x43, x17);
+  fiat_p384_addcarryx_u64(&x57, &x58, 0x0, x17, x43);
   uint64_t x59;
   fiat_p384_uint1 x60;
-  fiat_p384_addcarryx_u64(&x59, &x60, x58, x45, x19);
+  fiat_p384_addcarryx_u64(&x59, &x60, x58, x19, x45);
   uint64_t x61;
   fiat_p384_uint1 x62;
-  fiat_p384_addcarryx_u64(&x61, &x62, x60, x47, x21);
+  fiat_p384_addcarryx_u64(&x61, &x62, x60, x21, x47);
   uint64_t x63;
   fiat_p384_uint1 x64;
-  fiat_p384_addcarryx_u64(&x63, &x64, x62, x49, x23);
+  fiat_p384_addcarryx_u64(&x63, &x64, x62, x23, x49);
   uint64_t x65;
   fiat_p384_uint1 x66;
-  fiat_p384_addcarryx_u64(&x65, &x66, x64, x51, x25);
+  fiat_p384_addcarryx_u64(&x65, &x66, x64, x25, x51);
   uint64_t x67;
   fiat_p384_uint1 x68;
-  fiat_p384_addcarryx_u64(&x67, &x68, x66, x53, x27);
+  fiat_p384_addcarryx_u64(&x67, &x68, x66, x27, x53);
   uint64_t x69;
   fiat_p384_uint1 x70;
-  fiat_p384_addcarryx_u64(&x69, &x70, x68, x55, x29);
+  fiat_p384_addcarryx_u64(&x69, &x70, x68, x29, x55);
   uint64_t x71;
   fiat_p384_uint1 x72;
   fiat_p384_addcarryx_u64(&x71, &x72, x70, 0x0, 0x0);
@@ -243,43 +243,43 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x83, &x84, x1, (arg2[0]));
   uint64_t x85;
   fiat_p384_uint1 x86;
-  fiat_p384_addcarryx_u64(&x85, &x86, 0x0, x81, x84);
+  fiat_p384_addcarryx_u64(&x85, &x86, 0x0, x84, x81);
   uint64_t x87;
   fiat_p384_uint1 x88;
-  fiat_p384_addcarryx_u64(&x87, &x88, x86, x79, x82);
+  fiat_p384_addcarryx_u64(&x87, &x88, x86, x82, x79);
   uint64_t x89;
   fiat_p384_uint1 x90;
-  fiat_p384_addcarryx_u64(&x89, &x90, x88, x77, x80);
+  fiat_p384_addcarryx_u64(&x89, &x90, x88, x80, x77);
   uint64_t x91;
   fiat_p384_uint1 x92;
-  fiat_p384_addcarryx_u64(&x91, &x92, x90, x75, x78);
+  fiat_p384_addcarryx_u64(&x91, &x92, x90, x78, x75);
   uint64_t x93;
   fiat_p384_uint1 x94;
-  fiat_p384_addcarryx_u64(&x93, &x94, x92, x73, x76);
+  fiat_p384_addcarryx_u64(&x93, &x94, x92, x76, x73);
   uint64_t x95;
   fiat_p384_uint1 x96;
-  fiat_p384_addcarryx_u64(&x95, &x96, x94, 0x0, x74);
+  fiat_p384_addcarryx_u64(&x95, &x96, x94, x74, 0x0);
   uint64_t x97;
   fiat_p384_uint1 x98;
-  fiat_p384_addcarryx_u64(&x97, &x98, 0x0, x83, x59);
+  fiat_p384_addcarryx_u64(&x97, &x98, 0x0, x59, x83);
   uint64_t x99;
   fiat_p384_uint1 x100;
-  fiat_p384_addcarryx_u64(&x99, &x100, x98, x85, x61);
+  fiat_p384_addcarryx_u64(&x99, &x100, x98, x61, x85);
   uint64_t x101;
   fiat_p384_uint1 x102;
-  fiat_p384_addcarryx_u64(&x101, &x102, x100, x87, x63);
+  fiat_p384_addcarryx_u64(&x101, &x102, x100, x63, x87);
   uint64_t x103;
   fiat_p384_uint1 x104;
-  fiat_p384_addcarryx_u64(&x103, &x104, x102, x89, x65);
+  fiat_p384_addcarryx_u64(&x103, &x104, x102, x65, x89);
   uint64_t x105;
   fiat_p384_uint1 x106;
-  fiat_p384_addcarryx_u64(&x105, &x106, x104, x91, x67);
+  fiat_p384_addcarryx_u64(&x105, &x106, x104, x67, x91);
   uint64_t x107;
   fiat_p384_uint1 x108;
-  fiat_p384_addcarryx_u64(&x107, &x108, x106, x93, x69);
+  fiat_p384_addcarryx_u64(&x107, &x108, x106, x69, x93);
   uint64_t x109;
   fiat_p384_uint1 x110;
-  fiat_p384_addcarryx_u64(&x109, &x110, x108, x95, (fiat_p384_uint1)x71);
+  fiat_p384_addcarryx_u64(&x109, &x110, x108, (fiat_p384_uint1)x71, x95);
   uint64_t x111;
   uint64_t x112;
   fiat_p384_mulx_u64(&x111, &x112, x97, UINT64_C(0x100000001));
@@ -303,46 +303,46 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x123, &x124, x111, UINT32_C(0xffffffff));
   uint64_t x125;
   fiat_p384_uint1 x126;
-  fiat_p384_addcarryx_u64(&x125, &x126, 0x0, x121, x124);
+  fiat_p384_addcarryx_u64(&x125, &x126, 0x0, x124, x121);
   uint64_t x127;
   fiat_p384_uint1 x128;
-  fiat_p384_addcarryx_u64(&x127, &x128, x126, x119, x122);
+  fiat_p384_addcarryx_u64(&x127, &x128, x126, x122, x119);
   uint64_t x129;
   fiat_p384_uint1 x130;
-  fiat_p384_addcarryx_u64(&x129, &x130, x128, x117, x120);
+  fiat_p384_addcarryx_u64(&x129, &x130, x128, x120, x117);
   uint64_t x131;
   fiat_p384_uint1 x132;
-  fiat_p384_addcarryx_u64(&x131, &x132, x130, x115, x118);
+  fiat_p384_addcarryx_u64(&x131, &x132, x130, x118, x115);
   uint64_t x133;
   fiat_p384_uint1 x134;
-  fiat_p384_addcarryx_u64(&x133, &x134, x132, x113, x116);
+  fiat_p384_addcarryx_u64(&x133, &x134, x132, x116, x113);
   uint64_t x135;
   fiat_p384_uint1 x136;
-  fiat_p384_addcarryx_u64(&x135, &x136, x134, 0x0, x114);
+  fiat_p384_addcarryx_u64(&x135, &x136, x134, x114, 0x0);
   uint64_t x137;
   fiat_p384_uint1 x138;
-  fiat_p384_addcarryx_u64(&x137, &x138, 0x0, x123, x97);
+  fiat_p384_addcarryx_u64(&x137, &x138, 0x0, x97, x123);
   uint64_t x139;
   fiat_p384_uint1 x140;
-  fiat_p384_addcarryx_u64(&x139, &x140, x138, x125, x99);
+  fiat_p384_addcarryx_u64(&x139, &x140, x138, x99, x125);
   uint64_t x141;
   fiat_p384_uint1 x142;
-  fiat_p384_addcarryx_u64(&x141, &x142, x140, x127, x101);
+  fiat_p384_addcarryx_u64(&x141, &x142, x140, x101, x127);
   uint64_t x143;
   fiat_p384_uint1 x144;
-  fiat_p384_addcarryx_u64(&x143, &x144, x142, x129, x103);
+  fiat_p384_addcarryx_u64(&x143, &x144, x142, x103, x129);
   uint64_t x145;
   fiat_p384_uint1 x146;
-  fiat_p384_addcarryx_u64(&x145, &x146, x144, x131, x105);
+  fiat_p384_addcarryx_u64(&x145, &x146, x144, x105, x131);
   uint64_t x147;
   fiat_p384_uint1 x148;
-  fiat_p384_addcarryx_u64(&x147, &x148, x146, x133, x107);
+  fiat_p384_addcarryx_u64(&x147, &x148, x146, x107, x133);
   uint64_t x149;
   fiat_p384_uint1 x150;
-  fiat_p384_addcarryx_u64(&x149, &x150, x148, x135, x109);
+  fiat_p384_addcarryx_u64(&x149, &x150, x148, x109, x135);
   uint64_t x151;
   fiat_p384_uint1 x152;
-  fiat_p384_addcarryx_u64(&x151, &x152, x150, 0x0, x110);
+  fiat_p384_addcarryx_u64(&x151, &x152, x150, x110, 0x0);
   uint64_t x153;
   uint64_t x154;
   fiat_p384_mulx_u64(&x153, &x154, x2, (arg2[5]));
@@ -363,43 +363,43 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x163, &x164, x2, (arg2[0]));
   uint64_t x165;
   fiat_p384_uint1 x166;
-  fiat_p384_addcarryx_u64(&x165, &x166, 0x0, x161, x164);
+  fiat_p384_addcarryx_u64(&x165, &x166, 0x0, x164, x161);
   uint64_t x167;
   fiat_p384_uint1 x168;
-  fiat_p384_addcarryx_u64(&x167, &x168, x166, x159, x162);
+  fiat_p384_addcarryx_u64(&x167, &x168, x166, x162, x159);
   uint64_t x169;
   fiat_p384_uint1 x170;
-  fiat_p384_addcarryx_u64(&x169, &x170, x168, x157, x160);
+  fiat_p384_addcarryx_u64(&x169, &x170, x168, x160, x157);
   uint64_t x171;
   fiat_p384_uint1 x172;
-  fiat_p384_addcarryx_u64(&x171, &x172, x170, x155, x158);
+  fiat_p384_addcarryx_u64(&x171, &x172, x170, x158, x155);
   uint64_t x173;
   fiat_p384_uint1 x174;
-  fiat_p384_addcarryx_u64(&x173, &x174, x172, x153, x156);
+  fiat_p384_addcarryx_u64(&x173, &x174, x172, x156, x153);
   uint64_t x175;
   fiat_p384_uint1 x176;
-  fiat_p384_addcarryx_u64(&x175, &x176, x174, 0x0, x154);
+  fiat_p384_addcarryx_u64(&x175, &x176, x174, x154, 0x0);
   uint64_t x177;
   fiat_p384_uint1 x178;
-  fiat_p384_addcarryx_u64(&x177, &x178, 0x0, x163, x139);
+  fiat_p384_addcarryx_u64(&x177, &x178, 0x0, x139, x163);
   uint64_t x179;
   fiat_p384_uint1 x180;
-  fiat_p384_addcarryx_u64(&x179, &x180, x178, x165, x141);
+  fiat_p384_addcarryx_u64(&x179, &x180, x178, x141, x165);
   uint64_t x181;
   fiat_p384_uint1 x182;
-  fiat_p384_addcarryx_u64(&x181, &x182, x180, x167, x143);
+  fiat_p384_addcarryx_u64(&x181, &x182, x180, x143, x167);
   uint64_t x183;
   fiat_p384_uint1 x184;
-  fiat_p384_addcarryx_u64(&x183, &x184, x182, x169, x145);
+  fiat_p384_addcarryx_u64(&x183, &x184, x182, x145, x169);
   uint64_t x185;
   fiat_p384_uint1 x186;
-  fiat_p384_addcarryx_u64(&x185, &x186, x184, x171, x147);
+  fiat_p384_addcarryx_u64(&x185, &x186, x184, x147, x171);
   uint64_t x187;
   fiat_p384_uint1 x188;
-  fiat_p384_addcarryx_u64(&x187, &x188, x186, x173, x149);
+  fiat_p384_addcarryx_u64(&x187, &x188, x186, x149, x173);
   uint64_t x189;
   fiat_p384_uint1 x190;
-  fiat_p384_addcarryx_u64(&x189, &x190, x188, x175, x151);
+  fiat_p384_addcarryx_u64(&x189, &x190, x188, x151, x175);
   uint64_t x191;
   uint64_t x192;
   fiat_p384_mulx_u64(&x191, &x192, x177, UINT64_C(0x100000001));
@@ -423,46 +423,46 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x203, &x204, x191, UINT32_C(0xffffffff));
   uint64_t x205;
   fiat_p384_uint1 x206;
-  fiat_p384_addcarryx_u64(&x205, &x206, 0x0, x201, x204);
+  fiat_p384_addcarryx_u64(&x205, &x206, 0x0, x204, x201);
   uint64_t x207;
   fiat_p384_uint1 x208;
-  fiat_p384_addcarryx_u64(&x207, &x208, x206, x199, x202);
+  fiat_p384_addcarryx_u64(&x207, &x208, x206, x202, x199);
   uint64_t x209;
   fiat_p384_uint1 x210;
-  fiat_p384_addcarryx_u64(&x209, &x210, x208, x197, x200);
+  fiat_p384_addcarryx_u64(&x209, &x210, x208, x200, x197);
   uint64_t x211;
   fiat_p384_uint1 x212;
-  fiat_p384_addcarryx_u64(&x211, &x212, x210, x195, x198);
+  fiat_p384_addcarryx_u64(&x211, &x212, x210, x198, x195);
   uint64_t x213;
   fiat_p384_uint1 x214;
-  fiat_p384_addcarryx_u64(&x213, &x214, x212, x193, x196);
+  fiat_p384_addcarryx_u64(&x213, &x214, x212, x196, x193);
   uint64_t x215;
   fiat_p384_uint1 x216;
-  fiat_p384_addcarryx_u64(&x215, &x216, x214, 0x0, x194);
+  fiat_p384_addcarryx_u64(&x215, &x216, x214, x194, 0x0);
   uint64_t x217;
   fiat_p384_uint1 x218;
-  fiat_p384_addcarryx_u64(&x217, &x218, 0x0, x203, x177);
+  fiat_p384_addcarryx_u64(&x217, &x218, 0x0, x177, x203);
   uint64_t x219;
   fiat_p384_uint1 x220;
-  fiat_p384_addcarryx_u64(&x219, &x220, x218, x205, x179);
+  fiat_p384_addcarryx_u64(&x219, &x220, x218, x179, x205);
   uint64_t x221;
   fiat_p384_uint1 x222;
-  fiat_p384_addcarryx_u64(&x221, &x222, x220, x207, x181);
+  fiat_p384_addcarryx_u64(&x221, &x222, x220, x181, x207);
   uint64_t x223;
   fiat_p384_uint1 x224;
-  fiat_p384_addcarryx_u64(&x223, &x224, x222, x209, x183);
+  fiat_p384_addcarryx_u64(&x223, &x224, x222, x183, x209);
   uint64_t x225;
   fiat_p384_uint1 x226;
-  fiat_p384_addcarryx_u64(&x225, &x226, x224, x211, x185);
+  fiat_p384_addcarryx_u64(&x225, &x226, x224, x185, x211);
   uint64_t x227;
   fiat_p384_uint1 x228;
-  fiat_p384_addcarryx_u64(&x227, &x228, x226, x213, x187);
+  fiat_p384_addcarryx_u64(&x227, &x228, x226, x187, x213);
   uint64_t x229;
   fiat_p384_uint1 x230;
-  fiat_p384_addcarryx_u64(&x229, &x230, x228, x215, x189);
+  fiat_p384_addcarryx_u64(&x229, &x230, x228, x189, x215);
   uint64_t x231;
   fiat_p384_uint1 x232;
-  fiat_p384_addcarryx_u64(&x231, &x232, x230, 0x0, x190);
+  fiat_p384_addcarryx_u64(&x231, &x232, x230, x190, 0x0);
   uint64_t x233;
   uint64_t x234;
   fiat_p384_mulx_u64(&x233, &x234, x3, (arg2[5]));
@@ -483,43 +483,43 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x243, &x244, x3, (arg2[0]));
   uint64_t x245;
   fiat_p384_uint1 x246;
-  fiat_p384_addcarryx_u64(&x245, &x246, 0x0, x241, x244);
+  fiat_p384_addcarryx_u64(&x245, &x246, 0x0, x244, x241);
   uint64_t x247;
   fiat_p384_uint1 x248;
-  fiat_p384_addcarryx_u64(&x247, &x248, x246, x239, x242);
+  fiat_p384_addcarryx_u64(&x247, &x248, x246, x242, x239);
   uint64_t x249;
   fiat_p384_uint1 x250;
-  fiat_p384_addcarryx_u64(&x249, &x250, x248, x237, x240);
+  fiat_p384_addcarryx_u64(&x249, &x250, x248, x240, x237);
   uint64_t x251;
   fiat_p384_uint1 x252;
-  fiat_p384_addcarryx_u64(&x251, &x252, x250, x235, x238);
+  fiat_p384_addcarryx_u64(&x251, &x252, x250, x238, x235);
   uint64_t x253;
   fiat_p384_uint1 x254;
-  fiat_p384_addcarryx_u64(&x253, &x254, x252, x233, x236);
+  fiat_p384_addcarryx_u64(&x253, &x254, x252, x236, x233);
   uint64_t x255;
   fiat_p384_uint1 x256;
-  fiat_p384_addcarryx_u64(&x255, &x256, x254, 0x0, x234);
+  fiat_p384_addcarryx_u64(&x255, &x256, x254, x234, 0x0);
   uint64_t x257;
   fiat_p384_uint1 x258;
-  fiat_p384_addcarryx_u64(&x257, &x258, 0x0, x243, x219);
+  fiat_p384_addcarryx_u64(&x257, &x258, 0x0, x219, x243);
   uint64_t x259;
   fiat_p384_uint1 x260;
-  fiat_p384_addcarryx_u64(&x259, &x260, x258, x245, x221);
+  fiat_p384_addcarryx_u64(&x259, &x260, x258, x221, x245);
   uint64_t x261;
   fiat_p384_uint1 x262;
-  fiat_p384_addcarryx_u64(&x261, &x262, x260, x247, x223);
+  fiat_p384_addcarryx_u64(&x261, &x262, x260, x223, x247);
   uint64_t x263;
   fiat_p384_uint1 x264;
-  fiat_p384_addcarryx_u64(&x263, &x264, x262, x249, x225);
+  fiat_p384_addcarryx_u64(&x263, &x264, x262, x225, x249);
   uint64_t x265;
   fiat_p384_uint1 x266;
-  fiat_p384_addcarryx_u64(&x265, &x266, x264, x251, x227);
+  fiat_p384_addcarryx_u64(&x265, &x266, x264, x227, x251);
   uint64_t x267;
   fiat_p384_uint1 x268;
-  fiat_p384_addcarryx_u64(&x267, &x268, x266, x253, x229);
+  fiat_p384_addcarryx_u64(&x267, &x268, x266, x229, x253);
   uint64_t x269;
   fiat_p384_uint1 x270;
-  fiat_p384_addcarryx_u64(&x269, &x270, x268, x255, x231);
+  fiat_p384_addcarryx_u64(&x269, &x270, x268, x231, x255);
   uint64_t x271;
   uint64_t x272;
   fiat_p384_mulx_u64(&x271, &x272, x257, UINT64_C(0x100000001));
@@ -543,46 +543,46 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x283, &x284, x271, UINT32_C(0xffffffff));
   uint64_t x285;
   fiat_p384_uint1 x286;
-  fiat_p384_addcarryx_u64(&x285, &x286, 0x0, x281, x284);
+  fiat_p384_addcarryx_u64(&x285, &x286, 0x0, x284, x281);
   uint64_t x287;
   fiat_p384_uint1 x288;
-  fiat_p384_addcarryx_u64(&x287, &x288, x286, x279, x282);
+  fiat_p384_addcarryx_u64(&x287, &x288, x286, x282, x279);
   uint64_t x289;
   fiat_p384_uint1 x290;
-  fiat_p384_addcarryx_u64(&x289, &x290, x288, x277, x280);
+  fiat_p384_addcarryx_u64(&x289, &x290, x288, x280, x277);
   uint64_t x291;
   fiat_p384_uint1 x292;
-  fiat_p384_addcarryx_u64(&x291, &x292, x290, x275, x278);
+  fiat_p384_addcarryx_u64(&x291, &x292, x290, x278, x275);
   uint64_t x293;
   fiat_p384_uint1 x294;
-  fiat_p384_addcarryx_u64(&x293, &x294, x292, x273, x276);
+  fiat_p384_addcarryx_u64(&x293, &x294, x292, x276, x273);
   uint64_t x295;
   fiat_p384_uint1 x296;
-  fiat_p384_addcarryx_u64(&x295, &x296, x294, 0x0, x274);
+  fiat_p384_addcarryx_u64(&x295, &x296, x294, x274, 0x0);
   uint64_t x297;
   fiat_p384_uint1 x298;
-  fiat_p384_addcarryx_u64(&x297, &x298, 0x0, x283, x257);
+  fiat_p384_addcarryx_u64(&x297, &x298, 0x0, x257, x283);
   uint64_t x299;
   fiat_p384_uint1 x300;
-  fiat_p384_addcarryx_u64(&x299, &x300, x298, x285, x259);
+  fiat_p384_addcarryx_u64(&x299, &x300, x298, x259, x285);
   uint64_t x301;
   fiat_p384_uint1 x302;
-  fiat_p384_addcarryx_u64(&x301, &x302, x300, x287, x261);
+  fiat_p384_addcarryx_u64(&x301, &x302, x300, x261, x287);
   uint64_t x303;
   fiat_p384_uint1 x304;
-  fiat_p384_addcarryx_u64(&x303, &x304, x302, x289, x263);
+  fiat_p384_addcarryx_u64(&x303, &x304, x302, x263, x289);
   uint64_t x305;
   fiat_p384_uint1 x306;
-  fiat_p384_addcarryx_u64(&x305, &x306, x304, x291, x265);
+  fiat_p384_addcarryx_u64(&x305, &x306, x304, x265, x291);
   uint64_t x307;
   fiat_p384_uint1 x308;
-  fiat_p384_addcarryx_u64(&x307, &x308, x306, x293, x267);
+  fiat_p384_addcarryx_u64(&x307, &x308, x306, x267, x293);
   uint64_t x309;
   fiat_p384_uint1 x310;
-  fiat_p384_addcarryx_u64(&x309, &x310, x308, x295, x269);
+  fiat_p384_addcarryx_u64(&x309, &x310, x308, x269, x295);
   uint64_t x311;
   fiat_p384_uint1 x312;
-  fiat_p384_addcarryx_u64(&x311, &x312, x310, 0x0, x270);
+  fiat_p384_addcarryx_u64(&x311, &x312, x310, x270, 0x0);
   uint64_t x313;
   uint64_t x314;
   fiat_p384_mulx_u64(&x313, &x314, x4, (arg2[5]));
@@ -603,43 +603,43 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x323, &x324, x4, (arg2[0]));
   uint64_t x325;
   fiat_p384_uint1 x326;
-  fiat_p384_addcarryx_u64(&x325, &x326, 0x0, x321, x324);
+  fiat_p384_addcarryx_u64(&x325, &x326, 0x0, x324, x321);
   uint64_t x327;
   fiat_p384_uint1 x328;
-  fiat_p384_addcarryx_u64(&x327, &x328, x326, x319, x322);
+  fiat_p384_addcarryx_u64(&x327, &x328, x326, x322, x319);
   uint64_t x329;
   fiat_p384_uint1 x330;
-  fiat_p384_addcarryx_u64(&x329, &x330, x328, x317, x320);
+  fiat_p384_addcarryx_u64(&x329, &x330, x328, x320, x317);
   uint64_t x331;
   fiat_p384_uint1 x332;
-  fiat_p384_addcarryx_u64(&x331, &x332, x330, x315, x318);
+  fiat_p384_addcarryx_u64(&x331, &x332, x330, x318, x315);
   uint64_t x333;
   fiat_p384_uint1 x334;
-  fiat_p384_addcarryx_u64(&x333, &x334, x332, x313, x316);
+  fiat_p384_addcarryx_u64(&x333, &x334, x332, x316, x313);
   uint64_t x335;
   fiat_p384_uint1 x336;
-  fiat_p384_addcarryx_u64(&x335, &x336, x334, 0x0, x314);
+  fiat_p384_addcarryx_u64(&x335, &x336, x334, x314, 0x0);
   uint64_t x337;
   fiat_p384_uint1 x338;
-  fiat_p384_addcarryx_u64(&x337, &x338, 0x0, x323, x299);
+  fiat_p384_addcarryx_u64(&x337, &x338, 0x0, x299, x323);
   uint64_t x339;
   fiat_p384_uint1 x340;
-  fiat_p384_addcarryx_u64(&x339, &x340, x338, x325, x301);
+  fiat_p384_addcarryx_u64(&x339, &x340, x338, x301, x325);
   uint64_t x341;
   fiat_p384_uint1 x342;
-  fiat_p384_addcarryx_u64(&x341, &x342, x340, x327, x303);
+  fiat_p384_addcarryx_u64(&x341, &x342, x340, x303, x327);
   uint64_t x343;
   fiat_p384_uint1 x344;
-  fiat_p384_addcarryx_u64(&x343, &x344, x342, x329, x305);
+  fiat_p384_addcarryx_u64(&x343, &x344, x342, x305, x329);
   uint64_t x345;
   fiat_p384_uint1 x346;
-  fiat_p384_addcarryx_u64(&x345, &x346, x344, x331, x307);
+  fiat_p384_addcarryx_u64(&x345, &x346, x344, x307, x331);
   uint64_t x347;
   fiat_p384_uint1 x348;
-  fiat_p384_addcarryx_u64(&x347, &x348, x346, x333, x309);
+  fiat_p384_addcarryx_u64(&x347, &x348, x346, x309, x333);
   uint64_t x349;
   fiat_p384_uint1 x350;
-  fiat_p384_addcarryx_u64(&x349, &x350, x348, x335, x311);
+  fiat_p384_addcarryx_u64(&x349, &x350, x348, x311, x335);
   uint64_t x351;
   uint64_t x352;
   fiat_p384_mulx_u64(&x351, &x352, x337, UINT64_C(0x100000001));
@@ -663,46 +663,46 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x363, &x364, x351, UINT32_C(0xffffffff));
   uint64_t x365;
   fiat_p384_uint1 x366;
-  fiat_p384_addcarryx_u64(&x365, &x366, 0x0, x361, x364);
+  fiat_p384_addcarryx_u64(&x365, &x366, 0x0, x364, x361);
   uint64_t x367;
   fiat_p384_uint1 x368;
-  fiat_p384_addcarryx_u64(&x367, &x368, x366, x359, x362);
+  fiat_p384_addcarryx_u64(&x367, &x368, x366, x362, x359);
   uint64_t x369;
   fiat_p384_uint1 x370;
-  fiat_p384_addcarryx_u64(&x369, &x370, x368, x357, x360);
+  fiat_p384_addcarryx_u64(&x369, &x370, x368, x360, x357);
   uint64_t x371;
   fiat_p384_uint1 x372;
-  fiat_p384_addcarryx_u64(&x371, &x372, x370, x355, x358);
+  fiat_p384_addcarryx_u64(&x371, &x372, x370, x358, x355);
   uint64_t x373;
   fiat_p384_uint1 x374;
-  fiat_p384_addcarryx_u64(&x373, &x374, x372, x353, x356);
+  fiat_p384_addcarryx_u64(&x373, &x374, x372, x356, x353);
   uint64_t x375;
   fiat_p384_uint1 x376;
-  fiat_p384_addcarryx_u64(&x375, &x376, x374, 0x0, x354);
+  fiat_p384_addcarryx_u64(&x375, &x376, x374, x354, 0x0);
   uint64_t x377;
   fiat_p384_uint1 x378;
-  fiat_p384_addcarryx_u64(&x377, &x378, 0x0, x363, x337);
+  fiat_p384_addcarryx_u64(&x377, &x378, 0x0, x337, x363);
   uint64_t x379;
   fiat_p384_uint1 x380;
-  fiat_p384_addcarryx_u64(&x379, &x380, x378, x365, x339);
+  fiat_p384_addcarryx_u64(&x379, &x380, x378, x339, x365);
   uint64_t x381;
   fiat_p384_uint1 x382;
-  fiat_p384_addcarryx_u64(&x381, &x382, x380, x367, x341);
+  fiat_p384_addcarryx_u64(&x381, &x382, x380, x341, x367);
   uint64_t x383;
   fiat_p384_uint1 x384;
-  fiat_p384_addcarryx_u64(&x383, &x384, x382, x369, x343);
+  fiat_p384_addcarryx_u64(&x383, &x384, x382, x343, x369);
   uint64_t x385;
   fiat_p384_uint1 x386;
-  fiat_p384_addcarryx_u64(&x385, &x386, x384, x371, x345);
+  fiat_p384_addcarryx_u64(&x385, &x386, x384, x345, x371);
   uint64_t x387;
   fiat_p384_uint1 x388;
-  fiat_p384_addcarryx_u64(&x387, &x388, x386, x373, x347);
+  fiat_p384_addcarryx_u64(&x387, &x388, x386, x347, x373);
   uint64_t x389;
   fiat_p384_uint1 x390;
-  fiat_p384_addcarryx_u64(&x389, &x390, x388, x375, x349);
+  fiat_p384_addcarryx_u64(&x389, &x390, x388, x349, x375);
   uint64_t x391;
   fiat_p384_uint1 x392;
-  fiat_p384_addcarryx_u64(&x391, &x392, x390, 0x0, x350);
+  fiat_p384_addcarryx_u64(&x391, &x392, x390, x350, 0x0);
   uint64_t x393;
   uint64_t x394;
   fiat_p384_mulx_u64(&x393, &x394, x5, (arg2[5]));
@@ -723,43 +723,43 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x403, &x404, x5, (arg2[0]));
   uint64_t x405;
   fiat_p384_uint1 x406;
-  fiat_p384_addcarryx_u64(&x405, &x406, 0x0, x401, x404);
+  fiat_p384_addcarryx_u64(&x405, &x406, 0x0, x404, x401);
   uint64_t x407;
   fiat_p384_uint1 x408;
-  fiat_p384_addcarryx_u64(&x407, &x408, x406, x399, x402);
+  fiat_p384_addcarryx_u64(&x407, &x408, x406, x402, x399);
   uint64_t x409;
   fiat_p384_uint1 x410;
-  fiat_p384_addcarryx_u64(&x409, &x410, x408, x397, x400);
+  fiat_p384_addcarryx_u64(&x409, &x410, x408, x400, x397);
   uint64_t x411;
   fiat_p384_uint1 x412;
-  fiat_p384_addcarryx_u64(&x411, &x412, x410, x395, x398);
+  fiat_p384_addcarryx_u64(&x411, &x412, x410, x398, x395);
   uint64_t x413;
   fiat_p384_uint1 x414;
-  fiat_p384_addcarryx_u64(&x413, &x414, x412, x393, x396);
+  fiat_p384_addcarryx_u64(&x413, &x414, x412, x396, x393);
   uint64_t x415;
   fiat_p384_uint1 x416;
-  fiat_p384_addcarryx_u64(&x415, &x416, x414, 0x0, x394);
+  fiat_p384_addcarryx_u64(&x415, &x416, x414, x394, 0x0);
   uint64_t x417;
   fiat_p384_uint1 x418;
-  fiat_p384_addcarryx_u64(&x417, &x418, 0x0, x403, x379);
+  fiat_p384_addcarryx_u64(&x417, &x418, 0x0, x379, x403);
   uint64_t x419;
   fiat_p384_uint1 x420;
-  fiat_p384_addcarryx_u64(&x419, &x420, x418, x405, x381);
+  fiat_p384_addcarryx_u64(&x419, &x420, x418, x381, x405);
   uint64_t x421;
   fiat_p384_uint1 x422;
-  fiat_p384_addcarryx_u64(&x421, &x422, x420, x407, x383);
+  fiat_p384_addcarryx_u64(&x421, &x422, x420, x383, x407);
   uint64_t x423;
   fiat_p384_uint1 x424;
-  fiat_p384_addcarryx_u64(&x423, &x424, x422, x409, x385);
+  fiat_p384_addcarryx_u64(&x423, &x424, x422, x385, x409);
   uint64_t x425;
   fiat_p384_uint1 x426;
-  fiat_p384_addcarryx_u64(&x425, &x426, x424, x411, x387);
+  fiat_p384_addcarryx_u64(&x425, &x426, x424, x387, x411);
   uint64_t x427;
   fiat_p384_uint1 x428;
-  fiat_p384_addcarryx_u64(&x427, &x428, x426, x413, x389);
+  fiat_p384_addcarryx_u64(&x427, &x428, x426, x389, x413);
   uint64_t x429;
   fiat_p384_uint1 x430;
-  fiat_p384_addcarryx_u64(&x429, &x430, x428, x415, x391);
+  fiat_p384_addcarryx_u64(&x429, &x430, x428, x391, x415);
   uint64_t x431;
   uint64_t x432;
   fiat_p384_mulx_u64(&x431, &x432, x417, UINT64_C(0x100000001));
@@ -783,46 +783,46 @@ static void fiat_p384_mul(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_mulx_u64(&x443, &x444, x431, UINT32_C(0xffffffff));
   uint64_t x445;
   fiat_p384_uint1 x446;
-  fiat_p384_addcarryx_u64(&x445, &x446, 0x0, x441, x444);
+  fiat_p384_addcarryx_u64(&x445, &x446, 0x0, x444, x441);
   uint64_t x447;
   fiat_p384_uint1 x448;
-  fiat_p384_addcarryx_u64(&x447, &x448, x446, x439, x442);
+  fiat_p384_addcarryx_u64(&x447, &x448, x446, x442, x439);
   uint64_t x449;
   fiat_p384_uint1 x450;
-  fiat_p384_addcarryx_u64(&x449, &x450, x448, x437, x440);
+  fiat_p384_addcarryx_u64(&x449, &x450, x448, x440, x437);
   uint64_t x451;
   fiat_p384_uint1 x452;
-  fiat_p384_addcarryx_u64(&x451, &x452, x450, x435, x438);
+  fiat_p384_addcarryx_u64(&x451, &x452, x450, x438, x435);
   uint64_t x453;
   fiat_p384_uint1 x454;
-  fiat_p384_addcarryx_u64(&x453, &x454, x452, x433, x436);
+  fiat_p384_addcarryx_u64(&x453, &x454, x452, x436, x433);
   uint64_t x455;
   fiat_p384_uint1 x456;
-  fiat_p384_addcarryx_u64(&x455, &x456, x454, 0x0, x434);
+  fiat_p384_addcarryx_u64(&x455, &x456, x454, x434, 0x0);
   uint64_t x457;
   fiat_p384_uint1 x458;
-  fiat_p384_addcarryx_u64(&x457, &x458, 0x0, x443, x417);
+  fiat_p384_addcarryx_u64(&x457, &x458, 0x0, x417, x443);
   uint64_t x459;
   fiat_p384_uint1 x460;
-  fiat_p384_addcarryx_u64(&x459, &x460, x458, x445, x419);
+  fiat_p384_addcarryx_u64(&x459, &x460, x458, x419, x445);
   uint64_t x461;
   fiat_p384_uint1 x462;
-  fiat_p384_addcarryx_u64(&x461, &x462, x460, x447, x421);
+  fiat_p384_addcarryx_u64(&x461, &x462, x460, x421, x447);
   uint64_t x463;
   fiat_p384_uint1 x464;
-  fiat_p384_addcarryx_u64(&x463, &x464, x462, x449, x423);
+  fiat_p384_addcarryx_u64(&x463, &x464, x462, x423, x449);
   uint64_t x465;
   fiat_p384_uint1 x466;
-  fiat_p384_addcarryx_u64(&x465, &x466, x464, x451, x425);
+  fiat_p384_addcarryx_u64(&x465, &x466, x464, x425, x451);
   uint64_t x467;
   fiat_p384_uint1 x468;
-  fiat_p384_addcarryx_u64(&x467, &x468, x466, x453, x427);
+  fiat_p384_addcarryx_u64(&x467, &x468, x466, x427, x453);
   uint64_t x469;
   fiat_p384_uint1 x470;
-  fiat_p384_addcarryx_u64(&x469, &x470, x468, x455, x429);
+  fiat_p384_addcarryx_u64(&x469, &x470, x468, x429, x455);
   uint64_t x471;
   fiat_p384_uint1 x472;
-  fiat_p384_addcarryx_u64(&x471, &x472, x470, 0x0, x430);
+  fiat_p384_addcarryx_u64(&x471, &x472, x470, x430, 0x0);
   uint64_t x473;
   fiat_p384_uint1 x474;
   fiat_p384_subborrowx_u64(&x473, &x474, 0x0, x459, UINT32_C(0xffffffff));
@@ -904,22 +904,22 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x17, &x18, x6, (arg1[0]));
   uint64_t x19;
   fiat_p384_uint1 x20;
-  fiat_p384_addcarryx_u64(&x19, &x20, 0x0, x15, x18);
+  fiat_p384_addcarryx_u64(&x19, &x20, 0x0, x18, x15);
   uint64_t x21;
   fiat_p384_uint1 x22;
-  fiat_p384_addcarryx_u64(&x21, &x22, x20, x13, x16);
+  fiat_p384_addcarryx_u64(&x21, &x22, x20, x16, x13);
   uint64_t x23;
   fiat_p384_uint1 x24;
-  fiat_p384_addcarryx_u64(&x23, &x24, x22, x11, x14);
+  fiat_p384_addcarryx_u64(&x23, &x24, x22, x14, x11);
   uint64_t x25;
   fiat_p384_uint1 x26;
-  fiat_p384_addcarryx_u64(&x25, &x26, x24, x9, x12);
+  fiat_p384_addcarryx_u64(&x25, &x26, x24, x12, x9);
   uint64_t x27;
   fiat_p384_uint1 x28;
-  fiat_p384_addcarryx_u64(&x27, &x28, x26, x7, x10);
+  fiat_p384_addcarryx_u64(&x27, &x28, x26, x10, x7);
   uint64_t x29;
   fiat_p384_uint1 x30;
-  fiat_p384_addcarryx_u64(&x29, &x30, x28, 0x0, x8);
+  fiat_p384_addcarryx_u64(&x29, &x30, x28, x8, 0x0);
   uint64_t x31;
   uint64_t x32;
   fiat_p384_mulx_u64(&x31, &x32, x17, UINT64_C(0x100000001));
@@ -943,43 +943,43 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x43, &x44, x31, UINT32_C(0xffffffff));
   uint64_t x45;
   fiat_p384_uint1 x46;
-  fiat_p384_addcarryx_u64(&x45, &x46, 0x0, x41, x44);
+  fiat_p384_addcarryx_u64(&x45, &x46, 0x0, x44, x41);
   uint64_t x47;
   fiat_p384_uint1 x48;
-  fiat_p384_addcarryx_u64(&x47, &x48, x46, x39, x42);
+  fiat_p384_addcarryx_u64(&x47, &x48, x46, x42, x39);
   uint64_t x49;
   fiat_p384_uint1 x50;
-  fiat_p384_addcarryx_u64(&x49, &x50, x48, x37, x40);
+  fiat_p384_addcarryx_u64(&x49, &x50, x48, x40, x37);
   uint64_t x51;
   fiat_p384_uint1 x52;
-  fiat_p384_addcarryx_u64(&x51, &x52, x50, x35, x38);
+  fiat_p384_addcarryx_u64(&x51, &x52, x50, x38, x35);
   uint64_t x53;
   fiat_p384_uint1 x54;
-  fiat_p384_addcarryx_u64(&x53, &x54, x52, x33, x36);
+  fiat_p384_addcarryx_u64(&x53, &x54, x52, x36, x33);
   uint64_t x55;
   fiat_p384_uint1 x56;
-  fiat_p384_addcarryx_u64(&x55, &x56, x54, 0x0, x34);
+  fiat_p384_addcarryx_u64(&x55, &x56, x54, x34, 0x0);
   uint64_t x57;
   fiat_p384_uint1 x58;
-  fiat_p384_addcarryx_u64(&x57, &x58, 0x0, x43, x17);
+  fiat_p384_addcarryx_u64(&x57, &x58, 0x0, x17, x43);
   uint64_t x59;
   fiat_p384_uint1 x60;
-  fiat_p384_addcarryx_u64(&x59, &x60, x58, x45, x19);
+  fiat_p384_addcarryx_u64(&x59, &x60, x58, x19, x45);
   uint64_t x61;
   fiat_p384_uint1 x62;
-  fiat_p384_addcarryx_u64(&x61, &x62, x60, x47, x21);
+  fiat_p384_addcarryx_u64(&x61, &x62, x60, x21, x47);
   uint64_t x63;
   fiat_p384_uint1 x64;
-  fiat_p384_addcarryx_u64(&x63, &x64, x62, x49, x23);
+  fiat_p384_addcarryx_u64(&x63, &x64, x62, x23, x49);
   uint64_t x65;
   fiat_p384_uint1 x66;
-  fiat_p384_addcarryx_u64(&x65, &x66, x64, x51, x25);
+  fiat_p384_addcarryx_u64(&x65, &x66, x64, x25, x51);
   uint64_t x67;
   fiat_p384_uint1 x68;
-  fiat_p384_addcarryx_u64(&x67, &x68, x66, x53, x27);
+  fiat_p384_addcarryx_u64(&x67, &x68, x66, x27, x53);
   uint64_t x69;
   fiat_p384_uint1 x70;
-  fiat_p384_addcarryx_u64(&x69, &x70, x68, x55, x29);
+  fiat_p384_addcarryx_u64(&x69, &x70, x68, x29, x55);
   uint64_t x71;
   fiat_p384_uint1 x72;
   fiat_p384_addcarryx_u64(&x71, &x72, x70, 0x0, 0x0);
@@ -1003,43 +1003,43 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x83, &x84, x1, (arg1[0]));
   uint64_t x85;
   fiat_p384_uint1 x86;
-  fiat_p384_addcarryx_u64(&x85, &x86, 0x0, x81, x84);
+  fiat_p384_addcarryx_u64(&x85, &x86, 0x0, x84, x81);
   uint64_t x87;
   fiat_p384_uint1 x88;
-  fiat_p384_addcarryx_u64(&x87, &x88, x86, x79, x82);
+  fiat_p384_addcarryx_u64(&x87, &x88, x86, x82, x79);
   uint64_t x89;
   fiat_p384_uint1 x90;
-  fiat_p384_addcarryx_u64(&x89, &x90, x88, x77, x80);
+  fiat_p384_addcarryx_u64(&x89, &x90, x88, x80, x77);
   uint64_t x91;
   fiat_p384_uint1 x92;
-  fiat_p384_addcarryx_u64(&x91, &x92, x90, x75, x78);
+  fiat_p384_addcarryx_u64(&x91, &x92, x90, x78, x75);
   uint64_t x93;
   fiat_p384_uint1 x94;
-  fiat_p384_addcarryx_u64(&x93, &x94, x92, x73, x76);
+  fiat_p384_addcarryx_u64(&x93, &x94, x92, x76, x73);
   uint64_t x95;
   fiat_p384_uint1 x96;
-  fiat_p384_addcarryx_u64(&x95, &x96, x94, 0x0, x74);
+  fiat_p384_addcarryx_u64(&x95, &x96, x94, x74, 0x0);
   uint64_t x97;
   fiat_p384_uint1 x98;
-  fiat_p384_addcarryx_u64(&x97, &x98, 0x0, x83, x59);
+  fiat_p384_addcarryx_u64(&x97, &x98, 0x0, x59, x83);
   uint64_t x99;
   fiat_p384_uint1 x100;
-  fiat_p384_addcarryx_u64(&x99, &x100, x98, x85, x61);
+  fiat_p384_addcarryx_u64(&x99, &x100, x98, x61, x85);
   uint64_t x101;
   fiat_p384_uint1 x102;
-  fiat_p384_addcarryx_u64(&x101, &x102, x100, x87, x63);
+  fiat_p384_addcarryx_u64(&x101, &x102, x100, x63, x87);
   uint64_t x103;
   fiat_p384_uint1 x104;
-  fiat_p384_addcarryx_u64(&x103, &x104, x102, x89, x65);
+  fiat_p384_addcarryx_u64(&x103, &x104, x102, x65, x89);
   uint64_t x105;
   fiat_p384_uint1 x106;
-  fiat_p384_addcarryx_u64(&x105, &x106, x104, x91, x67);
+  fiat_p384_addcarryx_u64(&x105, &x106, x104, x67, x91);
   uint64_t x107;
   fiat_p384_uint1 x108;
-  fiat_p384_addcarryx_u64(&x107, &x108, x106, x93, x69);
+  fiat_p384_addcarryx_u64(&x107, &x108, x106, x69, x93);
   uint64_t x109;
   fiat_p384_uint1 x110;
-  fiat_p384_addcarryx_u64(&x109, &x110, x108, x95, (fiat_p384_uint1)x71);
+  fiat_p384_addcarryx_u64(&x109, &x110, x108, (fiat_p384_uint1)x71, x95);
   uint64_t x111;
   uint64_t x112;
   fiat_p384_mulx_u64(&x111, &x112, x97, UINT64_C(0x100000001));
@@ -1063,46 +1063,46 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x123, &x124, x111, UINT32_C(0xffffffff));
   uint64_t x125;
   fiat_p384_uint1 x126;
-  fiat_p384_addcarryx_u64(&x125, &x126, 0x0, x121, x124);
+  fiat_p384_addcarryx_u64(&x125, &x126, 0x0, x124, x121);
   uint64_t x127;
   fiat_p384_uint1 x128;
-  fiat_p384_addcarryx_u64(&x127, &x128, x126, x119, x122);
+  fiat_p384_addcarryx_u64(&x127, &x128, x126, x122, x119);
   uint64_t x129;
   fiat_p384_uint1 x130;
-  fiat_p384_addcarryx_u64(&x129, &x130, x128, x117, x120);
+  fiat_p384_addcarryx_u64(&x129, &x130, x128, x120, x117);
   uint64_t x131;
   fiat_p384_uint1 x132;
-  fiat_p384_addcarryx_u64(&x131, &x132, x130, x115, x118);
+  fiat_p384_addcarryx_u64(&x131, &x132, x130, x118, x115);
   uint64_t x133;
   fiat_p384_uint1 x134;
-  fiat_p384_addcarryx_u64(&x133, &x134, x132, x113, x116);
+  fiat_p384_addcarryx_u64(&x133, &x134, x132, x116, x113);
   uint64_t x135;
   fiat_p384_uint1 x136;
-  fiat_p384_addcarryx_u64(&x135, &x136, x134, 0x0, x114);
+  fiat_p384_addcarryx_u64(&x135, &x136, x134, x114, 0x0);
   uint64_t x137;
   fiat_p384_uint1 x138;
-  fiat_p384_addcarryx_u64(&x137, &x138, 0x0, x123, x97);
+  fiat_p384_addcarryx_u64(&x137, &x138, 0x0, x97, x123);
   uint64_t x139;
   fiat_p384_uint1 x140;
-  fiat_p384_addcarryx_u64(&x139, &x140, x138, x125, x99);
+  fiat_p384_addcarryx_u64(&x139, &x140, x138, x99, x125);
   uint64_t x141;
   fiat_p384_uint1 x142;
-  fiat_p384_addcarryx_u64(&x141, &x142, x140, x127, x101);
+  fiat_p384_addcarryx_u64(&x141, &x142, x140, x101, x127);
   uint64_t x143;
   fiat_p384_uint1 x144;
-  fiat_p384_addcarryx_u64(&x143, &x144, x142, x129, x103);
+  fiat_p384_addcarryx_u64(&x143, &x144, x142, x103, x129);
   uint64_t x145;
   fiat_p384_uint1 x146;
-  fiat_p384_addcarryx_u64(&x145, &x146, x144, x131, x105);
+  fiat_p384_addcarryx_u64(&x145, &x146, x144, x105, x131);
   uint64_t x147;
   fiat_p384_uint1 x148;
-  fiat_p384_addcarryx_u64(&x147, &x148, x146, x133, x107);
+  fiat_p384_addcarryx_u64(&x147, &x148, x146, x107, x133);
   uint64_t x149;
   fiat_p384_uint1 x150;
-  fiat_p384_addcarryx_u64(&x149, &x150, x148, x135, x109);
+  fiat_p384_addcarryx_u64(&x149, &x150, x148, x109, x135);
   uint64_t x151;
   fiat_p384_uint1 x152;
-  fiat_p384_addcarryx_u64(&x151, &x152, x150, 0x0, x110);
+  fiat_p384_addcarryx_u64(&x151, &x152, x150, x110, 0x0);
   uint64_t x153;
   uint64_t x154;
   fiat_p384_mulx_u64(&x153, &x154, x2, (arg1[5]));
@@ -1123,43 +1123,43 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x163, &x164, x2, (arg1[0]));
   uint64_t x165;
   fiat_p384_uint1 x166;
-  fiat_p384_addcarryx_u64(&x165, &x166, 0x0, x161, x164);
+  fiat_p384_addcarryx_u64(&x165, &x166, 0x0, x164, x161);
   uint64_t x167;
   fiat_p384_uint1 x168;
-  fiat_p384_addcarryx_u64(&x167, &x168, x166, x159, x162);
+  fiat_p384_addcarryx_u64(&x167, &x168, x166, x162, x159);
   uint64_t x169;
   fiat_p384_uint1 x170;
-  fiat_p384_addcarryx_u64(&x169, &x170, x168, x157, x160);
+  fiat_p384_addcarryx_u64(&x169, &x170, x168, x160, x157);
   uint64_t x171;
   fiat_p384_uint1 x172;
-  fiat_p384_addcarryx_u64(&x171, &x172, x170, x155, x158);
+  fiat_p384_addcarryx_u64(&x171, &x172, x170, x158, x155);
   uint64_t x173;
   fiat_p384_uint1 x174;
-  fiat_p384_addcarryx_u64(&x173, &x174, x172, x153, x156);
+  fiat_p384_addcarryx_u64(&x173, &x174, x172, x156, x153);
   uint64_t x175;
   fiat_p384_uint1 x176;
-  fiat_p384_addcarryx_u64(&x175, &x176, x174, 0x0, x154);
+  fiat_p384_addcarryx_u64(&x175, &x176, x174, x154, 0x0);
   uint64_t x177;
   fiat_p384_uint1 x178;
-  fiat_p384_addcarryx_u64(&x177, &x178, 0x0, x163, x139);
+  fiat_p384_addcarryx_u64(&x177, &x178, 0x0, x139, x163);
   uint64_t x179;
   fiat_p384_uint1 x180;
-  fiat_p384_addcarryx_u64(&x179, &x180, x178, x165, x141);
+  fiat_p384_addcarryx_u64(&x179, &x180, x178, x141, x165);
   uint64_t x181;
   fiat_p384_uint1 x182;
-  fiat_p384_addcarryx_u64(&x181, &x182, x180, x167, x143);
+  fiat_p384_addcarryx_u64(&x181, &x182, x180, x143, x167);
   uint64_t x183;
   fiat_p384_uint1 x184;
-  fiat_p384_addcarryx_u64(&x183, &x184, x182, x169, x145);
+  fiat_p384_addcarryx_u64(&x183, &x184, x182, x145, x169);
   uint64_t x185;
   fiat_p384_uint1 x186;
-  fiat_p384_addcarryx_u64(&x185, &x186, x184, x171, x147);
+  fiat_p384_addcarryx_u64(&x185, &x186, x184, x147, x171);
   uint64_t x187;
   fiat_p384_uint1 x188;
-  fiat_p384_addcarryx_u64(&x187, &x188, x186, x173, x149);
+  fiat_p384_addcarryx_u64(&x187, &x188, x186, x149, x173);
   uint64_t x189;
   fiat_p384_uint1 x190;
-  fiat_p384_addcarryx_u64(&x189, &x190, x188, x175, x151);
+  fiat_p384_addcarryx_u64(&x189, &x190, x188, x151, x175);
   uint64_t x191;
   uint64_t x192;
   fiat_p384_mulx_u64(&x191, &x192, x177, UINT64_C(0x100000001));
@@ -1183,46 +1183,46 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x203, &x204, x191, UINT32_C(0xffffffff));
   uint64_t x205;
   fiat_p384_uint1 x206;
-  fiat_p384_addcarryx_u64(&x205, &x206, 0x0, x201, x204);
+  fiat_p384_addcarryx_u64(&x205, &x206, 0x0, x204, x201);
   uint64_t x207;
   fiat_p384_uint1 x208;
-  fiat_p384_addcarryx_u64(&x207, &x208, x206, x199, x202);
+  fiat_p384_addcarryx_u64(&x207, &x208, x206, x202, x199);
   uint64_t x209;
   fiat_p384_uint1 x210;
-  fiat_p384_addcarryx_u64(&x209, &x210, x208, x197, x200);
+  fiat_p384_addcarryx_u64(&x209, &x210, x208, x200, x197);
   uint64_t x211;
   fiat_p384_uint1 x212;
-  fiat_p384_addcarryx_u64(&x211, &x212, x210, x195, x198);
+  fiat_p384_addcarryx_u64(&x211, &x212, x210, x198, x195);
   uint64_t x213;
   fiat_p384_uint1 x214;
-  fiat_p384_addcarryx_u64(&x213, &x214, x212, x193, x196);
+  fiat_p384_addcarryx_u64(&x213, &x214, x212, x196, x193);
   uint64_t x215;
   fiat_p384_uint1 x216;
-  fiat_p384_addcarryx_u64(&x215, &x216, x214, 0x0, x194);
+  fiat_p384_addcarryx_u64(&x215, &x216, x214, x194, 0x0);
   uint64_t x217;
   fiat_p384_uint1 x218;
-  fiat_p384_addcarryx_u64(&x217, &x218, 0x0, x203, x177);
+  fiat_p384_addcarryx_u64(&x217, &x218, 0x0, x177, x203);
   uint64_t x219;
   fiat_p384_uint1 x220;
-  fiat_p384_addcarryx_u64(&x219, &x220, x218, x205, x179);
+  fiat_p384_addcarryx_u64(&x219, &x220, x218, x179, x205);
   uint64_t x221;
   fiat_p384_uint1 x222;
-  fiat_p384_addcarryx_u64(&x221, &x222, x220, x207, x181);
+  fiat_p384_addcarryx_u64(&x221, &x222, x220, x181, x207);
   uint64_t x223;
   fiat_p384_uint1 x224;
-  fiat_p384_addcarryx_u64(&x223, &x224, x222, x209, x183);
+  fiat_p384_addcarryx_u64(&x223, &x224, x222, x183, x209);
   uint64_t x225;
   fiat_p384_uint1 x226;
-  fiat_p384_addcarryx_u64(&x225, &x226, x224, x211, x185);
+  fiat_p384_addcarryx_u64(&x225, &x226, x224, x185, x211);
   uint64_t x227;
   fiat_p384_uint1 x228;
-  fiat_p384_addcarryx_u64(&x227, &x228, x226, x213, x187);
+  fiat_p384_addcarryx_u64(&x227, &x228, x226, x187, x213);
   uint64_t x229;
   fiat_p384_uint1 x230;
-  fiat_p384_addcarryx_u64(&x229, &x230, x228, x215, x189);
+  fiat_p384_addcarryx_u64(&x229, &x230, x228, x189, x215);
   uint64_t x231;
   fiat_p384_uint1 x232;
-  fiat_p384_addcarryx_u64(&x231, &x232, x230, 0x0, x190);
+  fiat_p384_addcarryx_u64(&x231, &x232, x230, x190, 0x0);
   uint64_t x233;
   uint64_t x234;
   fiat_p384_mulx_u64(&x233, &x234, x3, (arg1[5]));
@@ -1243,43 +1243,43 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x243, &x244, x3, (arg1[0]));
   uint64_t x245;
   fiat_p384_uint1 x246;
-  fiat_p384_addcarryx_u64(&x245, &x246, 0x0, x241, x244);
+  fiat_p384_addcarryx_u64(&x245, &x246, 0x0, x244, x241);
   uint64_t x247;
   fiat_p384_uint1 x248;
-  fiat_p384_addcarryx_u64(&x247, &x248, x246, x239, x242);
+  fiat_p384_addcarryx_u64(&x247, &x248, x246, x242, x239);
   uint64_t x249;
   fiat_p384_uint1 x250;
-  fiat_p384_addcarryx_u64(&x249, &x250, x248, x237, x240);
+  fiat_p384_addcarryx_u64(&x249, &x250, x248, x240, x237);
   uint64_t x251;
   fiat_p384_uint1 x252;
-  fiat_p384_addcarryx_u64(&x251, &x252, x250, x235, x238);
+  fiat_p384_addcarryx_u64(&x251, &x252, x250, x238, x235);
   uint64_t x253;
   fiat_p384_uint1 x254;
-  fiat_p384_addcarryx_u64(&x253, &x254, x252, x233, x236);
+  fiat_p384_addcarryx_u64(&x253, &x254, x252, x236, x233);
   uint64_t x255;
   fiat_p384_uint1 x256;
-  fiat_p384_addcarryx_u64(&x255, &x256, x254, 0x0, x234);
+  fiat_p384_addcarryx_u64(&x255, &x256, x254, x234, 0x0);
   uint64_t x257;
   fiat_p384_uint1 x258;
-  fiat_p384_addcarryx_u64(&x257, &x258, 0x0, x243, x219);
+  fiat_p384_addcarryx_u64(&x257, &x258, 0x0, x219, x243);
   uint64_t x259;
   fiat_p384_uint1 x260;
-  fiat_p384_addcarryx_u64(&x259, &x260, x258, x245, x221);
+  fiat_p384_addcarryx_u64(&x259, &x260, x258, x221, x245);
   uint64_t x261;
   fiat_p384_uint1 x262;
-  fiat_p384_addcarryx_u64(&x261, &x262, x260, x247, x223);
+  fiat_p384_addcarryx_u64(&x261, &x262, x260, x223, x247);
   uint64_t x263;
   fiat_p384_uint1 x264;
-  fiat_p384_addcarryx_u64(&x263, &x264, x262, x249, x225);
+  fiat_p384_addcarryx_u64(&x263, &x264, x262, x225, x249);
   uint64_t x265;
   fiat_p384_uint1 x266;
-  fiat_p384_addcarryx_u64(&x265, &x266, x264, x251, x227);
+  fiat_p384_addcarryx_u64(&x265, &x266, x264, x227, x251);
   uint64_t x267;
   fiat_p384_uint1 x268;
-  fiat_p384_addcarryx_u64(&x267, &x268, x266, x253, x229);
+  fiat_p384_addcarryx_u64(&x267, &x268, x266, x229, x253);
   uint64_t x269;
   fiat_p384_uint1 x270;
-  fiat_p384_addcarryx_u64(&x269, &x270, x268, x255, x231);
+  fiat_p384_addcarryx_u64(&x269, &x270, x268, x231, x255);
   uint64_t x271;
   uint64_t x272;
   fiat_p384_mulx_u64(&x271, &x272, x257, UINT64_C(0x100000001));
@@ -1303,46 +1303,46 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x283, &x284, x271, UINT32_C(0xffffffff));
   uint64_t x285;
   fiat_p384_uint1 x286;
-  fiat_p384_addcarryx_u64(&x285, &x286, 0x0, x281, x284);
+  fiat_p384_addcarryx_u64(&x285, &x286, 0x0, x284, x281);
   uint64_t x287;
   fiat_p384_uint1 x288;
-  fiat_p384_addcarryx_u64(&x287, &x288, x286, x279, x282);
+  fiat_p384_addcarryx_u64(&x287, &x288, x286, x282, x279);
   uint64_t x289;
   fiat_p384_uint1 x290;
-  fiat_p384_addcarryx_u64(&x289, &x290, x288, x277, x280);
+  fiat_p384_addcarryx_u64(&x289, &x290, x288, x280, x277);
   uint64_t x291;
   fiat_p384_uint1 x292;
-  fiat_p384_addcarryx_u64(&x291, &x292, x290, x275, x278);
+  fiat_p384_addcarryx_u64(&x291, &x292, x290, x278, x275);
   uint64_t x293;
   fiat_p384_uint1 x294;
-  fiat_p384_addcarryx_u64(&x293, &x294, x292, x273, x276);
+  fiat_p384_addcarryx_u64(&x293, &x294, x292, x276, x273);
   uint64_t x295;
   fiat_p384_uint1 x296;
-  fiat_p384_addcarryx_u64(&x295, &x296, x294, 0x0, x274);
+  fiat_p384_addcarryx_u64(&x295, &x296, x294, x274, 0x0);
   uint64_t x297;
   fiat_p384_uint1 x298;
-  fiat_p384_addcarryx_u64(&x297, &x298, 0x0, x283, x257);
+  fiat_p384_addcarryx_u64(&x297, &x298, 0x0, x257, x283);
   uint64_t x299;
   fiat_p384_uint1 x300;
-  fiat_p384_addcarryx_u64(&x299, &x300, x298, x285, x259);
+  fiat_p384_addcarryx_u64(&x299, &x300, x298, x259, x285);
   uint64_t x301;
   fiat_p384_uint1 x302;
-  fiat_p384_addcarryx_u64(&x301, &x302, x300, x287, x261);
+  fiat_p384_addcarryx_u64(&x301, &x302, x300, x261, x287);
   uint64_t x303;
   fiat_p384_uint1 x304;
-  fiat_p384_addcarryx_u64(&x303, &x304, x302, x289, x263);
+  fiat_p384_addcarryx_u64(&x303, &x304, x302, x263, x289);
   uint64_t x305;
   fiat_p384_uint1 x306;
-  fiat_p384_addcarryx_u64(&x305, &x306, x304, x291, x265);
+  fiat_p384_addcarryx_u64(&x305, &x306, x304, x265, x291);
   uint64_t x307;
   fiat_p384_uint1 x308;
-  fiat_p384_addcarryx_u64(&x307, &x308, x306, x293, x267);
+  fiat_p384_addcarryx_u64(&x307, &x308, x306, x267, x293);
   uint64_t x309;
   fiat_p384_uint1 x310;
-  fiat_p384_addcarryx_u64(&x309, &x310, x308, x295, x269);
+  fiat_p384_addcarryx_u64(&x309, &x310, x308, x269, x295);
   uint64_t x311;
   fiat_p384_uint1 x312;
-  fiat_p384_addcarryx_u64(&x311, &x312, x310, 0x0, x270);
+  fiat_p384_addcarryx_u64(&x311, &x312, x310, x270, 0x0);
   uint64_t x313;
   uint64_t x314;
   fiat_p384_mulx_u64(&x313, &x314, x4, (arg1[5]));
@@ -1363,43 +1363,43 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x323, &x324, x4, (arg1[0]));
   uint64_t x325;
   fiat_p384_uint1 x326;
-  fiat_p384_addcarryx_u64(&x325, &x326, 0x0, x321, x324);
+  fiat_p384_addcarryx_u64(&x325, &x326, 0x0, x324, x321);
   uint64_t x327;
   fiat_p384_uint1 x328;
-  fiat_p384_addcarryx_u64(&x327, &x328, x326, x319, x322);
+  fiat_p384_addcarryx_u64(&x327, &x328, x326, x322, x319);
   uint64_t x329;
   fiat_p384_uint1 x330;
-  fiat_p384_addcarryx_u64(&x329, &x330, x328, x317, x320);
+  fiat_p384_addcarryx_u64(&x329, &x330, x328, x320, x317);
   uint64_t x331;
   fiat_p384_uint1 x332;
-  fiat_p384_addcarryx_u64(&x331, &x332, x330, x315, x318);
+  fiat_p384_addcarryx_u64(&x331, &x332, x330, x318, x315);
   uint64_t x333;
   fiat_p384_uint1 x334;
-  fiat_p384_addcarryx_u64(&x333, &x334, x332, x313, x316);
+  fiat_p384_addcarryx_u64(&x333, &x334, x332, x316, x313);
   uint64_t x335;
   fiat_p384_uint1 x336;
-  fiat_p384_addcarryx_u64(&x335, &x336, x334, 0x0, x314);
+  fiat_p384_addcarryx_u64(&x335, &x336, x334, x314, 0x0);
   uint64_t x337;
   fiat_p384_uint1 x338;
-  fiat_p384_addcarryx_u64(&x337, &x338, 0x0, x323, x299);
+  fiat_p384_addcarryx_u64(&x337, &x338, 0x0, x299, x323);
   uint64_t x339;
   fiat_p384_uint1 x340;
-  fiat_p384_addcarryx_u64(&x339, &x340, x338, x325, x301);
+  fiat_p384_addcarryx_u64(&x339, &x340, x338, x301, x325);
   uint64_t x341;
   fiat_p384_uint1 x342;
-  fiat_p384_addcarryx_u64(&x341, &x342, x340, x327, x303);
+  fiat_p384_addcarryx_u64(&x341, &x342, x340, x303, x327);
   uint64_t x343;
   fiat_p384_uint1 x344;
-  fiat_p384_addcarryx_u64(&x343, &x344, x342, x329, x305);
+  fiat_p384_addcarryx_u64(&x343, &x344, x342, x305, x329);
   uint64_t x345;
   fiat_p384_uint1 x346;
-  fiat_p384_addcarryx_u64(&x345, &x346, x344, x331, x307);
+  fiat_p384_addcarryx_u64(&x345, &x346, x344, x307, x331);
   uint64_t x347;
   fiat_p384_uint1 x348;
-  fiat_p384_addcarryx_u64(&x347, &x348, x346, x333, x309);
+  fiat_p384_addcarryx_u64(&x347, &x348, x346, x309, x333);
   uint64_t x349;
   fiat_p384_uint1 x350;
-  fiat_p384_addcarryx_u64(&x349, &x350, x348, x335, x311);
+  fiat_p384_addcarryx_u64(&x349, &x350, x348, x311, x335);
   uint64_t x351;
   uint64_t x352;
   fiat_p384_mulx_u64(&x351, &x352, x337, UINT64_C(0x100000001));
@@ -1423,46 +1423,46 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x363, &x364, x351, UINT32_C(0xffffffff));
   uint64_t x365;
   fiat_p384_uint1 x366;
-  fiat_p384_addcarryx_u64(&x365, &x366, 0x0, x361, x364);
+  fiat_p384_addcarryx_u64(&x365, &x366, 0x0, x364, x361);
   uint64_t x367;
   fiat_p384_uint1 x368;
-  fiat_p384_addcarryx_u64(&x367, &x368, x366, x359, x362);
+  fiat_p384_addcarryx_u64(&x367, &x368, x366, x362, x359);
   uint64_t x369;
   fiat_p384_uint1 x370;
-  fiat_p384_addcarryx_u64(&x369, &x370, x368, x357, x360);
+  fiat_p384_addcarryx_u64(&x369, &x370, x368, x360, x357);
   uint64_t x371;
   fiat_p384_uint1 x372;
-  fiat_p384_addcarryx_u64(&x371, &x372, x370, x355, x358);
+  fiat_p384_addcarryx_u64(&x371, &x372, x370, x358, x355);
   uint64_t x373;
   fiat_p384_uint1 x374;
-  fiat_p384_addcarryx_u64(&x373, &x374, x372, x353, x356);
+  fiat_p384_addcarryx_u64(&x373, &x374, x372, x356, x353);
   uint64_t x375;
   fiat_p384_uint1 x376;
-  fiat_p384_addcarryx_u64(&x375, &x376, x374, 0x0, x354);
+  fiat_p384_addcarryx_u64(&x375, &x376, x374, x354, 0x0);
   uint64_t x377;
   fiat_p384_uint1 x378;
-  fiat_p384_addcarryx_u64(&x377, &x378, 0x0, x363, x337);
+  fiat_p384_addcarryx_u64(&x377, &x378, 0x0, x337, x363);
   uint64_t x379;
   fiat_p384_uint1 x380;
-  fiat_p384_addcarryx_u64(&x379, &x380, x378, x365, x339);
+  fiat_p384_addcarryx_u64(&x379, &x380, x378, x339, x365);
   uint64_t x381;
   fiat_p384_uint1 x382;
-  fiat_p384_addcarryx_u64(&x381, &x382, x380, x367, x341);
+  fiat_p384_addcarryx_u64(&x381, &x382, x380, x341, x367);
   uint64_t x383;
   fiat_p384_uint1 x384;
-  fiat_p384_addcarryx_u64(&x383, &x384, x382, x369, x343);
+  fiat_p384_addcarryx_u64(&x383, &x384, x382, x343, x369);
   uint64_t x385;
   fiat_p384_uint1 x386;
-  fiat_p384_addcarryx_u64(&x385, &x386, x384, x371, x345);
+  fiat_p384_addcarryx_u64(&x385, &x386, x384, x345, x371);
   uint64_t x387;
   fiat_p384_uint1 x388;
-  fiat_p384_addcarryx_u64(&x387, &x388, x386, x373, x347);
+  fiat_p384_addcarryx_u64(&x387, &x388, x386, x347, x373);
   uint64_t x389;
   fiat_p384_uint1 x390;
-  fiat_p384_addcarryx_u64(&x389, &x390, x388, x375, x349);
+  fiat_p384_addcarryx_u64(&x389, &x390, x388, x349, x375);
   uint64_t x391;
   fiat_p384_uint1 x392;
-  fiat_p384_addcarryx_u64(&x391, &x392, x390, 0x0, x350);
+  fiat_p384_addcarryx_u64(&x391, &x392, x390, x350, 0x0);
   uint64_t x393;
   uint64_t x394;
   fiat_p384_mulx_u64(&x393, &x394, x5, (arg1[5]));
@@ -1483,43 +1483,43 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x403, &x404, x5, (arg1[0]));
   uint64_t x405;
   fiat_p384_uint1 x406;
-  fiat_p384_addcarryx_u64(&x405, &x406, 0x0, x401, x404);
+  fiat_p384_addcarryx_u64(&x405, &x406, 0x0, x404, x401);
   uint64_t x407;
   fiat_p384_uint1 x408;
-  fiat_p384_addcarryx_u64(&x407, &x408, x406, x399, x402);
+  fiat_p384_addcarryx_u64(&x407, &x408, x406, x402, x399);
   uint64_t x409;
   fiat_p384_uint1 x410;
-  fiat_p384_addcarryx_u64(&x409, &x410, x408, x397, x400);
+  fiat_p384_addcarryx_u64(&x409, &x410, x408, x400, x397);
   uint64_t x411;
   fiat_p384_uint1 x412;
-  fiat_p384_addcarryx_u64(&x411, &x412, x410, x395, x398);
+  fiat_p384_addcarryx_u64(&x411, &x412, x410, x398, x395);
   uint64_t x413;
   fiat_p384_uint1 x414;
-  fiat_p384_addcarryx_u64(&x413, &x414, x412, x393, x396);
+  fiat_p384_addcarryx_u64(&x413, &x414, x412, x396, x393);
   uint64_t x415;
   fiat_p384_uint1 x416;
-  fiat_p384_addcarryx_u64(&x415, &x416, x414, 0x0, x394);
+  fiat_p384_addcarryx_u64(&x415, &x416, x414, x394, 0x0);
   uint64_t x417;
   fiat_p384_uint1 x418;
-  fiat_p384_addcarryx_u64(&x417, &x418, 0x0, x403, x379);
+  fiat_p384_addcarryx_u64(&x417, &x418, 0x0, x379, x403);
   uint64_t x419;
   fiat_p384_uint1 x420;
-  fiat_p384_addcarryx_u64(&x419, &x420, x418, x405, x381);
+  fiat_p384_addcarryx_u64(&x419, &x420, x418, x381, x405);
   uint64_t x421;
   fiat_p384_uint1 x422;
-  fiat_p384_addcarryx_u64(&x421, &x422, x420, x407, x383);
+  fiat_p384_addcarryx_u64(&x421, &x422, x420, x383, x407);
   uint64_t x423;
   fiat_p384_uint1 x424;
-  fiat_p384_addcarryx_u64(&x423, &x424, x422, x409, x385);
+  fiat_p384_addcarryx_u64(&x423, &x424, x422, x385, x409);
   uint64_t x425;
   fiat_p384_uint1 x426;
-  fiat_p384_addcarryx_u64(&x425, &x426, x424, x411, x387);
+  fiat_p384_addcarryx_u64(&x425, &x426, x424, x387, x411);
   uint64_t x427;
   fiat_p384_uint1 x428;
-  fiat_p384_addcarryx_u64(&x427, &x428, x426, x413, x389);
+  fiat_p384_addcarryx_u64(&x427, &x428, x426, x389, x413);
   uint64_t x429;
   fiat_p384_uint1 x430;
-  fiat_p384_addcarryx_u64(&x429, &x430, x428, x415, x391);
+  fiat_p384_addcarryx_u64(&x429, &x430, x428, x391, x415);
   uint64_t x431;
   uint64_t x432;
   fiat_p384_mulx_u64(&x431, &x432, x417, UINT64_C(0x100000001));
@@ -1543,46 +1543,46 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_mulx_u64(&x443, &x444, x431, UINT32_C(0xffffffff));
   uint64_t x445;
   fiat_p384_uint1 x446;
-  fiat_p384_addcarryx_u64(&x445, &x446, 0x0, x441, x444);
+  fiat_p384_addcarryx_u64(&x445, &x446, 0x0, x444, x441);
   uint64_t x447;
   fiat_p384_uint1 x448;
-  fiat_p384_addcarryx_u64(&x447, &x448, x446, x439, x442);
+  fiat_p384_addcarryx_u64(&x447, &x448, x446, x442, x439);
   uint64_t x449;
   fiat_p384_uint1 x450;
-  fiat_p384_addcarryx_u64(&x449, &x450, x448, x437, x440);
+  fiat_p384_addcarryx_u64(&x449, &x450, x448, x440, x437);
   uint64_t x451;
   fiat_p384_uint1 x452;
-  fiat_p384_addcarryx_u64(&x451, &x452, x450, x435, x438);
+  fiat_p384_addcarryx_u64(&x451, &x452, x450, x438, x435);
   uint64_t x453;
   fiat_p384_uint1 x454;
-  fiat_p384_addcarryx_u64(&x453, &x454, x452, x433, x436);
+  fiat_p384_addcarryx_u64(&x453, &x454, x452, x436, x433);
   uint64_t x455;
   fiat_p384_uint1 x456;
-  fiat_p384_addcarryx_u64(&x455, &x456, x454, 0x0, x434);
+  fiat_p384_addcarryx_u64(&x455, &x456, x454, x434, 0x0);
   uint64_t x457;
   fiat_p384_uint1 x458;
-  fiat_p384_addcarryx_u64(&x457, &x458, 0x0, x443, x417);
+  fiat_p384_addcarryx_u64(&x457, &x458, 0x0, x417, x443);
   uint64_t x459;
   fiat_p384_uint1 x460;
-  fiat_p384_addcarryx_u64(&x459, &x460, x458, x445, x419);
+  fiat_p384_addcarryx_u64(&x459, &x460, x458, x419, x445);
   uint64_t x461;
   fiat_p384_uint1 x462;
-  fiat_p384_addcarryx_u64(&x461, &x462, x460, x447, x421);
+  fiat_p384_addcarryx_u64(&x461, &x462, x460, x421, x447);
   uint64_t x463;
   fiat_p384_uint1 x464;
-  fiat_p384_addcarryx_u64(&x463, &x464, x462, x449, x423);
+  fiat_p384_addcarryx_u64(&x463, &x464, x462, x423, x449);
   uint64_t x465;
   fiat_p384_uint1 x466;
-  fiat_p384_addcarryx_u64(&x465, &x466, x464, x451, x425);
+  fiat_p384_addcarryx_u64(&x465, &x466, x464, x425, x451);
   uint64_t x467;
   fiat_p384_uint1 x468;
-  fiat_p384_addcarryx_u64(&x467, &x468, x466, x453, x427);
+  fiat_p384_addcarryx_u64(&x467, &x468, x466, x427, x453);
   uint64_t x469;
   fiat_p384_uint1 x470;
-  fiat_p384_addcarryx_u64(&x469, &x470, x468, x455, x429);
+  fiat_p384_addcarryx_u64(&x469, &x470, x468, x429, x455);
   uint64_t x471;
   fiat_p384_uint1 x472;
-  fiat_p384_addcarryx_u64(&x471, &x472, x470, 0x0, x430);
+  fiat_p384_addcarryx_u64(&x471, &x472, x470, x430, 0x0);
   uint64_t x473;
   fiat_p384_uint1 x474;
   fiat_p384_subborrowx_u64(&x473, &x474, 0x0, x459, UINT32_C(0xffffffff));
@@ -1642,22 +1642,22 @@ static void fiat_p384_square(uint64_t out1[6], const uint64_t arg1[6]) {
 static void fiat_p384_add(uint64_t out1[6], const uint64_t arg1[6], const uint64_t arg2[6]) {
   uint64_t x1;
   fiat_p384_uint1 x2;
-  fiat_p384_addcarryx_u64(&x1, &x2, 0x0, (arg2[0]), (arg1[0]));
+  fiat_p384_addcarryx_u64(&x1, &x2, 0x0, (arg1[0]), (arg2[0]));
   uint64_t x3;
   fiat_p384_uint1 x4;
-  fiat_p384_addcarryx_u64(&x3, &x4, x2, (arg2[1]), (arg1[1]));
+  fiat_p384_addcarryx_u64(&x3, &x4, x2, (arg1[1]), (arg2[1]));
   uint64_t x5;
   fiat_p384_uint1 x6;
-  fiat_p384_addcarryx_u64(&x5, &x6, x4, (arg2[2]), (arg1[2]));
+  fiat_p384_addcarryx_u64(&x5, &x6, x4, (arg1[2]), (arg2[2]));
   uint64_t x7;
   fiat_p384_uint1 x8;
-  fiat_p384_addcarryx_u64(&x7, &x8, x6, (arg2[3]), (arg1[3]));
+  fiat_p384_addcarryx_u64(&x7, &x8, x6, (arg1[3]), (arg2[3]));
   uint64_t x9;
   fiat_p384_uint1 x10;
-  fiat_p384_addcarryx_u64(&x9, &x10, x8, (arg2[4]), (arg1[4]));
+  fiat_p384_addcarryx_u64(&x9, &x10, x8, (arg1[4]), (arg2[4]));
   uint64_t x11;
   fiat_p384_uint1 x12;
-  fiat_p384_addcarryx_u64(&x11, &x12, x10, (arg2[5]), (arg1[5]));
+  fiat_p384_addcarryx_u64(&x11, &x12, x10, (arg1[5]), (arg2[5]));
   uint64_t x13;
   fiat_p384_uint1 x14;
   fiat_p384_subborrowx_u64(&x13, &x14, 0x0, x1, UINT32_C(0xffffffff));
@@ -1737,22 +1737,22 @@ static void fiat_p384_sub(uint64_t out1[6], const uint64_t arg1[6], const uint64
   fiat_p384_cmovznz_u64(&x13, x12, 0x0, UINT64_C(0xffffffffffffffff));
   uint64_t x14;
   fiat_p384_uint1 x15;
-  fiat_p384_addcarryx_u64(&x14, &x15, 0x0, (x13 & UINT32_C(0xffffffff)), x1);
+  fiat_p384_addcarryx_u64(&x14, &x15, 0x0, x1, (x13 & UINT32_C(0xffffffff)));
   uint64_t x16;
   fiat_p384_uint1 x17;
-  fiat_p384_addcarryx_u64(&x16, &x17, x15, (x13 & UINT64_C(0xffffffff00000000)), x3);
+  fiat_p384_addcarryx_u64(&x16, &x17, x15, x3, (x13 & UINT64_C(0xffffffff00000000)));
   uint64_t x18;
   fiat_p384_uint1 x19;
-  fiat_p384_addcarryx_u64(&x18, &x19, x17, (x13 & UINT64_C(0xfffffffffffffffe)), x5);
+  fiat_p384_addcarryx_u64(&x18, &x19, x17, x5, (x13 & UINT64_C(0xfffffffffffffffe)));
   uint64_t x20;
   fiat_p384_uint1 x21;
-  fiat_p384_addcarryx_u64(&x20, &x21, x19, (x13 & UINT64_C(0xffffffffffffffff)), x7);
+  fiat_p384_addcarryx_u64(&x20, &x21, x19, x7, (x13 & UINT64_C(0xffffffffffffffff)));
   uint64_t x22;
   fiat_p384_uint1 x23;
-  fiat_p384_addcarryx_u64(&x22, &x23, x21, (x13 & UINT64_C(0xffffffffffffffff)), x9);
+  fiat_p384_addcarryx_u64(&x22, &x23, x21, x9, (x13 & UINT64_C(0xffffffffffffffff)));
   uint64_t x24;
   fiat_p384_uint1 x25;
-  fiat_p384_addcarryx_u64(&x24, &x25, x23, (x13 & UINT64_C(0xffffffffffffffff)), x11);
+  fiat_p384_addcarryx_u64(&x24, &x25, x23, x11, (x13 & UINT64_C(0xffffffffffffffff)));
   out1[0] = x14;
   out1[1] = x16;
   out1[2] = x18;
@@ -1797,22 +1797,22 @@ static void fiat_p384_opp(uint64_t out1[6], const uint64_t arg1[6]) {
   fiat_p384_cmovznz_u64(&x13, x12, 0x0, UINT64_C(0xffffffffffffffff));
   uint64_t x14;
   fiat_p384_uint1 x15;
-  fiat_p384_addcarryx_u64(&x14, &x15, 0x0, (x13 & UINT32_C(0xffffffff)), x1);
+  fiat_p384_addcarryx_u64(&x14, &x15, 0x0, x1, (x13 & UINT32_C(0xffffffff)));
   uint64_t x16;
   fiat_p384_uint1 x17;
-  fiat_p384_addcarryx_u64(&x16, &x17, x15, (x13 & UINT64_C(0xffffffff00000000)), x3);
+  fiat_p384_addcarryx_u64(&x16, &x17, x15, x3, (x13 & UINT64_C(0xffffffff00000000)));
   uint64_t x18;
   fiat_p384_uint1 x19;
-  fiat_p384_addcarryx_u64(&x18, &x19, x17, (x13 & UINT64_C(0xfffffffffffffffe)), x5);
+  fiat_p384_addcarryx_u64(&x18, &x19, x17, x5, (x13 & UINT64_C(0xfffffffffffffffe)));
   uint64_t x20;
   fiat_p384_uint1 x21;
-  fiat_p384_addcarryx_u64(&x20, &x21, x19, (x13 & UINT64_C(0xffffffffffffffff)), x7);
+  fiat_p384_addcarryx_u64(&x20, &x21, x19, x7, (x13 & UINT64_C(0xffffffffffffffff)));
   uint64_t x22;
   fiat_p384_uint1 x23;
-  fiat_p384_addcarryx_u64(&x22, &x23, x21, (x13 & UINT64_C(0xffffffffffffffff)), x9);
+  fiat_p384_addcarryx_u64(&x22, &x23, x21, x9, (x13 & UINT64_C(0xffffffffffffffff)));
   uint64_t x24;
   fiat_p384_uint1 x25;
-  fiat_p384_addcarryx_u64(&x24, &x25, x23, (x13 & UINT64_C(0xffffffffffffffff)), x11);
+  fiat_p384_addcarryx_u64(&x24, &x25, x23, x11, (x13 & UINT64_C(0xffffffffffffffff)));
   out1[0] = x14;
   out1[1] = x16;
   out1[2] = x18;
@@ -1859,61 +1859,61 @@ static void fiat_p384_from_montgomery(uint64_t out1[6], const uint64_t arg1[6])
   fiat_p384_mulx_u64(&x14, &x15, x2, UINT32_C(0xffffffff));
   uint64_t x16;
   fiat_p384_uint1 x17;
-  fiat_p384_addcarryx_u64(&x16, &x17, 0x0, x12, x15);
+  fiat_p384_addcarryx_u64(&x16, &x17, 0x0, x15, x12);
   uint64_t x18;
   fiat_p384_uint1 x19;
-  fiat_p384_addcarryx_u64(&x18, &x19, x17, x10, x13);
+  fiat_p384_addcarryx_u64(&x18, &x19, x17, x13, x10);
   uint64_t x20;
   fiat_p384_uint1 x21;
-  fiat_p384_addcarryx_u64(&x20, &x21, x19, x8, x11);
+  fiat_p384_addcarryx_u64(&x20, &x21, x19, x11, x8);
   uint64_t x22;
   fiat_p384_uint1 x23;
-  fiat_p384_addcarryx_u64(&x22, &x23, x21, x6, x9);
+  fiat_p384_addcarryx_u64(&x22, &x23, x21, x9, x6);
   uint64_t x24;
   fiat_p384_uint1 x25;
-  fiat_p384_addcarryx_u64(&x24, &x25, x23, x4, x7);
+  fiat_p384_addcarryx_u64(&x24, &x25, x23, x7, x4);
   uint64_t x26;
   fiat_p384_uint1 x27;
-  fiat_p384_addcarryx_u64(&x26, &x27, 0x0, x14, x1);
+  fiat_p384_addcarryx_u64(&x26, &x27, 0x0, x1, x14);
   uint64_t x28;
   fiat_p384_uint1 x29;
-  fiat_p384_addcarryx_u64(&x28, &x29, x27, x16, 0x0);
+  fiat_p384_addcarryx_u64(&x28, &x29, x27, 0x0, x16);
   uint64_t x30;
   fiat_p384_uint1 x31;
-  fiat_p384_addcarryx_u64(&x30, &x31, x29, x18, 0x0);
+  fiat_p384_addcarryx_u64(&x30, &x31, x29, 0x0, x18);
   uint64_t x32;
   fiat_p384_uint1 x33;
-  fiat_p384_addcarryx_u64(&x32, &x33, x31, x20, 0x0);
+  fiat_p384_addcarryx_u64(&x32, &x33, x31, 0x0, x20);
   uint64_t x34;
   fiat_p384_uint1 x35;
-  fiat_p384_addcarryx_u64(&x34, &x35, x33, x22, 0x0);
+  fiat_p384_addcarryx_u64(&x34, &x35, x33, 0x0, x22);
   uint64_t x36;
   fiat_p384_uint1 x37;
-  fiat_p384_addcarryx_u64(&x36, &x37, x35, x24, 0x0);
+  fiat_p384_addcarryx_u64(&x36, &x37, x35, 0x0, x24);
   uint64_t x38;
   fiat_p384_uint1 x39;
-  fiat_p384_addcarryx_u64(&x38, &x39, x25, 0x0, x5);
+  fiat_p384_addcarryx_u64(&x38, &x39, x25, x5, 0x0);
   uint64_t x40;
   fiat_p384_uint1 x41;
-  fiat_p384_addcarryx_u64(&x40, &x41, x37, x38, 0x0);
+  fiat_p384_addcarryx_u64(&x40, &x41, x37, 0x0, x38);
   uint64_t x42;
   fiat_p384_uint1 x43;
-  fiat_p384_addcarryx_u64(&x42, &x43, 0x0, (arg1[1]), x28);
+  fiat_p384_addcarryx_u64(&x42, &x43, 0x0, x28, (arg1[1]));
   uint64_t x44;
   fiat_p384_uint1 x45;
-  fiat_p384_addcarryx_u64(&x44, &x45, x43, 0x0, x30);
+  fiat_p384_addcarryx_u64(&x44, &x45, x43, x30, 0x0);
   uint64_t x46;
   fiat_p384_uint1 x47;
-  fiat_p384_addcarryx_u64(&x46, &x47, x45, 0x0, x32);
+  fiat_p384_addcarryx_u64(&x46, &x47, x45, x32, 0x0);
   uint64_t x48;
   fiat_p384_uint1 x49;
-  fiat_p384_addcarryx_u64(&x48, &x49, x47, 0x0, x34);
+  fiat_p384_addcarryx_u64(&x48, &x49, x47, x34, 0x0);
   uint64_t x50;
   fiat_p384_uint1 x51;
-  fiat_p384_addcarryx_u64(&x50, &x51, x49, 0x0, x36);
+  fiat_p384_addcarryx_u64(&x50, &x51, x49, x36, 0x0);
   uint64_t x52;
   fiat_p384_uint1 x53;
-  fiat_p384_addcarryx_u64(&x52, &x53, x51, 0x0, x40);
+  fiat_p384_addcarryx_u64(&x52, &x53, x51, x40, 0x0);
   uint64_t x54;
   uint64_t x55;
   fiat_p384_mulx_u64(&x54, &x55, x42, UINT64_C(0x100000001));
@@ -1937,67 +1937,67 @@ static void fiat_p384_from_montgomery(uint64_t out1[6], const uint64_t arg1[6])
   fiat_p384_mulx_u64(&x66, &x67, x54, UINT32_C(0xffffffff));
   uint64_t x68;
   fiat_p384_uint1 x69;
-  fiat_p384_addcarryx_u64(&x68, &x69, 0x0, x64, x67);
+  fiat_p384_addcarryx_u64(&x68, &x69, 0x0, x67, x64);
   uint64_t x70;
   fiat_p384_uint1 x71;
-  fiat_p384_addcarryx_u64(&x70, &x71, x69, x62, x65);
+  fiat_p384_addcarryx_u64(&x70, &x71, x69, x65, x62);
   uint64_t x72;
   fiat_p384_uint1 x73;
-  fiat_p384_addcarryx_u64(&x72, &x73, x71, x60, x63);
+  fiat_p384_addcarryx_u64(&x72, &x73, x71, x63, x60);
   uint64_t x74;
   fiat_p384_uint1 x75;
-  fiat_p384_addcarryx_u64(&x74, &x75, x73, x58, x61);
+  fiat_p384_addcarryx_u64(&x74, &x75, x73, x61, x58);
   uint64_t x76;
   fiat_p384_uint1 x77;
-  fiat_p384_addcarryx_u64(&x76, &x77, x75, x56, x59);
+  fiat_p384_addcarryx_u64(&x76, &x77, x75, x59, x56);
   uint64_t x78;
   fiat_p384_uint1 x79;
-  fiat_p384_addcarryx_u64(&x78, &x79, 0x0, x66, x42);
+  fiat_p384_addcarryx_u64(&x78, &x79, 0x0, x42, x66);
   uint64_t x80;
   fiat_p384_uint1 x81;
-  fiat_p384_addcarryx_u64(&x80, &x81, x79, x68, x44);
+  fiat_p384_addcarryx_u64(&x80, &x81, x79, x44, x68);
   uint64_t x82;
   fiat_p384_uint1 x83;
-  fiat_p384_addcarryx_u64(&x82, &x83, x81, x70, x46);
+  fiat_p384_addcarryx_u64(&x82, &x83, x81, x46, x70);
   uint64_t x84;
   fiat_p384_uint1 x85;
-  fiat_p384_addcarryx_u64(&x84, &x85, x83, x72, x48);
+  fiat_p384_addcarryx_u64(&x84, &x85, x83, x48, x72);
   uint64_t x86;
   fiat_p384_uint1 x87;
-  fiat_p384_addcarryx_u64(&x86, &x87, x85, x74, x50);
+  fiat_p384_addcarryx_u64(&x86, &x87, x85, x50, x74);
   uint64_t x88;
   fiat_p384_uint1 x89;
-  fiat_p384_addcarryx_u64(&x88, &x89, x87, x76, x52);
+  fiat_p384_addcarryx_u64(&x88, &x89, x87, x52, x76);
   uint64_t x90;
   fiat_p384_uint1 x91;
-  fiat_p384_addcarryx_u64(&x90, &x91, x41, 0x0, 0x0);
+  fiat_p384_addcarryx_u64(&x90, &x91, x77, x57, 0x0);
   uint64_t x92;
   fiat_p384_uint1 x93;
-  fiat_p384_addcarryx_u64(&x92, &x93, x53, 0x0, (fiat_p384_uint1)x90);
+  fiat_p384_addcarryx_u64(&x92, &x93, x41, 0x0, 0x0);
   uint64_t x94;
   fiat_p384_uint1 x95;
-  fiat_p384_addcarryx_u64(&x94, &x95, x77, 0x0, x57);
+  fiat_p384_addcarryx_u64(&x94, &x95, x53, (fiat_p384_uint1)x92, 0x0);
   uint64_t x96;
   fiat_p384_uint1 x97;
-  fiat_p384_addcarryx_u64(&x96, &x97, x89, x94, x92);
+  fiat_p384_addcarryx_u64(&x96, &x97, x89, x94, x90);
   uint64_t x98;
   fiat_p384_uint1 x99;
-  fiat_p384_addcarryx_u64(&x98, &x99, 0x0, (arg1[2]), x80);
+  fiat_p384_addcarryx_u64(&x98, &x99, 0x0, x80, (arg1[2]));
   uint64_t x100;
   fiat_p384_uint1 x101;
-  fiat_p384_addcarryx_u64(&x100, &x101, x99, 0x0, x82);
+  fiat_p384_addcarryx_u64(&x100, &x101, x99, x82, 0x0);
   uint64_t x102;
   fiat_p384_uint1 x103;
-  fiat_p384_addcarryx_u64(&x102, &x103, x101, 0x0, x84);
+  fiat_p384_addcarryx_u64(&x102, &x103, x101, x84, 0x0);
   uint64_t x104;
   fiat_p384_uint1 x105;
-  fiat_p384_addcarryx_u64(&x104, &x105, x103, 0x0, x86);
+  fiat_p384_addcarryx_u64(&x104, &x105, x103, x86, 0x0);
   uint64_t x106;
   fiat_p384_uint1 x107;
-  fiat_p384_addcarryx_u64(&x106, &x107, x105, 0x0, x88);
+  fiat_p384_addcarryx_u64(&x106, &x107, x105, x88, 0x0);
   uint64_t x108;
   fiat_p384_uint1 x109;
-  fiat_p384_addcarryx_u64(&x108, &x109, x107, 0x0, x96);
+  fiat_p384_addcarryx_u64(&x108, &x109, x107, x96, 0x0);
   uint64_t x110;
   uint64_t x111;
   fiat_p384_mulx_u64(&x110, &x111, x98, UINT64_C(0x100000001));
@@ -2021,67 +2021,67 @@ static void fiat_p384_from_montgomery(uint64_t out1[6], const uint64_t arg1[6])
   fiat_p384_mulx_u64(&x122, &x123, x110, UINT32_C(0xffffffff));
   uint64_t x124;
   fiat_p384_uint1 x125;
-  fiat_p384_addcarryx_u64(&x124, &x125, 0x0, x120, x123);
+  fiat_p384_addcarryx_u64(&x124, &x125, 0x0, x123, x120);
   uint64_t x126;
   fiat_p384_uint1 x127;
-  fiat_p384_addcarryx_u64(&x126, &x127, x125, x118, x121);
+  fiat_p384_addcarryx_u64(&x126, &x127, x125, x121, x118);
   uint64_t x128;
   fiat_p384_uint1 x129;
-  fiat_p384_addcarryx_u64(&x128, &x129, x127, x116, x119);
+  fiat_p384_addcarryx_u64(&x128, &x129, x127, x119, x116);
   uint64_t x130;
   fiat_p384_uint1 x131;
-  fiat_p384_addcarryx_u64(&x130, &x131, x129, x114, x117);
+  fiat_p384_addcarryx_u64(&x130, &x131, x129, x117, x114);
   uint64_t x132;
   fiat_p384_uint1 x133;
-  fiat_p384_addcarryx_u64(&x132, &x133, x131, x112, x115);
+  fiat_p384_addcarryx_u64(&x132, &x133, x131, x115, x112);
   uint64_t x134;
   fiat_p384_uint1 x135;
-  fiat_p384_addcarryx_u64(&x134, &x135, 0x0, x122, x98);
+  fiat_p384_addcarryx_u64(&x134, &x135, 0x0, x98, x122);
   uint64_t x136;
   fiat_p384_uint1 x137;
-  fiat_p384_addcarryx_u64(&x136, &x137, x135, x124, x100);
+  fiat_p384_addcarryx_u64(&x136, &x137, x135, x100, x124);
   uint64_t x138;
   fiat_p384_uint1 x139;
-  fiat_p384_addcarryx_u64(&x138, &x139, x137, x126, x102);
+  fiat_p384_addcarryx_u64(&x138, &x139, x137, x102, x126);
   uint64_t x140;
   fiat_p384_uint1 x141;
-  fiat_p384_addcarryx_u64(&x140, &x141, x139, x128, x104);
+  fiat_p384_addcarryx_u64(&x140, &x141, x139, x104, x128);
   uint64_t x142;
   fiat_p384_uint1 x143;
-  fiat_p384_addcarryx_u64(&x142, &x143, x141, x130, x106);
+  fiat_p384_addcarryx_u64(&x142, &x143, x141, x106, x130);
   uint64_t x144;
   fiat_p384_uint1 x145;
-  fiat_p384_addcarryx_u64(&x144, &x145, x143, x132, x108);
+  fiat_p384_addcarryx_u64(&x144, &x145, x143, x108, x132);
   uint64_t x146;
   fiat_p384_uint1 x147;
-  fiat_p384_addcarryx_u64(&x146, &x147, x97, 0x0, 0x0);
+  fiat_p384_addcarryx_u64(&x146, &x147, x133, x113, 0x0);
   uint64_t x148;
   fiat_p384_uint1 x149;
-  fiat_p384_addcarryx_u64(&x148, &x149, x109, 0x0, (fiat_p384_uint1)x146);
+  fiat_p384_addcarryx_u64(&x148, &x149, x97, 0x0, 0x0);
   uint64_t x150;
   fiat_p384_uint1 x151;
-  fiat_p384_addcarryx_u64(&x150, &x151, x133, 0x0, x113);
+  fiat_p384_addcarryx_u64(&x150, &x151, x109, (fiat_p384_uint1)x148, 0x0);
   uint64_t x152;
   fiat_p384_uint1 x153;
-  fiat_p384_addcarryx_u64(&x152, &x153, x145, x150, x148);
+  fiat_p384_addcarryx_u64(&x152, &x153, x145, x150, x146);
   uint64_t x154;
   fiat_p384_uint1 x155;
-  fiat_p384_addcarryx_u64(&x154, &x155, 0x0, (arg1[3]), x136);
+  fiat_p384_addcarryx_u64(&x154, &x155, 0x0, x136, (arg1[3]));
   uint64_t x156;
   fiat_p384_uint1 x157;
-  fiat_p384_addcarryx_u64(&x156, &x157, x155, 0x0, x138);
+  fiat_p384_addcarryx_u64(&x156, &x157, x155, x138, 0x0);
   uint64_t x158;
   fiat_p384_uint1 x159;
-  fiat_p384_addcarryx_u64(&x158, &x159, x157, 0x0, x140);
+  fiat_p384_addcarryx_u64(&x158, &x159, x157, x140, 0x0);
   uint64_t x160;
   fiat_p384_uint1 x161;
-  fiat_p384_addcarryx_u64(&x160, &x161, x159, 0x0, x142);
+  fiat_p384_addcarryx_u64(&x160, &x161, x159, x142, 0x0);
   uint64_t x162;
   fiat_p384_uint1 x163;
-  fiat_p384_addcarryx_u64(&x162, &x163, x161, 0x0, x144);
+  fiat_p384_addcarryx_u64(&x162, &x163, x161, x144, 0x0);
   uint64_t x164;
   fiat_p384_uint1 x165;
-  fiat_p384_addcarryx_u64(&x164, &x165, x163, 0x0, x152);
+  fiat_p384_addcarryx_u64(&x164, &x165, x163, x152, 0x0);
   uint64_t x166;
   uint64_t x167;
   fiat_p384_mulx_u64(&x166, &x167, x154, UINT64_C(0x100000001));
@@ -2105,67 +2105,67 @@ static void fiat_p384_from_montgomery(uint64_t out1[6], const uint64_t arg1[6])
   fiat_p384_mulx_u64(&x178, &x179, x166, UINT32_C(0xffffffff));
   uint64_t x180;
   fiat_p384_uint1 x181;
-  fiat_p384_addcarryx_u64(&x180, &x181, 0x0, x176, x179);
+  fiat_p384_addcarryx_u64(&x180, &x181, 0x0, x179, x176);
   uint64_t x182;
   fiat_p384_uint1 x183;
-  fiat_p384_addcarryx_u64(&x182, &x183, x181, x174, x177);
+  fiat_p384_addcarryx_u64(&x182, &x183, x181, x177, x174);
   uint64_t x184;
   fiat_p384_uint1 x185;
-  fiat_p384_addcarryx_u64(&x184, &x185, x183, x172, x175);
+  fiat_p384_addcarryx_u64(&x184, &x185, x183, x175, x172);
   uint64_t x186;
   fiat_p384_uint1 x187;
-  fiat_p384_addcarryx_u64(&x186, &x187, x185, x170, x173);
+  fiat_p384_addcarryx_u64(&x186, &x187, x185, x173, x170);
   uint64_t x188;
   fiat_p384_uint1 x189;
-  fiat_p384_addcarryx_u64(&x188, &x189, x187, x168, x171);
+  fiat_p384_addcarryx_u64(&x188, &x189, x187, x171, x168);
   uint64_t x190;
   fiat_p384_uint1 x191;
-  fiat_p384_addcarryx_u64(&x190, &x191, 0x0, x178, x154);
+  fiat_p384_addcarryx_u64(&x190, &x191, 0x0, x154, x178);
   uint64_t x192;
   fiat_p384_uint1 x193;
-  fiat_p384_addcarryx_u64(&x192, &x193, x191, x180, x156);
+  fiat_p384_addcarryx_u64(&x192, &x193, x191, x156, x180);
   uint64_t x194;
   fiat_p384_uint1 x195;
-  fiat_p384_addcarryx_u64(&x194, &x195, x193, x182, x158);
+  fiat_p384_addcarryx_u64(&x194, &x195, x193, x158, x182);
   uint64_t x196;
   fiat_p384_uint1 x197;
-  fiat_p384_addcarryx_u64(&x196, &x197, x195, x184, x160);
+  fiat_p384_addcarryx_u64(&x196, &x197, x195, x160, x184);
   uint64_t x198;
   fiat_p384_uint1 x199;
-  fiat_p384_addcarryx_u64(&x198, &x199, x197, x186, x162);
+  fiat_p384_addcarryx_u64(&x198, &x199, x197, x162, x186);
   uint64_t x200;
   fiat_p384_uint1 x201;
-  fiat_p384_addcarryx_u64(&x200, &x201, x199, x188, x164);
+  fiat_p384_addcarryx_u64(&x200, &x201, x199, x164, x188);
   uint64_t x202;
   fiat_p384_uint1 x203;
-  fiat_p384_addcarryx_u64(&x202, &x203, x153, 0x0, 0x0);
+  fiat_p384_addcarryx_u64(&x202, &x203, x189, x169, 0x0);
   uint64_t x204;
   fiat_p384_uint1 x205;
-  fiat_p384_addcarryx_u64(&x204, &x205, x165, 0x0, (fiat_p384_uint1)x202);
+  fiat_p384_addcarryx_u64(&x204, &x205, x153, 0x0, 0x0);
   uint64_t x206;
   fiat_p384_uint1 x207;
-  fiat_p384_addcarryx_u64(&x206, &x207, x189, 0x0, x169);
+  fiat_p384_addcarryx_u64(&x206, &x207, x165, (fiat_p384_uint1)x204, 0x0);
   uint64_t x208;
   fiat_p384_uint1 x209;
-  fiat_p384_addcarryx_u64(&x208, &x209, x201, x206, x204);
+  fiat_p384_addcarryx_u64(&x208, &x209, x201, x206, x202);
   uint64_t x210;
   fiat_p384_uint1 x211;
-  fiat_p384_addcarryx_u64(&x210, &x211, 0x0, (arg1[4]), x192);
+  fiat_p384_addcarryx_u64(&x210, &x211, 0x0, x192, (arg1[4]));
   uint64_t x212;
   fiat_p384_uint1 x213;
-  fiat_p384_addcarryx_u64(&x212, &x213, x211, 0x0, x194);
+  fiat_p384_addcarryx_u64(&x212, &x213, x211, x194, 0x0);
   uint64_t x214;
   fiat_p384_uint1 x215;
-  fiat_p384_addcarryx_u64(&x214, &x215, x213, 0x0, x196);
+  fiat_p384_addcarryx_u64(&x214, &x215, x213, x196, 0x0);
   uint64_t x216;
   fiat_p384_uint1 x217;
-  fiat_p384_addcarryx_u64(&x216, &x217, x215, 0x0, x198);
+  fiat_p384_addcarryx_u64(&x216, &x217, x215, x198, 0x0);
   uint64_t x218;
   fiat_p384_uint1 x219;
-  fiat_p384_addcarryx_u64(&x218, &x219, x217, 0x0, x200);
+  fiat_p384_addcarryx_u64(&x218, &x219, x217, x200, 0x0);
   uint64_t x220;
   fiat_p384_uint1 x221;
-  fiat_p384_addcarryx_u64(&x220, &x221, x219, 0x0, x208);
+  fiat_p384_addcarryx_u64(&x220, &x221, x219, x208, 0x0);
   uint64_t x222;
   uint64_t x223;
   fiat_p384_mulx_u64(&x222, &x223, x210, UINT64_C(0x100000001));
@@ -2189,67 +2189,67 @@ static void fiat_p384_from_montgomery(uint64_t out1[6], const uint64_t arg1[6])
   fiat_p384_mulx_u64(&x234, &x235, x222, UINT32_C(0xffffffff));
   uint64_t x236;
   fiat_p384_uint1 x237;
-  fiat_p384_addcarryx_u64(&x236, &x237, 0x0, x232, x235);
+  fiat_p384_addcarryx_u64(&x236, &x237, 0x0, x235, x232);
   uint64_t x238;
   fiat_p384_uint1 x239;
-  fiat_p384_addcarryx_u64(&x238, &x239, x237, x230, x233);
+  fiat_p384_addcarryx_u64(&x238, &x239, x237, x233, x230);
   uint64_t x240;
   fiat_p384_uint1 x241;
-  fiat_p384_addcarryx_u64(&x240, &x241, x239, x228, x231);
+  fiat_p384_addcarryx_u64(&x240, &x241, x239, x231, x228);
   uint64_t x242;
   fiat_p384_uint1 x243;
-  fiat_p384_addcarryx_u64(&x242, &x243, x241, x226, x229);
+  fiat_p384_addcarryx_u64(&x242, &x243, x241, x229, x226);
   uint64_t x244;
   fiat_p384_uint1 x245;
-  fiat_p384_addcarryx_u64(&x244, &x245, x243, x224, x227);
+  fiat_p384_addcarryx_u64(&x244, &x245, x243, x227, x224);
   uint64_t x246;
   fiat_p384_uint1 x247;
-  fiat_p384_addcarryx_u64(&x246, &x247, 0x0, x234, x210);
+  fiat_p384_addcarryx_u64(&x246, &x247, 0x0, x210, x234);
   uint64_t x248;
   fiat_p384_uint1 x249;
-  fiat_p384_addcarryx_u64(&x248, &x249, x247, x236, x212);
+  fiat_p384_addcarryx_u64(&x248, &x249, x247, x212, x236);
   uint64_t x250;
   fiat_p384_uint1 x251;
-  fiat_p384_addcarryx_u64(&x250, &x251, x249, x238, x214);
+  fiat_p384_addcarryx_u64(&x250, &x251, x249, x214, x238);
   uint64_t x252;
   fiat_p384_uint1 x253;
-  fiat_p384_addcarryx_u64(&x252, &x253, x251, x240, x216);
+  fiat_p384_addcarryx_u64(&x252, &x253, x251, x216, x240);
   uint64_t x254;
   fiat_p384_uint1 x255;
-  fiat_p384_addcarryx_u64(&x254, &x255, x253, x242, x218);
+  fiat_p384_addcarryx_u64(&x254, &x255, x253, x218, x242);
   uint64_t x256;
   fiat_p384_uint1 x257;
-  fiat_p384_addcarryx_u64(&x256, &x257, x255, x244, x220);
+  fiat_p384_addcarryx_u64(&x256, &x257, x255, x220, x244);
   uint64_t x258;
   fiat_p384_uint1 x259;
-  fiat_p384_addcarryx_u64(&x258, &x259, x209, 0x0, 0x0);
+  fiat_p384_addcarryx_u64(&x258, &x259, x245, x225, 0x0);
   uint64_t x260;
   fiat_p384_uint1 x261;
-  fiat_p384_addcarryx_u64(&x260, &x261, x221, 0x0, (fiat_p384_uint1)x258);
+  fiat_p384_addcarryx_u64(&x260, &x261, x209, 0x0, 0x0);
   uint64_t x262;
   fiat_p384_uint1 x263;
-  fiat_p384_addcarryx_u64(&x262, &x263, x245, 0x0, x225);
+  fiat_p384_addcarryx_u64(&x262, &x263, x221, (fiat_p384_uint1)x260, 0x0);
   uint64_t x264;
   fiat_p384_uint1 x265;
-  fiat_p384_addcarryx_u64(&x264, &x265, x257, x262, x260);
+  fiat_p384_addcarryx_u64(&x264, &x265, x257, x262, x258);
   uint64_t x266;
   fiat_p384_uint1 x267;
-  fiat_p384_addcarryx_u64(&x266, &x267, 0x0, (arg1[5]), x248);
+  fiat_p384_addcarryx_u64(&x266, &x267, 0x0, x248, (arg1[5]));
   uint64_t x268;
   fiat_p384_uint1 x269;
-  fiat_p384_addcarryx_u64(&x268, &x269, x267, 0x0, x250);
+  fiat_p384_addcarryx_u64(&x268, &x269, x267, x250, 0x0);
   uint64_t x270;
   fiat_p384_uint1 x271;
-  fiat_p384_addcarryx_u64(&x270, &x271, x269, 0x0, x252);
+  fiat_p384_addcarryx_u64(&x270, &x271, x269, x252, 0x0);
   uint64_t x272;
   fiat_p384_uint1 x273;
-  fiat_p384_addcarryx_u64(&x272, &x273, x271, 0x0, x254);
+  fiat_p384_addcarryx_u64(&x272, &x273, x271, x254, 0x0);
   uint64_t x274;
   fiat_p384_uint1 x275;
-  fiat_p384_addcarryx_u64(&x274, &x275, x273, 0x0, x256);
+  fiat_p384_addcarryx_u64(&x274, &x275, x273, x256, 0x0);
   uint64_t x276;
   fiat_p384_uint1 x277;
-  fiat_p384_addcarryx_u64(&x276, &x277, x275, 0x0, x264);
+  fiat_p384_addcarryx_u64(&x276, &x277, x275, x264, 0x0);
   uint64_t x278;
   uint64_t x279;
   fiat_p384_mulx_u64(&x278, &x279, x266, UINT64_C(0x100000001));
@@ -2273,49 +2273,49 @@ static void fiat_p384_from_montgomery(uint64_t out1[6], const uint64_t arg1[6])
   fiat_p384_mulx_u64(&x290, &x291, x278, UINT32_C(0xffffffff));
   uint64_t x292;
   fiat_p384_uint1 x293;
-  fiat_p384_addcarryx_u64(&x292, &x293, 0x0, x288, x291);
+  fiat_p384_addcarryx_u64(&x292, &x293, 0x0, x291, x288);
   uint64_t x294;
   fiat_p384_uint1 x295;
-  fiat_p384_addcarryx_u64(&x294, &x295, x293, x286, x289);
+  fiat_p384_addcarryx_u64(&x294, &x295, x293, x289, x286);
   uint64_t x296;
   fiat_p384_uint1 x297;
-  fiat_p384_addcarryx_u64(&x296, &x297, x295, x284, x287);
+  fiat_p384_addcarryx_u64(&x296, &x297, x295, x287, x284);
   uint64_t x298;
   fiat_p384_uint1 x299;
-  fiat_p384_addcarryx_u64(&x298, &x299, x297, x282, x285);
+  fiat_p384_addcarryx_u64(&x298, &x299, x297, x285, x282);
   uint64_t x300;
   fiat_p384_uint1 x301;
-  fiat_p384_addcarryx_u64(&x300, &x301, x299, x280, x283);
+  fiat_p384_addcarryx_u64(&x300, &x301, x299, x283, x280);
   uint64_t x302;
   fiat_p384_uint1 x303;
-  fiat_p384_addcarryx_u64(&x302, &x303, 0x0, x290, x266);
+  fiat_p384_addcarryx_u64(&x302, &x303, 0x0, x266, x290);
   uint64_t x304;
   fiat_p384_uint1 x305;
-  fiat_p384_addcarryx_u64(&x304, &x305, x303, x292, x268);
+  fiat_p384_addcarryx_u64(&x304, &x305, x303, x268, x292);
   uint64_t x306;
   fiat_p384_uint1 x307;
-  fiat_p384_addcarryx_u64(&x306, &x307, x305, x294, x270);
+  fiat_p384_addcarryx_u64(&x306, &x307, x305, x270, x294);
   uint64_t x308;
   fiat_p384_uint1 x309;
-  fiat_p384_addcarryx_u64(&x308, &x309, x307, x296, x272);
+  fiat_p384_addcarryx_u64(&x308, &x309, x307, x272, x296);
   uint64_t x310;
   fiat_p384_uint1 x311;
-  fiat_p384_addcarryx_u64(&x310, &x311, x309, x298, x274);
+  fiat_p384_addcarryx_u64(&x310, &x311, x309, x274, x298);
   uint64_t x312;
   fiat_p384_uint1 x313;
-  fiat_p384_addcarryx_u64(&x312, &x313, x311, x300, x276);
+  fiat_p384_addcarryx_u64(&x312, &x313, x311, x276, x300);
   uint64_t x314;
   fiat_p384_uint1 x315;
-  fiat_p384_addcarryx_u64(&x314, &x315, x265, 0x0, 0x0);
+  fiat_p384_addcarryx_u64(&x314, &x315, x301, x281, 0x0);
   uint64_t x316;
   fiat_p384_uint1 x317;
-  fiat_p384_addcarryx_u64(&x316, &x317, x277, 0x0, (fiat_p384_uint1)x314);
+  fiat_p384_addcarryx_u64(&x316, &x317, x265, 0x0, 0x0);
   uint64_t x318;
   fiat_p384_uint1 x319;
-  fiat_p384_addcarryx_u64(&x318, &x319, x301, 0x0, x281);
+  fiat_p384_addcarryx_u64(&x318, &x319, x277, (fiat_p384_uint1)x316, 0x0);
   uint64_t x320;
   fiat_p384_uint1 x321;
-  fiat_p384_addcarryx_u64(&x320, &x321, x313, x318, x316);
+  fiat_p384_addcarryx_u64(&x320, &x321, x313, x318, x314);
   uint64_t x322;
   fiat_p384_uint1 x323;
   fiat_p384_subborrowx_u64(&x322, &x323, 0x0, x304, UINT32_C(0xffffffff));