Add a rewrite rule to collapse constant casts

If, e.g., we know from bounds analysis that the result of an operation
fits in the range r[0~>0], we now just replace it with the literal
constant.

Fixes #493

After     | File Name                                    | Before    || Change    | % Change
--------------------------------------------------------------------------------------------
21m22.14s | Total                                        | 21m22.79s || -0m00.65s | -0.05%
--------------------------------------------------------------------------------------------
4m09.97s  | PushButtonSynthesis.vo                       | 4m10.56s  || -0m00.59s | -0.23%
3m09.12s  | p384_32.c                                    | 3m08.91s  || +0m00.21s | +0.11%
2m05.94s  | Rewriter.vo                                  | 2m06.30s  || -0m00.35s | -0.28%
1m56.58s  | RewriterWf2.vo                               | 1m56.09s  || +0m00.48s | +0.42%
1m52.39s  | RewriterRulesGood.vo                         | 1m52.04s  || +0m00.35s | +0.31%
1m46.01s  | RewriterRulesInterpGood.vo                   | 1m45.79s  || +0m00.21s | +0.20%
0m46.44s  | RewriterInterpProofs1.vo                     | 0m46.47s  || -0m00.03s | -0.06%
0m44.96s  | ExtractionHaskell/word_by_word_montgomery    | 0m45.59s  || -0m00.63s | -1.38%
0m39.18s  | p521_32.c                                    | 0m39.33s  || -0m00.14s | -0.38%
0m32.41s  | p521_64.c                                    | 0m32.54s  || -0m00.13s | -0.39%
0m30.87s  | ExtractionHaskell/unsaturated_solinas        | 0m30.67s  || +0m00.19s | +0.65%
0m24.32s  | ExtractionHaskell/saturated_solinas          | 0m24.44s  || -0m00.12s | -0.49%
0m23.59s  | RewriterWf1.vo                               | 0m24.10s  || -0m00.51s | -2.11%
0m17.01s  | ExtractionOCaml/word_by_word_montgomery      | 0m17.14s  || -0m00.12s | -0.75%
0m13.48s  | secp256k1_32.c                               | 0m13.30s  || +0m00.17s | +1.35%
0m13.11s  | p256_32.c                                    | 0m13.37s  || -0m00.25s | -1.94%
0m11.34s  | p484_64.c                                    | 0m11.34s  || +0m00.00s | +0.00%
0m10.78s  | ExtractionOCaml/unsaturated_solinas          | 0m10.79s  || -0m00.00s | -0.09%
0m10.27s  | ExtractionOCaml/word_by_word_montgomery.ml   | 0m10.06s  || +0m00.20s | +2.08%
0m08.11s  | ExtractionOCaml/saturated_solinas            | 0m07.92s  || +0m00.18s | +2.39%
0m06.92s  | ExtractionOCaml/unsaturated_solinas.ml       | 0m07.02s  || -0m00.09s | -1.42%
0m06.18s  | ExtractionHaskell/word_by_word_montgomery.hs | 0m06.28s  || -0m00.10s | -1.59%
0m06.13s  | BoundsPipeline.vo                            | 0m05.98s  || +0m00.14s | +2.50%
0m05.90s  | p224_32.c                                    | 0m05.92s  || -0m00.01s | -0.33%
0m05.29s  | p384_64.c                                    | 0m05.33s  || -0m00.04s | -0.75%
0m05.17s  | ExtractionOCaml/saturated_solinas.ml         | 0m05.20s  || -0m00.03s | -0.57%
0m04.91s  | ExtractionHaskell/unsaturated_solinas.hs     | 0m04.93s  || -0m00.01s | -0.40%
0m04.06s  | ExtractionHaskell/saturated_solinas.hs       | 0m04.00s  || +0m00.05s | +1.49%
0m02.21s  | curve25519_32.c                              | 0m02.22s  || -0m00.01s | -0.45%
0m01.52s  | curve25519_64.c                              | 0m01.50s  || +0m00.02s | +1.33%
0m01.38s  | CLI.vo                                       | 0m01.42s  || -0m00.04s | -2.81%
0m01.14s  | RewriterProofs.vo                            | 0m01.13s  || +0m00.01s | +0.88%
0m01.14s  | StandaloneOCamlMain.vo                       | 0m00.96s  || +0m00.17s | +18.74%
0m01.12s  | StandaloneHaskellMain.vo                     | 0m01.03s  || +0m00.09s | +8.73%
0m01.12s  | secp256k1_64.c                               | 0m01.00s  || +0m00.12s | +12.00%
0m01.05s  | p256_64.c                                    | 0m00.98s  || +0m00.07s | +7.14%
0m01.03s  | p224_64.c                                    | 0m01.15s  || -0m00.11s | -10.43%

1 files changed, 289 insertions, 304 deletions

diff --git a/p224_32.c b/p224_32.c
index 65d26dff1..eda2b7e5f 100644
--- a/p224_32.c
+++ b/p224_32.c
@@ -2100,475 +2100,472 @@ static void fiat_p224_from_montgomery(uint32_t out1[7], const uint32_t arg1[7])
   fiat_p224_addcarryx_u32(&x38, &x39, x37, x26, x29);
   uint32_t x40;
   fiat_p224_uint1 x41;
-  fiat_p224_addcarryx_u32(&x40, &x41, x23, 0x0, 0x0);
+  fiat_p224_addcarryx_u32(&x40, &x41, 0x0, x32, x12);
   uint32_t x42;
   fiat_p224_uint1 x43;
-  fiat_p224_addcarryx_u32(&x42, &x43, 0x0, x24, x22);
+  fiat_p224_addcarryx_u32(&x42, &x43, x41, x34, x14);
   uint32_t x44;
   fiat_p224_uint1 x45;
-  fiat_p224_addcarryx_u32(&x44, &x45, x43, 0x0, (fiat_p224_uint1)x40);
+  fiat_p224_addcarryx_u32(&x44, &x45, x43, x36, x16);
   uint32_t x46;
   fiat_p224_uint1 x47;
-  fiat_p224_addcarryx_u32(&x46, &x47, x45, 0x0, x10);
+  fiat_p224_addcarryx_u32(&x46, &x47, x17, 0x0, x5);
   uint32_t x48;
   fiat_p224_uint1 x49;
-  fiat_p224_addcarryx_u32(&x48, &x49, x47, x32, x12);
+  fiat_p224_addcarryx_u32(&x48, &x49, x45, x38, x46);
   uint32_t x50;
   fiat_p224_uint1 x51;
-  fiat_p224_addcarryx_u32(&x50, &x51, x49, x34, x14);
+  fiat_p224_addcarryx_u32(&x50, &x51, x39, 0x0, x27);
   uint32_t x52;
   fiat_p224_uint1 x53;
-  fiat_p224_addcarryx_u32(&x52, &x53, x51, x36, x16);
+  fiat_p224_addcarryx_u32(&x52, &x53, x49, x50, 0x0);
   uint32_t x54;
   fiat_p224_uint1 x55;
-  fiat_p224_addcarryx_u32(&x54, &x55, x17, 0x0, x5);
+  fiat_p224_addcarryx_u32(&x54, &x55, x23, 0x0, 0x0);
   uint32_t x56;
   fiat_p224_uint1 x57;
-  fiat_p224_addcarryx_u32(&x56, &x57, x53, x38, x54);
+  fiat_p224_addcarryx_u32(&x56, &x57, 0x0, x24, x22);
   uint32_t x58;
   fiat_p224_uint1 x59;
-  fiat_p224_addcarryx_u32(&x58, &x59, x39, 0x0, x27);
+  fiat_p224_addcarryx_u32(&x58, &x59, x57, 0x0, (fiat_p224_uint1)x54);
   uint32_t x60;
   fiat_p224_uint1 x61;
-  fiat_p224_addcarryx_u32(&x60, &x61, x57, x58, 0x0);
+  fiat_p224_addcarryx_u32(&x60, &x61, 0x0, (arg1[2]), x58);
   uint32_t x62;
   fiat_p224_uint1 x63;
-  fiat_p224_addcarryx_u32(&x62, &x63, 0x0, (arg1[2]), x44);
+  fiat_p224_addcarryx_u32(&x62, &x63, x61, 0x0, x10);
   uint32_t x64;
   fiat_p224_uint1 x65;
-  fiat_p224_addcarryx_u32(&x64, &x65, x63, 0x0, x46);
+  fiat_p224_addcarryx_u32(&x64, &x65, x63, 0x0, x40);
   uint32_t x66;
   fiat_p224_uint1 x67;
-  fiat_p224_addcarryx_u32(&x66, &x67, x65, 0x0, x48);
+  fiat_p224_addcarryx_u32(&x66, &x67, x65, 0x0, x42);
   uint32_t x68;
   fiat_p224_uint1 x69;
-  fiat_p224_addcarryx_u32(&x68, &x69, x67, 0x0, x50);
+  fiat_p224_addcarryx_u32(&x68, &x69, x67, 0x0, x44);
   uint32_t x70;
   fiat_p224_uint1 x71;
-  fiat_p224_addcarryx_u32(&x70, &x71, x69, 0x0, x52);
+  fiat_p224_addcarryx_u32(&x70, &x71, x69, 0x0, x48);
   uint32_t x72;
   fiat_p224_uint1 x73;
-  fiat_p224_addcarryx_u32(&x72, &x73, x71, 0x0, x56);
+  fiat_p224_addcarryx_u32(&x72, &x73, x71, 0x0, x52);
   uint32_t x74;
-  fiat_p224_uint1 x75;
-  fiat_p224_addcarryx_u32(&x74, &x75, x73, 0x0, x60);
+  uint32_t x75;
+  fiat_p224_mulx_u32(&x74, &x75, x60, UINT32_C(0xffffffff));
   uint32_t x76;
-  fiat_p224_uint1 x77;
-  fiat_p224_addcarryx_u32(&x76, &x77, x61, 0x0, 0x0);
+  uint32_t x77;
+  fiat_p224_mulx_u32(&x76, &x77, x74, UINT32_C(0xffffffff));
   uint32_t x78;
-  fiat_p224_uint1 x79;
-  fiat_p224_addcarryx_u32(&x78, &x79, x75, 0x0, (fiat_p224_uint1)x76);
+  uint32_t x79;
+  fiat_p224_mulx_u32(&x78, &x79, x74, UINT32_C(0xffffffff));
   uint32_t x80;
   uint32_t x81;
-  fiat_p224_mulx_u32(&x80, &x81, x62, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x80, &x81, x74, UINT32_C(0xffffffff));
   uint32_t x82;
   uint32_t x83;
-  fiat_p224_mulx_u32(&x82, &x83, x80, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x82, &x83, x74, UINT32_C(0xffffffff));
   uint32_t x84;
-  uint32_t x85;
-  fiat_p224_mulx_u32(&x84, &x85, x80, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x85;
+  fiat_p224_addcarryx_u32(&x84, &x85, 0x0, x80, x83);
   uint32_t x86;
-  uint32_t x87;
-  fiat_p224_mulx_u32(&x86, &x87, x80, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x87;
+  fiat_p224_addcarryx_u32(&x86, &x87, x85, x78, x81);
   uint32_t x88;
-  uint32_t x89;
-  fiat_p224_mulx_u32(&x88, &x89, x80, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x89;
+  fiat_p224_addcarryx_u32(&x88, &x89, x87, x76, x79);
   uint32_t x90;
   fiat_p224_uint1 x91;
-  fiat_p224_addcarryx_u32(&x90, &x91, 0x0, x86, x89);
+  fiat_p224_addcarryx_u32(&x90, &x91, 0x0, x74, x60);
   uint32_t x92;
   fiat_p224_uint1 x93;
-  fiat_p224_addcarryx_u32(&x92, &x93, x91, x84, x87);
+  fiat_p224_addcarryx_u32(&x92, &x93, x91, 0x0, x62);
   uint32_t x94;
   fiat_p224_uint1 x95;
-  fiat_p224_addcarryx_u32(&x94, &x95, x93, x82, x85);
+  fiat_p224_addcarryx_u32(&x94, &x95, x93, 0x0, x64);
   uint32_t x96;
   fiat_p224_uint1 x97;
-  fiat_p224_addcarryx_u32(&x96, &x97, 0x0, x80, x62);
+  fiat_p224_addcarryx_u32(&x96, &x97, x95, x82, x66);
   uint32_t x98;
   fiat_p224_uint1 x99;
-  fiat_p224_addcarryx_u32(&x98, &x99, x97, 0x0, x64);
+  fiat_p224_addcarryx_u32(&x98, &x99, x97, x84, x68);
   uint32_t x100;
   fiat_p224_uint1 x101;
-  fiat_p224_addcarryx_u32(&x100, &x101, x99, 0x0, x66);
+  fiat_p224_addcarryx_u32(&x100, &x101, x99, x86, x70);
   uint32_t x102;
   fiat_p224_uint1 x103;
-  fiat_p224_addcarryx_u32(&x102, &x103, x101, x88, x68);
+  fiat_p224_addcarryx_u32(&x102, &x103, x101, x88, x72);
   uint32_t x104;
   fiat_p224_uint1 x105;
-  fiat_p224_addcarryx_u32(&x104, &x105, x103, x90, x70);
+  fiat_p224_addcarryx_u32(&x104, &x105, x53, 0x0, 0x0);
   uint32_t x106;
   fiat_p224_uint1 x107;
-  fiat_p224_addcarryx_u32(&x106, &x107, x105, x92, x72);
+  fiat_p224_addcarryx_u32(&x106, &x107, x73, 0x0, (fiat_p224_uint1)x104);
   uint32_t x108;
   fiat_p224_uint1 x109;
-  fiat_p224_addcarryx_u32(&x108, &x109, x107, x94, x74);
+  fiat_p224_addcarryx_u32(&x108, &x109, x89, 0x0, x77);
   uint32_t x110;
   fiat_p224_uint1 x111;
-  fiat_p224_addcarryx_u32(&x110, &x111, x95, 0x0, x83);
+  fiat_p224_addcarryx_u32(&x110, &x111, x103, x108, x106);
   uint32_t x112;
   fiat_p224_uint1 x113;
-  fiat_p224_addcarryx_u32(&x112, &x113, x109, x110, x78);
+  fiat_p224_addcarryx_u32(&x112, &x113, 0x0, (arg1[3]), x92);
   uint32_t x114;
   fiat_p224_uint1 x115;
-  fiat_p224_addcarryx_u32(&x114, &x115, 0x0, (arg1[3]), x98);
+  fiat_p224_addcarryx_u32(&x114, &x115, x113, 0x0, x94);
   uint32_t x116;
   fiat_p224_uint1 x117;
-  fiat_p224_addcarryx_u32(&x116, &x117, x115, 0x0, x100);
+  fiat_p224_addcarryx_u32(&x116, &x117, x115, 0x0, x96);
   uint32_t x118;
   fiat_p224_uint1 x119;
-  fiat_p224_addcarryx_u32(&x118, &x119, x117, 0x0, x102);
+  fiat_p224_addcarryx_u32(&x118, &x119, x117, 0x0, x98);
   uint32_t x120;
   fiat_p224_uint1 x121;
-  fiat_p224_addcarryx_u32(&x120, &x121, x119, 0x0, x104);
+  fiat_p224_addcarryx_u32(&x120, &x121, x119, 0x0, x100);
   uint32_t x122;
   fiat_p224_uint1 x123;
-  fiat_p224_addcarryx_u32(&x122, &x123, x121, 0x0, x106);
+  fiat_p224_addcarryx_u32(&x122, &x123, x121, 0x0, x102);
   uint32_t x124;
   fiat_p224_uint1 x125;
-  fiat_p224_addcarryx_u32(&x124, &x125, x123, 0x0, x108);
+  fiat_p224_addcarryx_u32(&x124, &x125, x123, 0x0, x110);
   uint32_t x126;
-  fiat_p224_uint1 x127;
-  fiat_p224_addcarryx_u32(&x126, &x127, x125, 0x0, x112);
+  uint32_t x127;
+  fiat_p224_mulx_u32(&x126, &x127, x112, UINT32_C(0xffffffff));
   uint32_t x128;
-  fiat_p224_uint1 x129;
-  fiat_p224_addcarryx_u32(&x128, &x129, x113, 0x0, x79);
+  uint32_t x129;
+  fiat_p224_mulx_u32(&x128, &x129, x126, UINT32_C(0xffffffff));
   uint32_t x130;
-  fiat_p224_uint1 x131;
-  fiat_p224_addcarryx_u32(&x130, &x131, x127, 0x0, (fiat_p224_uint1)x128);
+  uint32_t x131;
+  fiat_p224_mulx_u32(&x130, &x131, x126, UINT32_C(0xffffffff));
   uint32_t x132;
   uint32_t x133;
-  fiat_p224_mulx_u32(&x132, &x133, x114, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x132, &x133, x126, UINT32_C(0xffffffff));
   uint32_t x134;
   uint32_t x135;
-  fiat_p224_mulx_u32(&x134, &x135, x132, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x134, &x135, x126, UINT32_C(0xffffffff));
   uint32_t x136;
-  uint32_t x137;
-  fiat_p224_mulx_u32(&x136, &x137, x132, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x137;
+  fiat_p224_addcarryx_u32(&x136, &x137, 0x0, x132, x135);
   uint32_t x138;
-  uint32_t x139;
-  fiat_p224_mulx_u32(&x138, &x139, x132, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x139;
+  fiat_p224_addcarryx_u32(&x138, &x139, x137, x130, x133);
   uint32_t x140;
-  uint32_t x141;
-  fiat_p224_mulx_u32(&x140, &x141, x132, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x141;
+  fiat_p224_addcarryx_u32(&x140, &x141, x139, x128, x131);
   uint32_t x142;
   fiat_p224_uint1 x143;
-  fiat_p224_addcarryx_u32(&x142, &x143, 0x0, x138, x141);
+  fiat_p224_addcarryx_u32(&x142, &x143, 0x0, x126, x112);
   uint32_t x144;
   fiat_p224_uint1 x145;
-  fiat_p224_addcarryx_u32(&x144, &x145, x143, x136, x139);
+  fiat_p224_addcarryx_u32(&x144, &x145, x143, 0x0, x114);
   uint32_t x146;
   fiat_p224_uint1 x147;
-  fiat_p224_addcarryx_u32(&x146, &x147, x145, x134, x137);
+  fiat_p224_addcarryx_u32(&x146, &x147, x145, 0x0, x116);
   uint32_t x148;
   fiat_p224_uint1 x149;
-  fiat_p224_addcarryx_u32(&x148, &x149, 0x0, x132, x114);
+  fiat_p224_addcarryx_u32(&x148, &x149, x147, x134, x118);
   uint32_t x150;
   fiat_p224_uint1 x151;
-  fiat_p224_addcarryx_u32(&x150, &x151, x149, 0x0, x116);
+  fiat_p224_addcarryx_u32(&x150, &x151, x149, x136, x120);
   uint32_t x152;
   fiat_p224_uint1 x153;
-  fiat_p224_addcarryx_u32(&x152, &x153, x151, 0x0, x118);
+  fiat_p224_addcarryx_u32(&x152, &x153, x151, x138, x122);
   uint32_t x154;
   fiat_p224_uint1 x155;
-  fiat_p224_addcarryx_u32(&x154, &x155, x153, x140, x120);
+  fiat_p224_addcarryx_u32(&x154, &x155, x153, x140, x124);
   uint32_t x156;
   fiat_p224_uint1 x157;
-  fiat_p224_addcarryx_u32(&x156, &x157, x155, x142, x122);
+  fiat_p224_addcarryx_u32(&x156, &x157, x111, 0x0, 0x0);
   uint32_t x158;
   fiat_p224_uint1 x159;
-  fiat_p224_addcarryx_u32(&x158, &x159, x157, x144, x124);
+  fiat_p224_addcarryx_u32(&x158, &x159, x125, 0x0, (fiat_p224_uint1)x156);
   uint32_t x160;
   fiat_p224_uint1 x161;
-  fiat_p224_addcarryx_u32(&x160, &x161, x159, x146, x126);
+  fiat_p224_addcarryx_u32(&x160, &x161, x141, 0x0, x129);
   uint32_t x162;
   fiat_p224_uint1 x163;
-  fiat_p224_addcarryx_u32(&x162, &x163, x147, 0x0, x135);
+  fiat_p224_addcarryx_u32(&x162, &x163, x155, x160, x158);
   uint32_t x164;
   fiat_p224_uint1 x165;
-  fiat_p224_addcarryx_u32(&x164, &x165, x161, x162, x130);
+  fiat_p224_addcarryx_u32(&x164, &x165, 0x0, (arg1[4]), x144);
   uint32_t x166;
   fiat_p224_uint1 x167;
-  fiat_p224_addcarryx_u32(&x166, &x167, 0x0, (arg1[4]), x150);
+  fiat_p224_addcarryx_u32(&x166, &x167, x165, 0x0, x146);
   uint32_t x168;
   fiat_p224_uint1 x169;
-  fiat_p224_addcarryx_u32(&x168, &x169, x167, 0x0, x152);
+  fiat_p224_addcarryx_u32(&x168, &x169, x167, 0x0, x148);
   uint32_t x170;
   fiat_p224_uint1 x171;
-  fiat_p224_addcarryx_u32(&x170, &x171, x169, 0x0, x154);
+  fiat_p224_addcarryx_u32(&x170, &x171, x169, 0x0, x150);
   uint32_t x172;
   fiat_p224_uint1 x173;
-  fiat_p224_addcarryx_u32(&x172, &x173, x171, 0x0, x156);
+  fiat_p224_addcarryx_u32(&x172, &x173, x171, 0x0, x152);
   uint32_t x174;
   fiat_p224_uint1 x175;
-  fiat_p224_addcarryx_u32(&x174, &x175, x173, 0x0, x158);
+  fiat_p224_addcarryx_u32(&x174, &x175, x173, 0x0, x154);
   uint32_t x176;
   fiat_p224_uint1 x177;
-  fiat_p224_addcarryx_u32(&x176, &x177, x175, 0x0, x160);
+  fiat_p224_addcarryx_u32(&x176, &x177, x175, 0x0, x162);
   uint32_t x178;
-  fiat_p224_uint1 x179;
-  fiat_p224_addcarryx_u32(&x178, &x179, x177, 0x0, x164);
+  uint32_t x179;
+  fiat_p224_mulx_u32(&x178, &x179, x164, UINT32_C(0xffffffff));
   uint32_t x180;
-  fiat_p224_uint1 x181;
-  fiat_p224_addcarryx_u32(&x180, &x181, x165, 0x0, x131);
+  uint32_t x181;
+  fiat_p224_mulx_u32(&x180, &x181, x178, UINT32_C(0xffffffff));
   uint32_t x182;
-  fiat_p224_uint1 x183;
-  fiat_p224_addcarryx_u32(&x182, &x183, x179, 0x0, (fiat_p224_uint1)x180);
+  uint32_t x183;
+  fiat_p224_mulx_u32(&x182, &x183, x178, UINT32_C(0xffffffff));
   uint32_t x184;
   uint32_t x185;
-  fiat_p224_mulx_u32(&x184, &x185, x166, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x184, &x185, x178, UINT32_C(0xffffffff));
   uint32_t x186;
   uint32_t x187;
-  fiat_p224_mulx_u32(&x186, &x187, x184, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x186, &x187, x178, UINT32_C(0xffffffff));
   uint32_t x188;
-  uint32_t x189;
-  fiat_p224_mulx_u32(&x188, &x189, x184, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x189;
+  fiat_p224_addcarryx_u32(&x188, &x189, 0x0, x184, x187);
   uint32_t x190;
-  uint32_t x191;
-  fiat_p224_mulx_u32(&x190, &x191, x184, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x191;
+  fiat_p224_addcarryx_u32(&x190, &x191, x189, x182, x185);
   uint32_t x192;
-  uint32_t x193;
-  fiat_p224_mulx_u32(&x192, &x193, x184, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x193;
+  fiat_p224_addcarryx_u32(&x192, &x193, x191, x180, x183);
   uint32_t x194;
   fiat_p224_uint1 x195;
-  fiat_p224_addcarryx_u32(&x194, &x195, 0x0, x190, x193);
+  fiat_p224_addcarryx_u32(&x194, &x195, 0x0, x178, x164);
   uint32_t x196;
   fiat_p224_uint1 x197;
-  fiat_p224_addcarryx_u32(&x196, &x197, x195, x188, x191);
+  fiat_p224_addcarryx_u32(&x196, &x197, x195, 0x0, x166);
   uint32_t x198;
   fiat_p224_uint1 x199;
-  fiat_p224_addcarryx_u32(&x198, &x199, x197, x186, x189);
+  fiat_p224_addcarryx_u32(&x198, &x199, x197, 0x0, x168);
   uint32_t x200;
   fiat_p224_uint1 x201;
-  fiat_p224_addcarryx_u32(&x200, &x201, 0x0, x184, x166);
+  fiat_p224_addcarryx_u32(&x200, &x201, x199, x186, x170);
   uint32_t x202;
   fiat_p224_uint1 x203;
-  fiat_p224_addcarryx_u32(&x202, &x203, x201, 0x0, x168);
+  fiat_p224_addcarryx_u32(&x202, &x203, x201, x188, x172);
   uint32_t x204;
   fiat_p224_uint1 x205;
-  fiat_p224_addcarryx_u32(&x204, &x205, x203, 0x0, x170);
+  fiat_p224_addcarryx_u32(&x204, &x205, x203, x190, x174);
   uint32_t x206;
   fiat_p224_uint1 x207;
-  fiat_p224_addcarryx_u32(&x206, &x207, x205, x192, x172);
+  fiat_p224_addcarryx_u32(&x206, &x207, x205, x192, x176);
   uint32_t x208;
   fiat_p224_uint1 x209;
-  fiat_p224_addcarryx_u32(&x208, &x209, x207, x194, x174);
+  fiat_p224_addcarryx_u32(&x208, &x209, x163, 0x0, 0x0);
   uint32_t x210;
   fiat_p224_uint1 x211;
-  fiat_p224_addcarryx_u32(&x210, &x211, x209, x196, x176);
+  fiat_p224_addcarryx_u32(&x210, &x211, x177, 0x0, (fiat_p224_uint1)x208);
   uint32_t x212;
   fiat_p224_uint1 x213;
-  fiat_p224_addcarryx_u32(&x212, &x213, x211, x198, x178);
+  fiat_p224_addcarryx_u32(&x212, &x213, x193, 0x0, x181);
   uint32_t x214;
   fiat_p224_uint1 x215;
-  fiat_p224_addcarryx_u32(&x214, &x215, x199, 0x0, x187);
+  fiat_p224_addcarryx_u32(&x214, &x215, x207, x212, x210);
   uint32_t x216;
   fiat_p224_uint1 x217;
-  fiat_p224_addcarryx_u32(&x216, &x217, x213, x214, x182);
+  fiat_p224_addcarryx_u32(&x216, &x217, 0x0, (arg1[5]), x196);
   uint32_t x218;
   fiat_p224_uint1 x219;
-  fiat_p224_addcarryx_u32(&x218, &x219, 0x0, (arg1[5]), x202);
+  fiat_p224_addcarryx_u32(&x218, &x219, x217, 0x0, x198);
   uint32_t x220;
   fiat_p224_uint1 x221;
-  fiat_p224_addcarryx_u32(&x220, &x221, x219, 0x0, x204);
+  fiat_p224_addcarryx_u32(&x220, &x221, x219, 0x0, x200);
   uint32_t x222;
   fiat_p224_uint1 x223;
-  fiat_p224_addcarryx_u32(&x222, &x223, x221, 0x0, x206);
+  fiat_p224_addcarryx_u32(&x222, &x223, x221, 0x0, x202);
   uint32_t x224;
   fiat_p224_uint1 x225;
-  fiat_p224_addcarryx_u32(&x224, &x225, x223, 0x0, x208);
+  fiat_p224_addcarryx_u32(&x224, &x225, x223, 0x0, x204);
   uint32_t x226;
   fiat_p224_uint1 x227;
-  fiat_p224_addcarryx_u32(&x226, &x227, x225, 0x0, x210);
+  fiat_p224_addcarryx_u32(&x226, &x227, x225, 0x0, x206);
   uint32_t x228;
   fiat_p224_uint1 x229;
-  fiat_p224_addcarryx_u32(&x228, &x229, x227, 0x0, x212);
+  fiat_p224_addcarryx_u32(&x228, &x229, x227, 0x0, x214);
   uint32_t x230;
-  fiat_p224_uint1 x231;
-  fiat_p224_addcarryx_u32(&x230, &x231, x229, 0x0, x216);
+  uint32_t x231;
+  fiat_p224_mulx_u32(&x230, &x231, x216, UINT32_C(0xffffffff));
   uint32_t x232;
-  fiat_p224_uint1 x233;
-  fiat_p224_addcarryx_u32(&x232, &x233, x217, 0x0, x183);
+  uint32_t x233;
+  fiat_p224_mulx_u32(&x232, &x233, x230, UINT32_C(0xffffffff));
   uint32_t x234;
-  fiat_p224_uint1 x235;
-  fiat_p224_addcarryx_u32(&x234, &x235, x231, 0x0, (fiat_p224_uint1)x232);
+  uint32_t x235;
+  fiat_p224_mulx_u32(&x234, &x235, x230, UINT32_C(0xffffffff));
   uint32_t x236;
   uint32_t x237;
-  fiat_p224_mulx_u32(&x236, &x237, x218, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x236, &x237, x230, UINT32_C(0xffffffff));
   uint32_t x238;
   uint32_t x239;
-  fiat_p224_mulx_u32(&x238, &x239, x236, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x238, &x239, x230, UINT32_C(0xffffffff));
   uint32_t x240;
-  uint32_t x241;
-  fiat_p224_mulx_u32(&x240, &x241, x236, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x241;
+  fiat_p224_addcarryx_u32(&x240, &x241, 0x0, x236, x239);
   uint32_t x242;
-  uint32_t x243;
-  fiat_p224_mulx_u32(&x242, &x243, x236, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x243;
+  fiat_p224_addcarryx_u32(&x242, &x243, x241, x234, x237);
   uint32_t x244;
-  uint32_t x245;
-  fiat_p224_mulx_u32(&x244, &x245, x236, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x245;
+  fiat_p224_addcarryx_u32(&x244, &x245, x243, x232, x235);
   uint32_t x246;
   fiat_p224_uint1 x247;
-  fiat_p224_addcarryx_u32(&x246, &x247, 0x0, x242, x245);
+  fiat_p224_addcarryx_u32(&x246, &x247, 0x0, x230, x216);
   uint32_t x248;
   fiat_p224_uint1 x249;
-  fiat_p224_addcarryx_u32(&x248, &x249, x247, x240, x243);
+  fiat_p224_addcarryx_u32(&x248, &x249, x247, 0x0, x218);
   uint32_t x250;
   fiat_p224_uint1 x251;
-  fiat_p224_addcarryx_u32(&x250, &x251, x249, x238, x241);
+  fiat_p224_addcarryx_u32(&x250, &x251, x249, 0x0, x220);
   uint32_t x252;
   fiat_p224_uint1 x253;
-  fiat_p224_addcarryx_u32(&x252, &x253, 0x0, x236, x218);
+  fiat_p224_addcarryx_u32(&x252, &x253, x251, x238, x222);
   uint32_t x254;
   fiat_p224_uint1 x255;
-  fiat_p224_addcarryx_u32(&x254, &x255, x253, 0x0, x220);
+  fiat_p224_addcarryx_u32(&x254, &x255, x253, x240, x224);
   uint32_t x256;
   fiat_p224_uint1 x257;
-  fiat_p224_addcarryx_u32(&x256, &x257, x255, 0x0, x222);
+  fiat_p224_addcarryx_u32(&x256, &x257, x255, x242, x226);
   uint32_t x258;
   fiat_p224_uint1 x259;
-  fiat_p224_addcarryx_u32(&x258, &x259, x257, x244, x224);
+  fiat_p224_addcarryx_u32(&x258, &x259, x257, x244, x228);
   uint32_t x260;
   fiat_p224_uint1 x261;
-  fiat_p224_addcarryx_u32(&x260, &x261, x259, x246, x226);
+  fiat_p224_addcarryx_u32(&x260, &x261, x215, 0x0, 0x0);
   uint32_t x262;
   fiat_p224_uint1 x263;
-  fiat_p224_addcarryx_u32(&x262, &x263, x261, x248, x228);
+  fiat_p224_addcarryx_u32(&x262, &x263, x229, 0x0, (fiat_p224_uint1)x260);
   uint32_t x264;
   fiat_p224_uint1 x265;
-  fiat_p224_addcarryx_u32(&x264, &x265, x263, x250, x230);
+  fiat_p224_addcarryx_u32(&x264, &x265, x245, 0x0, x233);
   uint32_t x266;
   fiat_p224_uint1 x267;
-  fiat_p224_addcarryx_u32(&x266, &x267, x251, 0x0, x239);
+  fiat_p224_addcarryx_u32(&x266, &x267, x259, x264, x262);
   uint32_t x268;
   fiat_p224_uint1 x269;
-  fiat_p224_addcarryx_u32(&x268, &x269, x265, x266, x234);
+  fiat_p224_addcarryx_u32(&x268, &x269, 0x0, (arg1[6]), x248);
   uint32_t x270;
   fiat_p224_uint1 x271;
-  fiat_p224_addcarryx_u32(&x270, &x271, 0x0, (arg1[6]), x254);
+  fiat_p224_addcarryx_u32(&x270, &x271, x269, 0x0, x250);
   uint32_t x272;
   fiat_p224_uint1 x273;
-  fiat_p224_addcarryx_u32(&x272, &x273, x271, 0x0, x256);
+  fiat_p224_addcarryx_u32(&x272, &x273, x271, 0x0, x252);
   uint32_t x274;
   fiat_p224_uint1 x275;
-  fiat_p224_addcarryx_u32(&x274, &x275, x273, 0x0, x258);
+  fiat_p224_addcarryx_u32(&x274, &x275, x273, 0x0, x254);
   uint32_t x276;
   fiat_p224_uint1 x277;
-  fiat_p224_addcarryx_u32(&x276, &x277, x275, 0x0, x260);
+  fiat_p224_addcarryx_u32(&x276, &x277, x275, 0x0, x256);
   uint32_t x278;
   fiat_p224_uint1 x279;
-  fiat_p224_addcarryx_u32(&x278, &x279, x277, 0x0, x262);
+  fiat_p224_addcarryx_u32(&x278, &x279, x277, 0x0, x258);
   uint32_t x280;
   fiat_p224_uint1 x281;
-  fiat_p224_addcarryx_u32(&x280, &x281, x279, 0x0, x264);
+  fiat_p224_addcarryx_u32(&x280, &x281, x279, 0x0, x266);
   uint32_t x282;
-  fiat_p224_uint1 x283;
-  fiat_p224_addcarryx_u32(&x282, &x283, x281, 0x0, x268);
+  uint32_t x283;
+  fiat_p224_mulx_u32(&x282, &x283, x268, UINT32_C(0xffffffff));
   uint32_t x284;
-  fiat_p224_uint1 x285;
-  fiat_p224_addcarryx_u32(&x284, &x285, x269, 0x0, x235);
+  uint32_t x285;
+  fiat_p224_mulx_u32(&x284, &x285, x282, UINT32_C(0xffffffff));
   uint32_t x286;
-  fiat_p224_uint1 x287;
-  fiat_p224_addcarryx_u32(&x286, &x287, x283, 0x0, (fiat_p224_uint1)x284);
+  uint32_t x287;
+  fiat_p224_mulx_u32(&x286, &x287, x282, UINT32_C(0xffffffff));
   uint32_t x288;
   uint32_t x289;
-  fiat_p224_mulx_u32(&x288, &x289, x270, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x288, &x289, x282, UINT32_C(0xffffffff));
   uint32_t x290;
   uint32_t x291;
-  fiat_p224_mulx_u32(&x290, &x291, x288, UINT32_C(0xffffffff));
+  fiat_p224_mulx_u32(&x290, &x291, x282, UINT32_C(0xffffffff));
   uint32_t x292;
-  uint32_t x293;
-  fiat_p224_mulx_u32(&x292, &x293, x288, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x293;
+  fiat_p224_addcarryx_u32(&x292, &x293, 0x0, x288, x291);
   uint32_t x294;
-  uint32_t x295;
-  fiat_p224_mulx_u32(&x294, &x295, x288, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x295;
+  fiat_p224_addcarryx_u32(&x294, &x295, x293, x286, x289);
   uint32_t x296;
-  uint32_t x297;
-  fiat_p224_mulx_u32(&x296, &x297, x288, UINT32_C(0xffffffff));
+  fiat_p224_uint1 x297;
+  fiat_p224_addcarryx_u32(&x296, &x297, x295, x284, x287);
   uint32_t x298;
   fiat_p224_uint1 x299;
-  fiat_p224_addcarryx_u32(&x298, &x299, 0x0, x294, x297);
+  fiat_p224_addcarryx_u32(&x298, &x299, 0x0, x282, x268);
   uint32_t x300;
   fiat_p224_uint1 x301;
-  fiat_p224_addcarryx_u32(&x300, &x301, x299, x292, x295);
+  fiat_p224_addcarryx_u32(&x300, &x301, x299, 0x0, x270);
   uint32_t x302;
   fiat_p224_uint1 x303;
-  fiat_p224_addcarryx_u32(&x302, &x303, x301, x290, x293);
+  fiat_p224_addcarryx_u32(&x302, &x303, x301, 0x0, x272);
   uint32_t x304;
   fiat_p224_uint1 x305;
-  fiat_p224_addcarryx_u32(&x304, &x305, 0x0, x288, x270);
+  fiat_p224_addcarryx_u32(&x304, &x305, x303, x290, x274);
   uint32_t x306;
   fiat_p224_uint1 x307;
-  fiat_p224_addcarryx_u32(&x306, &x307, x305, 0x0, x272);
+  fiat_p224_addcarryx_u32(&x306, &x307, x305, x292, x276);
   uint32_t x308;
   fiat_p224_uint1 x309;
-  fiat_p224_addcarryx_u32(&x308, &x309, x307, 0x0, x274);
+  fiat_p224_addcarryx_u32(&x308, &x309, x307, x294, x278);
   uint32_t x310;
   fiat_p224_uint1 x311;
-  fiat_p224_addcarryx_u32(&x310, &x311, x309, x296, x276);
+  fiat_p224_addcarryx_u32(&x310, &x311, x309, x296, x280);
   uint32_t x312;
   fiat_p224_uint1 x313;
-  fiat_p224_addcarryx_u32(&x312, &x313, x311, x298, x278);
+  fiat_p224_addcarryx_u32(&x312, &x313, x267, 0x0, 0x0);
   uint32_t x314;
   fiat_p224_uint1 x315;
-  fiat_p224_addcarryx_u32(&x314, &x315, x313, x300, x280);
+  fiat_p224_addcarryx_u32(&x314, &x315, x281, 0x0, (fiat_p224_uint1)x312);
   uint32_t x316;
   fiat_p224_uint1 x317;
-  fiat_p224_addcarryx_u32(&x316, &x317, x315, x302, x282);
+  fiat_p224_addcarryx_u32(&x316, &x317, x297, 0x0, x285);
   uint32_t x318;
   fiat_p224_uint1 x319;
-  fiat_p224_addcarryx_u32(&x318, &x319, x303, 0x0, x291);
+  fiat_p224_addcarryx_u32(&x318, &x319, x311, x316, x314);
   uint32_t x320;
   fiat_p224_uint1 x321;
-  fiat_p224_addcarryx_u32(&x320, &x321, x317, x318, x286);
+  fiat_p224_subborrowx_u32(&x320, &x321, 0x0, x300, 0x1);
   uint32_t x322;
   fiat_p224_uint1 x323;
-  fiat_p224_subborrowx_u32(&x322, &x323, 0x0, x306, 0x1);
+  fiat_p224_subborrowx_u32(&x322, &x323, x321, x302, 0x0);
   uint32_t x324;
   fiat_p224_uint1 x325;
-  fiat_p224_subborrowx_u32(&x324, &x325, x323, x308, 0x0);
+  fiat_p224_subborrowx_u32(&x324, &x325, x323, x304, 0x0);
   uint32_t x326;
   fiat_p224_uint1 x327;
-  fiat_p224_subborrowx_u32(&x326, &x327, x325, x310, 0x0);
+  fiat_p224_subborrowx_u32(&x326, &x327, x325, x306, UINT32_C(0xffffffff));
   uint32_t x328;
   fiat_p224_uint1 x329;
-  fiat_p224_subborrowx_u32(&x328, &x329, x327, x312, UINT32_C(0xffffffff));
+  fiat_p224_subborrowx_u32(&x328, &x329, x327, x308, UINT32_C(0xffffffff));
   uint32_t x330;
   fiat_p224_uint1 x331;
-  fiat_p224_subborrowx_u32(&x330, &x331, x329, x314, UINT32_C(0xffffffff));
+  fiat_p224_subborrowx_u32(&x330, &x331, x329, x310, UINT32_C(0xffffffff));
   uint32_t x332;
   fiat_p224_uint1 x333;
-  fiat_p224_subborrowx_u32(&x332, &x333, x331, x316, UINT32_C(0xffffffff));
+  fiat_p224_subborrowx_u32(&x332, &x333, x331, x318, UINT32_C(0xffffffff));
   uint32_t x334;
   fiat_p224_uint1 x335;
-  fiat_p224_subborrowx_u32(&x334, &x335, x333, x320, UINT32_C(0xffffffff));
+  fiat_p224_addcarryx_u32(&x334, &x335, x319, 0x0, 0x0);
   uint32_t x336;
   fiat_p224_uint1 x337;
-  fiat_p224_addcarryx_u32(&x336, &x337, x321, 0x0, x287);
+  fiat_p224_subborrowx_u32(&x336, &x337, x333, (fiat_p224_uint1)x334, 0x0);
   uint32_t x338;
-  fiat_p224_uint1 x339;
-  fiat_p224_subborrowx_u32(&x338, &x339, x335, (fiat_p224_uint1)x336, 0x0);
+  fiat_p224_cmovznz_u32(&x338, x337, x320, x300);
+  uint32_t x339;
+  fiat_p224_cmovznz_u32(&x339, x337, x322, x302);
   uint32_t x340;
-  fiat_p224_cmovznz_u32(&x340, x339, x322, x306);
+  fiat_p224_cmovznz_u32(&x340, x337, x324, x304);
   uint32_t x341;
-  fiat_p224_cmovznz_u32(&x341, x339, x324, x308);
+  fiat_p224_cmovznz_u32(&x341, x337, x326, x306);
   uint32_t x342;
-  fiat_p224_cmovznz_u32(&x342, x339, x326, x310);
+  fiat_p224_cmovznz_u32(&x342, x337, x328, x308);
   uint32_t x343;
-  fiat_p224_cmovznz_u32(&x343, x339, x328, x312);
+  fiat_p224_cmovznz_u32(&x343, x337, x330, x310);
   uint32_t x344;
-  fiat_p224_cmovznz_u32(&x344, x339, x330, x314);
-  uint32_t x345;
-  fiat_p224_cmovznz_u32(&x345, x339, x332, x316);
-  uint32_t x346;
-  fiat_p224_cmovznz_u32(&x346, x339, x334, x320);
-  out1[0] = x340;
-  out1[1] = x341;
-  out1[2] = x342;
-  out1[3] = x343;
-  out1[4] = x344;
-  out1[5] = x345;
-  out1[6] = x346;
+  fiat_p224_cmovznz_u32(&x344, x337, x332, x318);
+  out1[0] = x338;
+  out1[1] = x339;
+  out1[2] = x340;
+  out1[3] = x341;
+  out1[4] = x342;
+  out1[5] = x343;
+  out1[6] = x344;
 }
 
 /*
@@ -2634,88 +2631,82 @@ static void fiat_p224_to_bytes(uint8_t out1[28], const uint32_t arg1[7]) {
   uint8_t x11 = (uint8_t)(x8 & UINT8_C(0xff));
   uint8_t x12 = (uint8_t)(x10 >> 8);
   uint8_t x13 = (uint8_t)(x10 & UINT8_C(0xff));
-  fiat_p224_uint1 x14 = (fiat_p224_uint1)(x12 >> 8);
-  uint8_t x15 = (uint8_t)(x12 & UINT8_C(0xff));
-  uint32_t x16 = (x14 + x6);
-  uint32_t x17 = (x16 >> 8);
-  uint8_t x18 = (uint8_t)(x16 & UINT8_C(0xff));
-  uint32_t x19 = (x17 >> 8);
-  uint8_t x20 = (uint8_t)(x17 & UINT8_C(0xff));
-  uint8_t x21 = (uint8_t)(x19 >> 8);
-  uint8_t x22 = (uint8_t)(x19 & UINT8_C(0xff));
-  fiat_p224_uint1 x23 = (fiat_p224_uint1)(x21 >> 8);
-  uint8_t x24 = (uint8_t)(x21 & UINT8_C(0xff));
-  uint32_t x25 = (x23 + x5);
-  uint32_t x26 = (x25 >> 8);
-  uint8_t x27 = (uint8_t)(x25 & UINT8_C(0xff));
-  uint32_t x28 = (x26 >> 8);
+  uint8_t x14 = (uint8_t)(x12 & UINT8_C(0xff));
+  uint32_t x15 = (0x0 + x6);
+  uint32_t x16 = (x15 >> 8);
+  uint8_t x17 = (uint8_t)(x15 & UINT8_C(0xff));
+  uint32_t x18 = (x16 >> 8);
+  uint8_t x19 = (uint8_t)(x16 & UINT8_C(0xff));
+  uint8_t x20 = (uint8_t)(x18 >> 8);
+  uint8_t x21 = (uint8_t)(x18 & UINT8_C(0xff));
+  uint8_t x22 = (uint8_t)(x20 & UINT8_C(0xff));
+  uint32_t x23 = (0x0 + x5);
+  uint32_t x24 = (x23 >> 8);
+  uint8_t x25 = (uint8_t)(x23 & UINT8_C(0xff));
+  uint32_t x26 = (x24 >> 8);
+  uint8_t x27 = (uint8_t)(x24 & UINT8_C(0xff));
+  uint8_t x28 = (uint8_t)(x26 >> 8);
   uint8_t x29 = (uint8_t)(x26 & UINT8_C(0xff));
-  uint8_t x30 = (uint8_t)(x28 >> 8);
-  uint8_t x31 = (uint8_t)(x28 & UINT8_C(0xff));
-  fiat_p224_uint1 x32 = (fiat_p224_uint1)(x30 >> 8);
-  uint8_t x33 = (uint8_t)(x30 & UINT8_C(0xff));
-  uint32_t x34 = (x32 + x4);
-  uint32_t x35 = (x34 >> 8);
-  uint8_t x36 = (uint8_t)(x34 & UINT8_C(0xff));
-  uint32_t x37 = (x35 >> 8);
-  uint8_t x38 = (uint8_t)(x35 & UINT8_C(0xff));
-  uint8_t x39 = (uint8_t)(x37 >> 8);
-  uint8_t x40 = (uint8_t)(x37 & UINT8_C(0xff));
-  fiat_p224_uint1 x41 = (fiat_p224_uint1)(x39 >> 8);
-  uint8_t x42 = (uint8_t)(x39 & UINT8_C(0xff));
-  uint32_t x43 = (x41 + x3);
-  uint32_t x44 = (x43 >> 8);
-  uint8_t x45 = (uint8_t)(x43 & UINT8_C(0xff));
-  uint32_t x46 = (x44 >> 8);
-  uint8_t x47 = (uint8_t)(x44 & UINT8_C(0xff));
-  uint8_t x48 = (uint8_t)(x46 >> 8);
-  uint8_t x49 = (uint8_t)(x46 & UINT8_C(0xff));
-  fiat_p224_uint1 x50 = (fiat_p224_uint1)(x48 >> 8);
+  uint8_t x30 = (uint8_t)(x28 & UINT8_C(0xff));
+  uint32_t x31 = (0x0 + x4);
+  uint32_t x32 = (x31 >> 8);
+  uint8_t x33 = (uint8_t)(x31 & UINT8_C(0xff));
+  uint32_t x34 = (x32 >> 8);
+  uint8_t x35 = (uint8_t)(x32 & UINT8_C(0xff));
+  uint8_t x36 = (uint8_t)(x34 >> 8);
+  uint8_t x37 = (uint8_t)(x34 & UINT8_C(0xff));
+  uint8_t x38 = (uint8_t)(x36 & UINT8_C(0xff));
+  uint32_t x39 = (0x0 + x3);
+  uint32_t x40 = (x39 >> 8);
+  uint8_t x41 = (uint8_t)(x39 & UINT8_C(0xff));
+  uint32_t x42 = (x40 >> 8);
+  uint8_t x43 = (uint8_t)(x40 & UINT8_C(0xff));
+  uint8_t x44 = (uint8_t)(x42 >> 8);
+  uint8_t x45 = (uint8_t)(x42 & UINT8_C(0xff));
+  uint8_t x46 = (uint8_t)(x44 & UINT8_C(0xff));
+  uint32_t x47 = (0x0 + x2);
+  uint32_t x48 = (x47 >> 8);
+  uint8_t x49 = (uint8_t)(x47 & UINT8_C(0xff));
+  uint32_t x50 = (x48 >> 8);
   uint8_t x51 = (uint8_t)(x48 & UINT8_C(0xff));
-  uint32_t x52 = (x50 + x2);
-  uint32_t x53 = (x52 >> 8);
+  uint8_t x52 = (uint8_t)(x50 >> 8);
+  uint8_t x53 = (uint8_t)(x50 & UINT8_C(0xff));
   uint8_t x54 = (uint8_t)(x52 & UINT8_C(0xff));
-  uint32_t x55 = (x53 >> 8);
-  uint8_t x56 = (uint8_t)(x53 & UINT8_C(0xff));
-  uint8_t x57 = (uint8_t)(x55 >> 8);
-  uint8_t x58 = (uint8_t)(x55 & UINT8_C(0xff));
-  fiat_p224_uint1 x59 = (fiat_p224_uint1)(x57 >> 8);
-  uint8_t x60 = (uint8_t)(x57 & UINT8_C(0xff));
-  uint32_t x61 = (x59 + x1);
-  uint32_t x62 = (x61 >> 8);
-  uint8_t x63 = (uint8_t)(x61 & UINT8_C(0xff));
-  uint32_t x64 = (x62 >> 8);
-  uint8_t x65 = (uint8_t)(x62 & UINT8_C(0xff));
-  uint8_t x66 = (uint8_t)(x64 >> 8);
-  uint8_t x67 = (uint8_t)(x64 & UINT8_C(0xff));
+  uint32_t x55 = (0x0 + x1);
+  uint32_t x56 = (x55 >> 8);
+  uint8_t x57 = (uint8_t)(x55 & UINT8_C(0xff));
+  uint32_t x58 = (x56 >> 8);
+  uint8_t x59 = (uint8_t)(x56 & UINT8_C(0xff));
+  uint8_t x60 = (uint8_t)(x58 >> 8);
+  uint8_t x61 = (uint8_t)(x58 & UINT8_C(0xff));
   out1[0] = x9;
   out1[1] = x11;
   out1[2] = x13;
-  out1[3] = x15;
-  out1[4] = x18;
-  out1[5] = x20;
-  out1[6] = x22;
-  out1[7] = x24;
-  out1[8] = x27;
-  out1[9] = x29;
-  out1[10] = x31;
-  out1[11] = x33;
-  out1[12] = x36;
-  out1[13] = x38;
-  out1[14] = x40;
-  out1[15] = x42;
-  out1[16] = x45;
-  out1[17] = x47;
-  out1[18] = x49;
-  out1[19] = x51;
-  out1[20] = x54;
-  out1[21] = x56;
-  out1[22] = x58;
-  out1[23] = x60;
-  out1[24] = x63;
-  out1[25] = x65;
-  out1[26] = x67;
-  out1[27] = x66;
+  out1[3] = x14;
+  out1[4] = x17;
+  out1[5] = x19;
+  out1[6] = x21;
+  out1[7] = x22;
+  out1[8] = x25;
+  out1[9] = x27;
+  out1[10] = x29;
+  out1[11] = x30;
+  out1[12] = x33;
+  out1[13] = x35;
+  out1[14] = x37;
+  out1[15] = x38;
+  out1[16] = x41;
+  out1[17] = x43;
+  out1[18] = x45;
+  out1[19] = x46;
+  out1[20] = x49;
+  out1[21] = x51;
+  out1[22] = x53;
+  out1[23] = x54;
+  out1[24] = x57;
+  out1[25] = x59;
+  out1[26] = x61;
+  out1[27] = x60;
 }
 
 /*
@@ -2754,36 +2745,30 @@ static void fiat_p224_from_bytes(uint32_t out1[7], const uint8_t arg1[28]) {
   uint32_t x27 = ((uint32_t)(arg1[1]) << 8);
   uint8_t x28 = (arg1[0]);
   uint32_t x29 = (x28 + (x27 + (x26 + x25)));
-  fiat_p224_uint1 x30 = (fiat_p224_uint1)((uint64_t)x29 >> 32);
-  uint32_t x31 = (x29 & UINT32_C(0xffffffff));
-  uint32_t x32 = (x4 + (x3 + (x2 + x1)));
-  uint32_t x33 = (x8 + (x7 + (x6 + x5)));
-  uint32_t x34 = (x12 + (x11 + (x10 + x9)));
-  uint32_t x35 = (x16 + (x15 + (x14 + x13)));
-  uint32_t x36 = (x20 + (x19 + (x18 + x17)));
-  uint32_t x37 = (x24 + (x23 + (x22 + x21)));
-  uint32_t x38 = (x30 + x37);
-  fiat_p224_uint1 x39 = (fiat_p224_uint1)((uint64_t)x38 >> 32);
-  uint32_t x40 = (x38 & UINT32_C(0xffffffff));
-  uint32_t x41 = (x39 + x36);
-  fiat_p224_uint1 x42 = (fiat_p224_uint1)((uint64_t)x41 >> 32);
-  uint32_t x43 = (x41 & UINT32_C(0xffffffff));
-  uint32_t x44 = (x42 + x35);
-  fiat_p224_uint1 x45 = (fiat_p224_uint1)((uint64_t)x44 >> 32);
-  uint32_t x46 = (x44 & UINT32_C(0xffffffff));
-  uint32_t x47 = (x45 + x34);
-  fiat_p224_uint1 x48 = (fiat_p224_uint1)((uint64_t)x47 >> 32);
-  uint32_t x49 = (x47 & UINT32_C(0xffffffff));
-  uint32_t x50 = (x48 + x33);
-  fiat_p224_uint1 x51 = (fiat_p224_uint1)((uint64_t)x50 >> 32);
-  uint32_t x52 = (x50 & UINT32_C(0xffffffff));
-  uint32_t x53 = (x51 + x32);
-  out1[0] = x31;
-  out1[1] = x40;
-  out1[2] = x43;
-  out1[3] = x46;
-  out1[4] = x49;
-  out1[5] = x52;
-  out1[6] = x53;
+  uint32_t x30 = (x29 & UINT32_C(0xffffffff));
+  uint32_t x31 = (x4 + (x3 + (x2 + x1)));
+  uint32_t x32 = (x8 + (x7 + (x6 + x5)));
+  uint32_t x33 = (x12 + (x11 + (x10 + x9)));
+  uint32_t x34 = (x16 + (x15 + (x14 + x13)));
+  uint32_t x35 = (x20 + (x19 + (x18 + x17)));
+  uint32_t x36 = (x24 + (x23 + (x22 + x21)));
+  uint32_t x37 = (0x0 + x36);
+  uint32_t x38 = (x37 & UINT32_C(0xffffffff));
+  uint32_t x39 = (0x0 + x35);
+  uint32_t x40 = (x39 & UINT32_C(0xffffffff));
+  uint32_t x41 = (0x0 + x34);
+  uint32_t x42 = (x41 & UINT32_C(0xffffffff));
+  uint32_t x43 = (0x0 + x33);
+  uint32_t x44 = (x43 & UINT32_C(0xffffffff));
+  uint32_t x45 = (0x0 + x32);
+  uint32_t x46 = (x45 & UINT32_C(0xffffffff));
+  uint32_t x47 = (0x0 + x31);
+  out1[0] = x30;
+  out1[1] = x38;
+  out1[2] = x40;
+  out1[3] = x42;
+  out1[4] = x44;
+  out1[5] = x46;
+  out1[6] = x47;
 }