From 60bade02ccd577550bfcd5974d3c62a3d40e751a Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Tue, 15 Jan 2019 15:53:34 -0500 Subject: 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% --- secp256k1_64.c | 306 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 150 insertions(+), 156 deletions(-) (limited to 'secp256k1_64.c') diff --git a/secp256k1_64.c b/secp256k1_64.c index 749e9bc40..a80485a4f 100644 --- a/secp256k1_64.c +++ b/secp256k1_64.c @@ -997,197 +997,197 @@ static void fiat_secp256k1_from_montgomery(uint64_t out1[4], const uint64_t arg1 fiat_secp256k1_uint1 x37; fiat_secp256k1_addcarryx_u64(&x36, &x37, x35, 0x0, x28); uint64_t x38; - fiat_secp256k1_uint1 x39; - fiat_secp256k1_addcarryx_u64(&x38, &x39, x29, 0x0, 0x0); + uint64_t x39; + fiat_secp256k1_mulx_u64(&x38, &x39, x30, UINT64_C(0xd838091dd2253531)); uint64_t x40; - fiat_secp256k1_uint1 x41; - fiat_secp256k1_addcarryx_u64(&x40, &x41, x37, 0x0, (fiat_secp256k1_uint1)x38); + uint64_t x41; + fiat_secp256k1_mulx_u64(&x40, &x41, x38, UINT64_C(0xffffffffffffffff)); uint64_t x42; uint64_t x43; - fiat_secp256k1_mulx_u64(&x42, &x43, x30, UINT64_C(0xd838091dd2253531)); + fiat_secp256k1_mulx_u64(&x42, &x43, x38, UINT64_C(0xffffffffffffffff)); uint64_t x44; uint64_t x45; - fiat_secp256k1_mulx_u64(&x44, &x45, x42, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_mulx_u64(&x44, &x45, x38, UINT64_C(0xffffffffffffffff)); uint64_t x46; uint64_t x47; - fiat_secp256k1_mulx_u64(&x46, &x47, x42, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_mulx_u64(&x46, &x47, x38, UINT64_C(0xfffffffefffffc2f)); uint64_t x48; - uint64_t x49; - fiat_secp256k1_mulx_u64(&x48, &x49, x42, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_uint1 x49; + fiat_secp256k1_addcarryx_u64(&x48, &x49, 0x0, x44, x47); uint64_t x50; - uint64_t x51; - fiat_secp256k1_mulx_u64(&x50, &x51, x42, UINT64_C(0xfffffffefffffc2f)); + fiat_secp256k1_uint1 x51; + fiat_secp256k1_addcarryx_u64(&x50, &x51, x49, x42, x45); uint64_t x52; fiat_secp256k1_uint1 x53; - fiat_secp256k1_addcarryx_u64(&x52, &x53, 0x0, x48, x51); + fiat_secp256k1_addcarryx_u64(&x52, &x53, x51, x40, x43); uint64_t x54; fiat_secp256k1_uint1 x55; - fiat_secp256k1_addcarryx_u64(&x54, &x55, x53, x46, x49); + fiat_secp256k1_addcarryx_u64(&x54, &x55, 0x0, x46, x30); uint64_t x56; fiat_secp256k1_uint1 x57; - fiat_secp256k1_addcarryx_u64(&x56, &x57, x55, x44, x47); + fiat_secp256k1_addcarryx_u64(&x56, &x57, x55, x48, x32); uint64_t x58; fiat_secp256k1_uint1 x59; - fiat_secp256k1_addcarryx_u64(&x58, &x59, 0x0, x50, x30); + fiat_secp256k1_addcarryx_u64(&x58, &x59, x57, x50, x34); uint64_t x60; fiat_secp256k1_uint1 x61; - fiat_secp256k1_addcarryx_u64(&x60, &x61, x59, x52, x32); + fiat_secp256k1_addcarryx_u64(&x60, &x61, x59, x52, x36); uint64_t x62; fiat_secp256k1_uint1 x63; - fiat_secp256k1_addcarryx_u64(&x62, &x63, x61, x54, x34); + fiat_secp256k1_addcarryx_u64(&x62, &x63, x29, 0x0, 0x0); uint64_t x64; fiat_secp256k1_uint1 x65; - fiat_secp256k1_addcarryx_u64(&x64, &x65, x63, x56, x36); + fiat_secp256k1_addcarryx_u64(&x64, &x65, x37, 0x0, (fiat_secp256k1_uint1)x62); uint64_t x66; fiat_secp256k1_uint1 x67; - fiat_secp256k1_addcarryx_u64(&x66, &x67, x57, 0x0, x45); + fiat_secp256k1_addcarryx_u64(&x66, &x67, x53, 0x0, x41); uint64_t x68; fiat_secp256k1_uint1 x69; - fiat_secp256k1_addcarryx_u64(&x68, &x69, x65, x66, x40); + fiat_secp256k1_addcarryx_u64(&x68, &x69, x61, x66, x64); uint64_t x70; fiat_secp256k1_uint1 x71; - fiat_secp256k1_addcarryx_u64(&x70, &x71, 0x0, (arg1[2]), x60); + fiat_secp256k1_addcarryx_u64(&x70, &x71, 0x0, (arg1[2]), x56); uint64_t x72; fiat_secp256k1_uint1 x73; - fiat_secp256k1_addcarryx_u64(&x72, &x73, x71, 0x0, x62); + fiat_secp256k1_addcarryx_u64(&x72, &x73, x71, 0x0, x58); uint64_t x74; fiat_secp256k1_uint1 x75; - fiat_secp256k1_addcarryx_u64(&x74, &x75, x73, 0x0, x64); + fiat_secp256k1_addcarryx_u64(&x74, &x75, x73, 0x0, x60); uint64_t x76; fiat_secp256k1_uint1 x77; fiat_secp256k1_addcarryx_u64(&x76, &x77, x75, 0x0, x68); uint64_t x78; - fiat_secp256k1_uint1 x79; - fiat_secp256k1_addcarryx_u64(&x78, &x79, x69, 0x0, x41); + uint64_t x79; + fiat_secp256k1_mulx_u64(&x78, &x79, x70, UINT64_C(0xd838091dd2253531)); uint64_t x80; - fiat_secp256k1_uint1 x81; - fiat_secp256k1_addcarryx_u64(&x80, &x81, x77, 0x0, (fiat_secp256k1_uint1)x78); + uint64_t x81; + fiat_secp256k1_mulx_u64(&x80, &x81, x78, UINT64_C(0xffffffffffffffff)); uint64_t x82; uint64_t x83; - fiat_secp256k1_mulx_u64(&x82, &x83, x70, UINT64_C(0xd838091dd2253531)); + fiat_secp256k1_mulx_u64(&x82, &x83, x78, UINT64_C(0xffffffffffffffff)); uint64_t x84; uint64_t x85; - fiat_secp256k1_mulx_u64(&x84, &x85, x82, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_mulx_u64(&x84, &x85, x78, UINT64_C(0xffffffffffffffff)); uint64_t x86; uint64_t x87; - fiat_secp256k1_mulx_u64(&x86, &x87, x82, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_mulx_u64(&x86, &x87, x78, UINT64_C(0xfffffffefffffc2f)); uint64_t x88; - uint64_t x89; - fiat_secp256k1_mulx_u64(&x88, &x89, x82, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_uint1 x89; + fiat_secp256k1_addcarryx_u64(&x88, &x89, 0x0, x84, x87); uint64_t x90; - uint64_t x91; - fiat_secp256k1_mulx_u64(&x90, &x91, x82, UINT64_C(0xfffffffefffffc2f)); + fiat_secp256k1_uint1 x91; + fiat_secp256k1_addcarryx_u64(&x90, &x91, x89, x82, x85); uint64_t x92; fiat_secp256k1_uint1 x93; - fiat_secp256k1_addcarryx_u64(&x92, &x93, 0x0, x88, x91); + fiat_secp256k1_addcarryx_u64(&x92, &x93, x91, x80, x83); uint64_t x94; fiat_secp256k1_uint1 x95; - fiat_secp256k1_addcarryx_u64(&x94, &x95, x93, x86, x89); + fiat_secp256k1_addcarryx_u64(&x94, &x95, 0x0, x86, x70); uint64_t x96; fiat_secp256k1_uint1 x97; - fiat_secp256k1_addcarryx_u64(&x96, &x97, x95, x84, x87); + fiat_secp256k1_addcarryx_u64(&x96, &x97, x95, x88, x72); uint64_t x98; fiat_secp256k1_uint1 x99; - fiat_secp256k1_addcarryx_u64(&x98, &x99, 0x0, x90, x70); + fiat_secp256k1_addcarryx_u64(&x98, &x99, x97, x90, x74); uint64_t x100; fiat_secp256k1_uint1 x101; - fiat_secp256k1_addcarryx_u64(&x100, &x101, x99, x92, x72); + fiat_secp256k1_addcarryx_u64(&x100, &x101, x99, x92, x76); uint64_t x102; fiat_secp256k1_uint1 x103; - fiat_secp256k1_addcarryx_u64(&x102, &x103, x101, x94, x74); + fiat_secp256k1_addcarryx_u64(&x102, &x103, x69, 0x0, 0x0); uint64_t x104; fiat_secp256k1_uint1 x105; - fiat_secp256k1_addcarryx_u64(&x104, &x105, x103, x96, x76); + fiat_secp256k1_addcarryx_u64(&x104, &x105, x77, 0x0, (fiat_secp256k1_uint1)x102); uint64_t x106; fiat_secp256k1_uint1 x107; - fiat_secp256k1_addcarryx_u64(&x106, &x107, x97, 0x0, x85); + fiat_secp256k1_addcarryx_u64(&x106, &x107, x93, 0x0, x81); uint64_t x108; fiat_secp256k1_uint1 x109; - fiat_secp256k1_addcarryx_u64(&x108, &x109, x105, x106, x80); + fiat_secp256k1_addcarryx_u64(&x108, &x109, x101, x106, x104); uint64_t x110; fiat_secp256k1_uint1 x111; - fiat_secp256k1_addcarryx_u64(&x110, &x111, 0x0, (arg1[3]), x100); + fiat_secp256k1_addcarryx_u64(&x110, &x111, 0x0, (arg1[3]), x96); uint64_t x112; fiat_secp256k1_uint1 x113; - fiat_secp256k1_addcarryx_u64(&x112, &x113, x111, 0x0, x102); + fiat_secp256k1_addcarryx_u64(&x112, &x113, x111, 0x0, x98); uint64_t x114; fiat_secp256k1_uint1 x115; - fiat_secp256k1_addcarryx_u64(&x114, &x115, x113, 0x0, x104); + fiat_secp256k1_addcarryx_u64(&x114, &x115, x113, 0x0, x100); uint64_t x116; fiat_secp256k1_uint1 x117; fiat_secp256k1_addcarryx_u64(&x116, &x117, x115, 0x0, x108); uint64_t x118; - fiat_secp256k1_uint1 x119; - fiat_secp256k1_addcarryx_u64(&x118, &x119, x109, 0x0, x81); + uint64_t x119; + fiat_secp256k1_mulx_u64(&x118, &x119, x110, UINT64_C(0xd838091dd2253531)); uint64_t x120; - fiat_secp256k1_uint1 x121; - fiat_secp256k1_addcarryx_u64(&x120, &x121, x117, 0x0, (fiat_secp256k1_uint1)x118); + uint64_t x121; + fiat_secp256k1_mulx_u64(&x120, &x121, x118, UINT64_C(0xffffffffffffffff)); uint64_t x122; uint64_t x123; - fiat_secp256k1_mulx_u64(&x122, &x123, x110, UINT64_C(0xd838091dd2253531)); + fiat_secp256k1_mulx_u64(&x122, &x123, x118, UINT64_C(0xffffffffffffffff)); uint64_t x124; uint64_t x125; - fiat_secp256k1_mulx_u64(&x124, &x125, x122, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_mulx_u64(&x124, &x125, x118, UINT64_C(0xffffffffffffffff)); uint64_t x126; uint64_t x127; - fiat_secp256k1_mulx_u64(&x126, &x127, x122, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_mulx_u64(&x126, &x127, x118, UINT64_C(0xfffffffefffffc2f)); uint64_t x128; - uint64_t x129; - fiat_secp256k1_mulx_u64(&x128, &x129, x122, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_uint1 x129; + fiat_secp256k1_addcarryx_u64(&x128, &x129, 0x0, x124, x127); uint64_t x130; - uint64_t x131; - fiat_secp256k1_mulx_u64(&x130, &x131, x122, UINT64_C(0xfffffffefffffc2f)); + fiat_secp256k1_uint1 x131; + fiat_secp256k1_addcarryx_u64(&x130, &x131, x129, x122, x125); uint64_t x132; fiat_secp256k1_uint1 x133; - fiat_secp256k1_addcarryx_u64(&x132, &x133, 0x0, x128, x131); + fiat_secp256k1_addcarryx_u64(&x132, &x133, x131, x120, x123); uint64_t x134; fiat_secp256k1_uint1 x135; - fiat_secp256k1_addcarryx_u64(&x134, &x135, x133, x126, x129); + fiat_secp256k1_addcarryx_u64(&x134, &x135, 0x0, x126, x110); uint64_t x136; fiat_secp256k1_uint1 x137; - fiat_secp256k1_addcarryx_u64(&x136, &x137, x135, x124, x127); + fiat_secp256k1_addcarryx_u64(&x136, &x137, x135, x128, x112); uint64_t x138; fiat_secp256k1_uint1 x139; - fiat_secp256k1_addcarryx_u64(&x138, &x139, 0x0, x130, x110); + fiat_secp256k1_addcarryx_u64(&x138, &x139, x137, x130, x114); uint64_t x140; fiat_secp256k1_uint1 x141; - fiat_secp256k1_addcarryx_u64(&x140, &x141, x139, x132, x112); + fiat_secp256k1_addcarryx_u64(&x140, &x141, x139, x132, x116); uint64_t x142; fiat_secp256k1_uint1 x143; - fiat_secp256k1_addcarryx_u64(&x142, &x143, x141, x134, x114); + fiat_secp256k1_addcarryx_u64(&x142, &x143, x109, 0x0, 0x0); uint64_t x144; fiat_secp256k1_uint1 x145; - fiat_secp256k1_addcarryx_u64(&x144, &x145, x143, x136, x116); + fiat_secp256k1_addcarryx_u64(&x144, &x145, x117, 0x0, (fiat_secp256k1_uint1)x142); uint64_t x146; fiat_secp256k1_uint1 x147; - fiat_secp256k1_addcarryx_u64(&x146, &x147, x137, 0x0, x125); + fiat_secp256k1_addcarryx_u64(&x146, &x147, x133, 0x0, x121); uint64_t x148; fiat_secp256k1_uint1 x149; - fiat_secp256k1_addcarryx_u64(&x148, &x149, x145, x146, x120); + fiat_secp256k1_addcarryx_u64(&x148, &x149, x141, x146, x144); uint64_t x150; fiat_secp256k1_uint1 x151; - fiat_secp256k1_subborrowx_u64(&x150, &x151, 0x0, x140, UINT64_C(0xfffffffefffffc2f)); + fiat_secp256k1_subborrowx_u64(&x150, &x151, 0x0, x136, UINT64_C(0xfffffffefffffc2f)); uint64_t x152; fiat_secp256k1_uint1 x153; - fiat_secp256k1_subborrowx_u64(&x152, &x153, x151, x142, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_subborrowx_u64(&x152, &x153, x151, x138, UINT64_C(0xffffffffffffffff)); uint64_t x154; fiat_secp256k1_uint1 x155; - fiat_secp256k1_subborrowx_u64(&x154, &x155, x153, x144, UINT64_C(0xffffffffffffffff)); + fiat_secp256k1_subborrowx_u64(&x154, &x155, x153, x140, UINT64_C(0xffffffffffffffff)); uint64_t x156; fiat_secp256k1_uint1 x157; fiat_secp256k1_subborrowx_u64(&x156, &x157, x155, x148, UINT64_C(0xffffffffffffffff)); uint64_t x158; fiat_secp256k1_uint1 x159; - fiat_secp256k1_addcarryx_u64(&x158, &x159, x149, 0x0, x121); + fiat_secp256k1_addcarryx_u64(&x158, &x159, x149, 0x0, 0x0); uint64_t x160; fiat_secp256k1_uint1 x161; fiat_secp256k1_subborrowx_u64(&x160, &x161, x157, (fiat_secp256k1_uint1)x158, 0x0); uint64_t x162; - fiat_secp256k1_cmovznz_u64(&x162, x161, x150, x140); + fiat_secp256k1_cmovznz_u64(&x162, x161, x150, x136); uint64_t x163; - fiat_secp256k1_cmovznz_u64(&x163, x161, x152, x142); + fiat_secp256k1_cmovznz_u64(&x163, x161, x152, x138); uint64_t x164; - fiat_secp256k1_cmovznz_u64(&x164, x161, x154, x144); + fiat_secp256k1_cmovznz_u64(&x164, x161, x154, x140); uint64_t x165; fiat_secp256k1_cmovznz_u64(&x165, x161, x156, x148); out1[0] = x162; @@ -1255,28 +1255,28 @@ static void fiat_secp256k1_to_bytes(uint8_t out1[32], const uint64_t arg1[4]) { uint8_t x16 = (uint8_t)(x13 & UINT8_C(0xff)); uint8_t x17 = (uint8_t)(x15 >> 8); uint8_t x18 = (uint8_t)(x15 & UINT8_C(0xff)); - fiat_secp256k1_uint1 x19 = (fiat_secp256k1_uint1)(x17 >> 8); - uint8_t x20 = (uint8_t)(x17 & UINT8_C(0xff)); - uint64_t x21 = (x19 + x3); - uint64_t x22 = (x21 >> 8); - uint8_t x23 = (uint8_t)(x21 & UINT8_C(0xff)); - uint64_t x24 = (x22 >> 8); - uint8_t x25 = (uint8_t)(x22 & UINT8_C(0xff)); - uint64_t x26 = (x24 >> 8); - uint8_t x27 = (uint8_t)(x24 & UINT8_C(0xff)); - uint64_t x28 = (x26 >> 8); - uint8_t x29 = (uint8_t)(x26 & UINT8_C(0xff)); - uint64_t x30 = (x28 >> 8); - uint8_t x31 = (uint8_t)(x28 & UINT8_C(0xff)); - uint64_t x32 = (x30 >> 8); - uint8_t x33 = (uint8_t)(x30 & UINT8_C(0xff)); - uint8_t x34 = (uint8_t)(x32 >> 8); - uint8_t x35 = (uint8_t)(x32 & UINT8_C(0xff)); - fiat_secp256k1_uint1 x36 = (fiat_secp256k1_uint1)(x34 >> 8); - uint8_t x37 = (uint8_t)(x34 & UINT8_C(0xff)); - uint64_t x38 = (x36 + x2); - uint64_t x39 = (x38 >> 8); - uint8_t x40 = (uint8_t)(x38 & UINT8_C(0xff)); + uint8_t x19 = (uint8_t)(x17 & UINT8_C(0xff)); + uint64_t x20 = (0x0 + x3); + uint64_t x21 = (x20 >> 8); + uint8_t x22 = (uint8_t)(x20 & UINT8_C(0xff)); + uint64_t x23 = (x21 >> 8); + uint8_t x24 = (uint8_t)(x21 & UINT8_C(0xff)); + uint64_t x25 = (x23 >> 8); + uint8_t x26 = (uint8_t)(x23 & UINT8_C(0xff)); + uint64_t x27 = (x25 >> 8); + uint8_t x28 = (uint8_t)(x25 & UINT8_C(0xff)); + uint64_t x29 = (x27 >> 8); + uint8_t x30 = (uint8_t)(x27 & UINT8_C(0xff)); + uint64_t x31 = (x29 >> 8); + uint8_t x32 = (uint8_t)(x29 & UINT8_C(0xff)); + uint8_t x33 = (uint8_t)(x31 >> 8); + uint8_t x34 = (uint8_t)(x31 & UINT8_C(0xff)); + uint8_t x35 = (uint8_t)(x33 & UINT8_C(0xff)); + uint64_t x36 = (0x0 + x2); + uint64_t x37 = (x36 >> 8); + uint8_t x38 = (uint8_t)(x36 & UINT8_C(0xff)); + uint64_t x39 = (x37 >> 8); + uint8_t x40 = (uint8_t)(x37 & UINT8_C(0xff)); uint64_t x41 = (x39 >> 8); uint8_t x42 = (uint8_t)(x39 & UINT8_C(0xff)); uint64_t x43 = (x41 >> 8); @@ -1285,27 +1285,24 @@ static void fiat_secp256k1_to_bytes(uint8_t out1[32], const uint64_t arg1[4]) { uint8_t x46 = (uint8_t)(x43 & UINT8_C(0xff)); uint64_t x47 = (x45 >> 8); uint8_t x48 = (uint8_t)(x45 & UINT8_C(0xff)); - uint64_t x49 = (x47 >> 8); + uint8_t x49 = (uint8_t)(x47 >> 8); uint8_t x50 = (uint8_t)(x47 & UINT8_C(0xff)); - uint8_t x51 = (uint8_t)(x49 >> 8); - uint8_t x52 = (uint8_t)(x49 & UINT8_C(0xff)); - fiat_secp256k1_uint1 x53 = (fiat_secp256k1_uint1)(x51 >> 8); - uint8_t x54 = (uint8_t)(x51 & UINT8_C(0xff)); - uint64_t x55 = (x53 + x1); - uint64_t x56 = (x55 >> 8); - uint8_t x57 = (uint8_t)(x55 & UINT8_C(0xff)); - uint64_t x58 = (x56 >> 8); - uint8_t x59 = (uint8_t)(x56 & UINT8_C(0xff)); - uint64_t x60 = (x58 >> 8); - uint8_t x61 = (uint8_t)(x58 & UINT8_C(0xff)); - uint64_t x62 = (x60 >> 8); - uint8_t x63 = (uint8_t)(x60 & UINT8_C(0xff)); - uint64_t x64 = (x62 >> 8); - uint8_t x65 = (uint8_t)(x62 & UINT8_C(0xff)); - uint64_t x66 = (x64 >> 8); - uint8_t x67 = (uint8_t)(x64 & UINT8_C(0xff)); - uint8_t x68 = (uint8_t)(x66 >> 8); - uint8_t x69 = (uint8_t)(x66 & UINT8_C(0xff)); + uint8_t x51 = (uint8_t)(x49 & UINT8_C(0xff)); + uint64_t x52 = (0x0 + x1); + uint64_t x53 = (x52 >> 8); + uint8_t x54 = (uint8_t)(x52 & UINT8_C(0xff)); + uint64_t x55 = (x53 >> 8); + uint8_t x56 = (uint8_t)(x53 & UINT8_C(0xff)); + uint64_t x57 = (x55 >> 8); + uint8_t x58 = (uint8_t)(x55 & UINT8_C(0xff)); + uint64_t x59 = (x57 >> 8); + uint8_t x60 = (uint8_t)(x57 & UINT8_C(0xff)); + uint64_t x61 = (x59 >> 8); + uint8_t x62 = (uint8_t)(x59 & UINT8_C(0xff)); + uint64_t x63 = (x61 >> 8); + uint8_t x64 = (uint8_t)(x61 & UINT8_C(0xff)); + uint8_t x65 = (uint8_t)(x63 >> 8); + uint8_t x66 = (uint8_t)(x63 & UINT8_C(0xff)); out1[0] = x6; out1[1] = x8; out1[2] = x10; @@ -1313,31 +1310,31 @@ static void fiat_secp256k1_to_bytes(uint8_t out1[32], const uint64_t arg1[4]) { out1[4] = x14; out1[5] = x16; out1[6] = x18; - out1[7] = x20; - out1[8] = x23; - out1[9] = x25; - out1[10] = x27; - out1[11] = x29; - out1[12] = x31; - out1[13] = x33; - out1[14] = x35; - out1[15] = x37; - out1[16] = x40; - out1[17] = x42; - out1[18] = x44; - out1[19] = x46; - out1[20] = x48; - out1[21] = x50; - out1[22] = x52; - out1[23] = x54; - out1[24] = x57; - out1[25] = x59; - out1[26] = x61; - out1[27] = x63; - out1[28] = x65; - out1[29] = x67; - out1[30] = x69; - out1[31] = x68; + out1[7] = x19; + out1[8] = x22; + out1[9] = x24; + out1[10] = x26; + out1[11] = x28; + out1[12] = x30; + out1[13] = x32; + out1[14] = x34; + out1[15] = x35; + out1[16] = x38; + out1[17] = x40; + out1[18] = x42; + out1[19] = x44; + out1[20] = x46; + out1[21] = x48; + out1[22] = x50; + out1[23] = x51; + out1[24] = x54; + out1[25] = x56; + out1[26] = x58; + out1[27] = x60; + out1[28] = x62; + out1[29] = x64; + out1[30] = x66; + out1[31] = x65; } /* @@ -1380,21 +1377,18 @@ static void fiat_secp256k1_from_bytes(uint64_t out1[4], const uint8_t arg1[32]) uint64_t x31 = ((uint64_t)(arg1[1]) << 8); uint8_t x32 = (arg1[0]); uint64_t x33 = (x32 + (x31 + (x30 + (x29 + (x28 + (x27 + (x26 + x25))))))); - fiat_secp256k1_uint1 x34 = (fiat_secp256k1_uint1)((fiat_secp256k1_uint128)x33 >> 64); - uint64_t x35 = (x33 & UINT64_C(0xffffffffffffffff)); - uint64_t x36 = (x8 + (x7 + (x6 + (x5 + (x4 + (x3 + (x2 + x1))))))); - uint64_t x37 = (x16 + (x15 + (x14 + (x13 + (x12 + (x11 + (x10 + x9))))))); - uint64_t x38 = (x24 + (x23 + (x22 + (x21 + (x20 + (x19 + (x18 + x17))))))); - uint64_t x39 = (x34 + x38); - fiat_secp256k1_uint1 x40 = (fiat_secp256k1_uint1)((fiat_secp256k1_uint128)x39 >> 64); - uint64_t x41 = (x39 & UINT64_C(0xffffffffffffffff)); - uint64_t x42 = (x40 + x37); - fiat_secp256k1_uint1 x43 = (fiat_secp256k1_uint1)((fiat_secp256k1_uint128)x42 >> 64); - uint64_t x44 = (x42 & UINT64_C(0xffffffffffffffff)); - uint64_t x45 = (x43 + x36); - out1[0] = x35; - out1[1] = x41; - out1[2] = x44; - out1[3] = x45; + uint64_t x34 = (x33 & UINT64_C(0xffffffffffffffff)); + uint64_t x35 = (x8 + (x7 + (x6 + (x5 + (x4 + (x3 + (x2 + x1))))))); + uint64_t x36 = (x16 + (x15 + (x14 + (x13 + (x12 + (x11 + (x10 + x9))))))); + uint64_t x37 = (x24 + (x23 + (x22 + (x21 + (x20 + (x19 + (x18 + x17))))))); + uint64_t x38 = (0x0 + x37); + uint64_t x39 = (x38 & UINT64_C(0xffffffffffffffff)); + uint64_t x40 = (0x0 + x36); + uint64_t x41 = (x40 & UINT64_C(0xffffffffffffffff)); + uint64_t x42 = (0x0 + x35); + out1[0] = x34; + out1[1] = x39; + out1[2] = x41; + out1[3] = x42; } -- cgit v1.2.3