From 31d31d23fbb6c9b3b7f01bd270cf72328f754594 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Sun, 31 Mar 2019 14:35:38 -0400 Subject: Rebuild .c files It seems some commutativity has changed --- secp256k1_64.c | 412 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 206 insertions(+), 206 deletions(-) (limited to 'secp256k1_64.c') diff --git a/secp256k1_64.c b/secp256k1_64.c index 2706759bd..72245e439 100644 --- a/secp256k1_64.c +++ b/secp256k1_64.c @@ -136,16 +136,16 @@ static void fiat_secp256k1_mul(uint64_t out1[4], const uint64_t arg1[4], const u fiat_secp256k1_mulx_u64(&x11, &x12, x4, (arg2[0])); uint64_t x13; fiat_secp256k1_uint1 x14; - fiat_secp256k1_addcarryx_u64(&x13, &x14, 0x0, x9, x12); + fiat_secp256k1_addcarryx_u64(&x13, &x14, 0x0, x12, x9); uint64_t x15; fiat_secp256k1_uint1 x16; - fiat_secp256k1_addcarryx_u64(&x15, &x16, x14, x7, x10); + fiat_secp256k1_addcarryx_u64(&x15, &x16, x14, x10, x7); uint64_t x17; fiat_secp256k1_uint1 x18; - fiat_secp256k1_addcarryx_u64(&x17, &x18, x16, x5, x8); + fiat_secp256k1_addcarryx_u64(&x17, &x18, x16, x8, x5); uint64_t x19; fiat_secp256k1_uint1 x20; - fiat_secp256k1_addcarryx_u64(&x19, &x20, x18, 0x0, x6); + fiat_secp256k1_addcarryx_u64(&x19, &x20, x18, x6, 0x0); uint64_t x21; uint64_t x22; fiat_secp256k1_mulx_u64(&x21, &x22, x11, UINT64_C(0xd838091dd2253531)); @@ -163,31 +163,31 @@ static void fiat_secp256k1_mul(uint64_t out1[4], const uint64_t arg1[4], const u fiat_secp256k1_mulx_u64(&x29, &x30, x21, UINT64_C(0xfffffffefffffc2f)); uint64_t x31; fiat_secp256k1_uint1 x32; - fiat_secp256k1_addcarryx_u64(&x31, &x32, 0x0, x27, x30); + fiat_secp256k1_addcarryx_u64(&x31, &x32, 0x0, x30, x27); uint64_t x33; fiat_secp256k1_uint1 x34; - fiat_secp256k1_addcarryx_u64(&x33, &x34, x32, x25, x28); + fiat_secp256k1_addcarryx_u64(&x33, &x34, x32, x28, x25); uint64_t x35; fiat_secp256k1_uint1 x36; - fiat_secp256k1_addcarryx_u64(&x35, &x36, x34, x23, x26); + fiat_secp256k1_addcarryx_u64(&x35, &x36, x34, x26, x23); uint64_t x37; fiat_secp256k1_uint1 x38; - fiat_secp256k1_addcarryx_u64(&x37, &x38, x36, 0x0, x24); + fiat_secp256k1_addcarryx_u64(&x37, &x38, x36, x24, 0x0); uint64_t x39; fiat_secp256k1_uint1 x40; - fiat_secp256k1_addcarryx_u64(&x39, &x40, 0x0, x29, x11); + fiat_secp256k1_addcarryx_u64(&x39, &x40, 0x0, x11, x29); uint64_t x41; fiat_secp256k1_uint1 x42; - fiat_secp256k1_addcarryx_u64(&x41, &x42, x40, x31, x13); + fiat_secp256k1_addcarryx_u64(&x41, &x42, x40, x13, x31); uint64_t x43; fiat_secp256k1_uint1 x44; - fiat_secp256k1_addcarryx_u64(&x43, &x44, x42, x33, x15); + fiat_secp256k1_addcarryx_u64(&x43, &x44, x42, x15, x33); uint64_t x45; fiat_secp256k1_uint1 x46; - fiat_secp256k1_addcarryx_u64(&x45, &x46, x44, x35, x17); + fiat_secp256k1_addcarryx_u64(&x45, &x46, x44, x17, x35); uint64_t x47; fiat_secp256k1_uint1 x48; - fiat_secp256k1_addcarryx_u64(&x47, &x48, x46, x37, x19); + fiat_secp256k1_addcarryx_u64(&x47, &x48, x46, x19, x37); uint64_t x49; fiat_secp256k1_uint1 x50; fiat_secp256k1_addcarryx_u64(&x49, &x50, x48, 0x0, 0x0); @@ -205,31 +205,31 @@ static void fiat_secp256k1_mul(uint64_t out1[4], const uint64_t arg1[4], const u fiat_secp256k1_mulx_u64(&x57, &x58, x1, (arg2[0])); uint64_t x59; fiat_secp256k1_uint1 x60; - fiat_secp256k1_addcarryx_u64(&x59, &x60, 0x0, x55, x58); + fiat_secp256k1_addcarryx_u64(&x59, &x60, 0x0, x58, x55); uint64_t x61; fiat_secp256k1_uint1 x62; - fiat_secp256k1_addcarryx_u64(&x61, &x62, x60, x53, x56); + fiat_secp256k1_addcarryx_u64(&x61, &x62, x60, x56, x53); uint64_t x63; fiat_secp256k1_uint1 x64; - fiat_secp256k1_addcarryx_u64(&x63, &x64, x62, x51, x54); + fiat_secp256k1_addcarryx_u64(&x63, &x64, x62, x54, x51); uint64_t x65; fiat_secp256k1_uint1 x66; - fiat_secp256k1_addcarryx_u64(&x65, &x66, x64, 0x0, x52); + fiat_secp256k1_addcarryx_u64(&x65, &x66, x64, x52, 0x0); uint64_t x67; fiat_secp256k1_uint1 x68; - fiat_secp256k1_addcarryx_u64(&x67, &x68, 0x0, x57, x41); + fiat_secp256k1_addcarryx_u64(&x67, &x68, 0x0, x41, x57); uint64_t x69; fiat_secp256k1_uint1 x70; - fiat_secp256k1_addcarryx_u64(&x69, &x70, x68, x59, x43); + fiat_secp256k1_addcarryx_u64(&x69, &x70, x68, x43, x59); uint64_t x71; fiat_secp256k1_uint1 x72; - fiat_secp256k1_addcarryx_u64(&x71, &x72, x70, x61, x45); + fiat_secp256k1_addcarryx_u64(&x71, &x72, x70, x45, x61); uint64_t x73; fiat_secp256k1_uint1 x74; - fiat_secp256k1_addcarryx_u64(&x73, &x74, x72, x63, x47); + fiat_secp256k1_addcarryx_u64(&x73, &x74, x72, x47, x63); uint64_t x75; fiat_secp256k1_uint1 x76; - fiat_secp256k1_addcarryx_u64(&x75, &x76, x74, x65, (fiat_secp256k1_uint1)x49); + fiat_secp256k1_addcarryx_u64(&x75, &x76, x74, (fiat_secp256k1_uint1)x49, x65); uint64_t x77; uint64_t x78; fiat_secp256k1_mulx_u64(&x77, &x78, x67, UINT64_C(0xd838091dd2253531)); @@ -247,34 +247,34 @@ static void fiat_secp256k1_mul(uint64_t out1[4], const uint64_t arg1[4], const u fiat_secp256k1_mulx_u64(&x85, &x86, x77, UINT64_C(0xfffffffefffffc2f)); uint64_t x87; fiat_secp256k1_uint1 x88; - fiat_secp256k1_addcarryx_u64(&x87, &x88, 0x0, x83, x86); + fiat_secp256k1_addcarryx_u64(&x87, &x88, 0x0, x86, x83); uint64_t x89; fiat_secp256k1_uint1 x90; - fiat_secp256k1_addcarryx_u64(&x89, &x90, x88, x81, x84); + fiat_secp256k1_addcarryx_u64(&x89, &x90, x88, x84, x81); uint64_t x91; fiat_secp256k1_uint1 x92; - fiat_secp256k1_addcarryx_u64(&x91, &x92, x90, x79, x82); + fiat_secp256k1_addcarryx_u64(&x91, &x92, x90, x82, x79); uint64_t x93; fiat_secp256k1_uint1 x94; - fiat_secp256k1_addcarryx_u64(&x93, &x94, x92, 0x0, x80); + fiat_secp256k1_addcarryx_u64(&x93, &x94, x92, x80, 0x0); uint64_t x95; fiat_secp256k1_uint1 x96; - fiat_secp256k1_addcarryx_u64(&x95, &x96, 0x0, x85, x67); + fiat_secp256k1_addcarryx_u64(&x95, &x96, 0x0, x67, x85); uint64_t x97; fiat_secp256k1_uint1 x98; - fiat_secp256k1_addcarryx_u64(&x97, &x98, x96, x87, x69); + fiat_secp256k1_addcarryx_u64(&x97, &x98, x96, x69, x87); uint64_t x99; fiat_secp256k1_uint1 x100; - fiat_secp256k1_addcarryx_u64(&x99, &x100, x98, x89, x71); + fiat_secp256k1_addcarryx_u64(&x99, &x100, x98, x71, x89); uint64_t x101; fiat_secp256k1_uint1 x102; - fiat_secp256k1_addcarryx_u64(&x101, &x102, x100, x91, x73); + fiat_secp256k1_addcarryx_u64(&x101, &x102, x100, x73, x91); uint64_t x103; fiat_secp256k1_uint1 x104; - fiat_secp256k1_addcarryx_u64(&x103, &x104, x102, x93, x75); + fiat_secp256k1_addcarryx_u64(&x103, &x104, x102, x75, x93); uint64_t x105; fiat_secp256k1_uint1 x106; - fiat_secp256k1_addcarryx_u64(&x105, &x106, x104, 0x0, x76); + fiat_secp256k1_addcarryx_u64(&x105, &x106, x104, x76, 0x0); uint64_t x107; uint64_t x108; fiat_secp256k1_mulx_u64(&x107, &x108, x2, (arg2[3])); @@ -289,31 +289,31 @@ static void fiat_secp256k1_mul(uint64_t out1[4], const uint64_t arg1[4], const u fiat_secp256k1_mulx_u64(&x113, &x114, x2, (arg2[0])); uint64_t x115; fiat_secp256k1_uint1 x116; - fiat_secp256k1_addcarryx_u64(&x115, &x116, 0x0, x111, x114); + fiat_secp256k1_addcarryx_u64(&x115, &x116, 0x0, x114, x111); uint64_t x117; fiat_secp256k1_uint1 x118; - fiat_secp256k1_addcarryx_u64(&x117, &x118, x116, x109, x112); + fiat_secp256k1_addcarryx_u64(&x117, &x118, x116, x112, x109); uint64_t x119; fiat_secp256k1_uint1 x120; - fiat_secp256k1_addcarryx_u64(&x119, &x120, x118, x107, x110); + fiat_secp256k1_addcarryx_u64(&x119, &x120, x118, x110, x107); uint64_t x121; fiat_secp256k1_uint1 x122; - fiat_secp256k1_addcarryx_u64(&x121, &x122, x120, 0x0, x108); + fiat_secp256k1_addcarryx_u64(&x121, &x122, x120, x108, 0x0); uint64_t x123; fiat_secp256k1_uint1 x124; - fiat_secp256k1_addcarryx_u64(&x123, &x124, 0x0, x113, x97); + fiat_secp256k1_addcarryx_u64(&x123, &x124, 0x0, x97, x113); uint64_t x125; fiat_secp256k1_uint1 x126; - fiat_secp256k1_addcarryx_u64(&x125, &x126, x124, x115, x99); + fiat_secp256k1_addcarryx_u64(&x125, &x126, x124, x99, x115); uint64_t x127; fiat_secp256k1_uint1 x128; - fiat_secp256k1_addcarryx_u64(&x127, &x128, x126, x117, x101); + fiat_secp256k1_addcarryx_u64(&x127, &x128, x126, x101, x117); uint64_t x129; fiat_secp256k1_uint1 x130; - fiat_secp256k1_addcarryx_u64(&x129, &x130, x128, x119, x103); + fiat_secp256k1_addcarryx_u64(&x129, &x130, x128, x103, x119); uint64_t x131; fiat_secp256k1_uint1 x132; - fiat_secp256k1_addcarryx_u64(&x131, &x132, x130, x121, x105); + fiat_secp256k1_addcarryx_u64(&x131, &x132, x130, x105, x121); uint64_t x133; uint64_t x134; fiat_secp256k1_mulx_u64(&x133, &x134, x123, UINT64_C(0xd838091dd2253531)); @@ -331,34 +331,34 @@ static void fiat_secp256k1_mul(uint64_t out1[4], const uint64_t arg1[4], const u fiat_secp256k1_mulx_u64(&x141, &x142, x133, UINT64_C(0xfffffffefffffc2f)); uint64_t x143; fiat_secp256k1_uint1 x144; - fiat_secp256k1_addcarryx_u64(&x143, &x144, 0x0, x139, x142); + fiat_secp256k1_addcarryx_u64(&x143, &x144, 0x0, x142, x139); uint64_t x145; fiat_secp256k1_uint1 x146; - fiat_secp256k1_addcarryx_u64(&x145, &x146, x144, x137, x140); + fiat_secp256k1_addcarryx_u64(&x145, &x146, x144, x140, x137); uint64_t x147; fiat_secp256k1_uint1 x148; - fiat_secp256k1_addcarryx_u64(&x147, &x148, x146, x135, x138); + fiat_secp256k1_addcarryx_u64(&x147, &x148, x146, x138, x135); uint64_t x149; fiat_secp256k1_uint1 x150; - fiat_secp256k1_addcarryx_u64(&x149, &x150, x148, 0x0, x136); + fiat_secp256k1_addcarryx_u64(&x149, &x150, x148, x136, 0x0); uint64_t x151; fiat_secp256k1_uint1 x152; - fiat_secp256k1_addcarryx_u64(&x151, &x152, 0x0, x141, x123); + fiat_secp256k1_addcarryx_u64(&x151, &x152, 0x0, x123, x141); uint64_t x153; fiat_secp256k1_uint1 x154; - fiat_secp256k1_addcarryx_u64(&x153, &x154, x152, x143, x125); + fiat_secp256k1_addcarryx_u64(&x153, &x154, x152, x125, x143); uint64_t x155; fiat_secp256k1_uint1 x156; - fiat_secp256k1_addcarryx_u64(&x155, &x156, x154, x145, x127); + fiat_secp256k1_addcarryx_u64(&x155, &x156, x154, x127, x145); uint64_t x157; fiat_secp256k1_uint1 x158; - fiat_secp256k1_addcarryx_u64(&x157, &x158, x156, x147, x129); + fiat_secp256k1_addcarryx_u64(&x157, &x158, x156, x129, x147); uint64_t x159; fiat_secp256k1_uint1 x160; - fiat_secp256k1_addcarryx_u64(&x159, &x160, x158, x149, x131); + fiat_secp256k1_addcarryx_u64(&x159, &x160, x158, x131, x149); uint64_t x161; fiat_secp256k1_uint1 x162; - fiat_secp256k1_addcarryx_u64(&x161, &x162, x160, 0x0, x132); + fiat_secp256k1_addcarryx_u64(&x161, &x162, x160, x132, 0x0); uint64_t x163; uint64_t x164; fiat_secp256k1_mulx_u64(&x163, &x164, x3, (arg2[3])); @@ -373,31 +373,31 @@ static void fiat_secp256k1_mul(uint64_t out1[4], const uint64_t arg1[4], const u fiat_secp256k1_mulx_u64(&x169, &x170, x3, (arg2[0])); uint64_t x171; fiat_secp256k1_uint1 x172; - fiat_secp256k1_addcarryx_u64(&x171, &x172, 0x0, x167, x170); + fiat_secp256k1_addcarryx_u64(&x171, &x172, 0x0, x170, x167); uint64_t x173; fiat_secp256k1_uint1 x174; - fiat_secp256k1_addcarryx_u64(&x173, &x174, x172, x165, x168); + fiat_secp256k1_addcarryx_u64(&x173, &x174, x172, x168, x165); uint64_t x175; fiat_secp256k1_uint1 x176; - fiat_secp256k1_addcarryx_u64(&x175, &x176, x174, x163, x166); + fiat_secp256k1_addcarryx_u64(&x175, &x176, x174, x166, x163); uint64_t x177; fiat_secp256k1_uint1 x178; - fiat_secp256k1_addcarryx_u64(&x177, &x178, x176, 0x0, x164); + fiat_secp256k1_addcarryx_u64(&x177, &x178, x176, x164, 0x0); uint64_t x179; fiat_secp256k1_uint1 x180; - fiat_secp256k1_addcarryx_u64(&x179, &x180, 0x0, x169, x153); + fiat_secp256k1_addcarryx_u64(&x179, &x180, 0x0, x153, x169); uint64_t x181; fiat_secp256k1_uint1 x182; - fiat_secp256k1_addcarryx_u64(&x181, &x182, x180, x171, x155); + fiat_secp256k1_addcarryx_u64(&x181, &x182, x180, x155, x171); uint64_t x183; fiat_secp256k1_uint1 x184; - fiat_secp256k1_addcarryx_u64(&x183, &x184, x182, x173, x157); + fiat_secp256k1_addcarryx_u64(&x183, &x184, x182, x157, x173); uint64_t x185; fiat_secp256k1_uint1 x186; - fiat_secp256k1_addcarryx_u64(&x185, &x186, x184, x175, x159); + fiat_secp256k1_addcarryx_u64(&x185, &x186, x184, x159, x175); uint64_t x187; fiat_secp256k1_uint1 x188; - fiat_secp256k1_addcarryx_u64(&x187, &x188, x186, x177, x161); + fiat_secp256k1_addcarryx_u64(&x187, &x188, x186, x161, x177); uint64_t x189; uint64_t x190; fiat_secp256k1_mulx_u64(&x189, &x190, x179, UINT64_C(0xd838091dd2253531)); @@ -415,34 +415,34 @@ static void fiat_secp256k1_mul(uint64_t out1[4], const uint64_t arg1[4], const u fiat_secp256k1_mulx_u64(&x197, &x198, x189, UINT64_C(0xfffffffefffffc2f)); uint64_t x199; fiat_secp256k1_uint1 x200; - fiat_secp256k1_addcarryx_u64(&x199, &x200, 0x0, x195, x198); + fiat_secp256k1_addcarryx_u64(&x199, &x200, 0x0, x198, x195); uint64_t x201; fiat_secp256k1_uint1 x202; - fiat_secp256k1_addcarryx_u64(&x201, &x202, x200, x193, x196); + fiat_secp256k1_addcarryx_u64(&x201, &x202, x200, x196, x193); uint64_t x203; fiat_secp256k1_uint1 x204; - fiat_secp256k1_addcarryx_u64(&x203, &x204, x202, x191, x194); + fiat_secp256k1_addcarryx_u64(&x203, &x204, x202, x194, x191); uint64_t x205; fiat_secp256k1_uint1 x206; - fiat_secp256k1_addcarryx_u64(&x205, &x206, x204, 0x0, x192); + fiat_secp256k1_addcarryx_u64(&x205, &x206, x204, x192, 0x0); uint64_t x207; fiat_secp256k1_uint1 x208; - fiat_secp256k1_addcarryx_u64(&x207, &x208, 0x0, x197, x179); + fiat_secp256k1_addcarryx_u64(&x207, &x208, 0x0, x179, x197); uint64_t x209; fiat_secp256k1_uint1 x210; - fiat_secp256k1_addcarryx_u64(&x209, &x210, x208, x199, x181); + fiat_secp256k1_addcarryx_u64(&x209, &x210, x208, x181, x199); uint64_t x211; fiat_secp256k1_uint1 x212; - fiat_secp256k1_addcarryx_u64(&x211, &x212, x210, x201, x183); + fiat_secp256k1_addcarryx_u64(&x211, &x212, x210, x183, x201); uint64_t x213; fiat_secp256k1_uint1 x214; - fiat_secp256k1_addcarryx_u64(&x213, &x214, x212, x203, x185); + fiat_secp256k1_addcarryx_u64(&x213, &x214, x212, x185, x203); uint64_t x215; fiat_secp256k1_uint1 x216; - fiat_secp256k1_addcarryx_u64(&x215, &x216, x214, x205, x187); + fiat_secp256k1_addcarryx_u64(&x215, &x216, x214, x187, x205); uint64_t x217; fiat_secp256k1_uint1 x218; - fiat_secp256k1_addcarryx_u64(&x217, &x218, x216, 0x0, x188); + fiat_secp256k1_addcarryx_u64(&x217, &x218, x216, x188, 0x0); uint64_t x219; fiat_secp256k1_uint1 x220; fiat_secp256k1_subborrowx_u64(&x219, &x220, 0x0, x209, UINT64_C(0xfffffffefffffc2f)); @@ -504,16 +504,16 @@ static void fiat_secp256k1_square(uint64_t out1[4], const uint64_t arg1[4]) { fiat_secp256k1_mulx_u64(&x11, &x12, x4, (arg1[0])); uint64_t x13; fiat_secp256k1_uint1 x14; - fiat_secp256k1_addcarryx_u64(&x13, &x14, 0x0, x9, x12); + fiat_secp256k1_addcarryx_u64(&x13, &x14, 0x0, x12, x9); uint64_t x15; fiat_secp256k1_uint1 x16; - fiat_secp256k1_addcarryx_u64(&x15, &x16, x14, x7, x10); + fiat_secp256k1_addcarryx_u64(&x15, &x16, x14, x10, x7); uint64_t x17; fiat_secp256k1_uint1 x18; - fiat_secp256k1_addcarryx_u64(&x17, &x18, x16, x5, x8); + fiat_secp256k1_addcarryx_u64(&x17, &x18, x16, x8, x5); uint64_t x19; fiat_secp256k1_uint1 x20; - fiat_secp256k1_addcarryx_u64(&x19, &x20, x18, 0x0, x6); + fiat_secp256k1_addcarryx_u64(&x19, &x20, x18, x6, 0x0); uint64_t x21; uint64_t x22; fiat_secp256k1_mulx_u64(&x21, &x22, x11, UINT64_C(0xd838091dd2253531)); @@ -531,31 +531,31 @@ static void fiat_secp256k1_square(uint64_t out1[4], const uint64_t arg1[4]) { fiat_secp256k1_mulx_u64(&x29, &x30, x21, UINT64_C(0xfffffffefffffc2f)); uint64_t x31; fiat_secp256k1_uint1 x32; - fiat_secp256k1_addcarryx_u64(&x31, &x32, 0x0, x27, x30); + fiat_secp256k1_addcarryx_u64(&x31, &x32, 0x0, x30, x27); uint64_t x33; fiat_secp256k1_uint1 x34; - fiat_secp256k1_addcarryx_u64(&x33, &x34, x32, x25, x28); + fiat_secp256k1_addcarryx_u64(&x33, &x34, x32, x28, x25); uint64_t x35; fiat_secp256k1_uint1 x36; - fiat_secp256k1_addcarryx_u64(&x35, &x36, x34, x23, x26); + fiat_secp256k1_addcarryx_u64(&x35, &x36, x34, x26, x23); uint64_t x37; fiat_secp256k1_uint1 x38; - fiat_secp256k1_addcarryx_u64(&x37, &x38, x36, 0x0, x24); + fiat_secp256k1_addcarryx_u64(&x37, &x38, x36, x24, 0x0); uint64_t x39; fiat_secp256k1_uint1 x40; - fiat_secp256k1_addcarryx_u64(&x39, &x40, 0x0, x29, x11); + fiat_secp256k1_addcarryx_u64(&x39, &x40, 0x0, x11, x29); uint64_t x41; fiat_secp256k1_uint1 x42; - fiat_secp256k1_addcarryx_u64(&x41, &x42, x40, x31, x13); + fiat_secp256k1_addcarryx_u64(&x41, &x42, x40, x13, x31); uint64_t x43; fiat_secp256k1_uint1 x44; - fiat_secp256k1_addcarryx_u64(&x43, &x44, x42, x33, x15); + fiat_secp256k1_addcarryx_u64(&x43, &x44, x42, x15, x33); uint64_t x45; fiat_secp256k1_uint1 x46; - fiat_secp256k1_addcarryx_u64(&x45, &x46, x44, x35, x17); + fiat_secp256k1_addcarryx_u64(&x45, &x46, x44, x17, x35); uint64_t x47; fiat_secp256k1_uint1 x48; - fiat_secp256k1_addcarryx_u64(&x47, &x48, x46, x37, x19); + fiat_secp256k1_addcarryx_u64(&x47, &x48, x46, x19, x37); uint64_t x49; fiat_secp256k1_uint1 x50; fiat_secp256k1_addcarryx_u64(&x49, &x50, x48, 0x0, 0x0); @@ -573,31 +573,31 @@ static void fiat_secp256k1_square(uint64_t out1[4], const uint64_t arg1[4]) { fiat_secp256k1_mulx_u64(&x57, &x58, x1, (arg1[0])); uint64_t x59; fiat_secp256k1_uint1 x60; - fiat_secp256k1_addcarryx_u64(&x59, &x60, 0x0, x55, x58); + fiat_secp256k1_addcarryx_u64(&x59, &x60, 0x0, x58, x55); uint64_t x61; fiat_secp256k1_uint1 x62; - fiat_secp256k1_addcarryx_u64(&x61, &x62, x60, x53, x56); + fiat_secp256k1_addcarryx_u64(&x61, &x62, x60, x56, x53); uint64_t x63; fiat_secp256k1_uint1 x64; - fiat_secp256k1_addcarryx_u64(&x63, &x64, x62, x51, x54); + fiat_secp256k1_addcarryx_u64(&x63, &x64, x62, x54, x51); uint64_t x65; fiat_secp256k1_uint1 x66; - fiat_secp256k1_addcarryx_u64(&x65, &x66, x64, 0x0, x52); + fiat_secp256k1_addcarryx_u64(&x65, &x66, x64, x52, 0x0); uint64_t x67; fiat_secp256k1_uint1 x68; - fiat_secp256k1_addcarryx_u64(&x67, &x68, 0x0, x57, x41); + fiat_secp256k1_addcarryx_u64(&x67, &x68, 0x0, x41, x57); uint64_t x69; fiat_secp256k1_uint1 x70; - fiat_secp256k1_addcarryx_u64(&x69, &x70, x68, x59, x43); + fiat_secp256k1_addcarryx_u64(&x69, &x70, x68, x43, x59); uint64_t x71; fiat_secp256k1_uint1 x72; - fiat_secp256k1_addcarryx_u64(&x71, &x72, x70, x61, x45); + fiat_secp256k1_addcarryx_u64(&x71, &x72, x70, x45, x61); uint64_t x73; fiat_secp256k1_uint1 x74; - fiat_secp256k1_addcarryx_u64(&x73, &x74, x72, x63, x47); + fiat_secp256k1_addcarryx_u64(&x73, &x74, x72, x47, x63); uint64_t x75; fiat_secp256k1_uint1 x76; - fiat_secp256k1_addcarryx_u64(&x75, &x76, x74, x65, (fiat_secp256k1_uint1)x49); + fiat_secp256k1_addcarryx_u64(&x75, &x76, x74, (fiat_secp256k1_uint1)x49, x65); uint64_t x77; uint64_t x78; fiat_secp256k1_mulx_u64(&x77, &x78, x67, UINT64_C(0xd838091dd2253531)); @@ -615,34 +615,34 @@ static void fiat_secp256k1_square(uint64_t out1[4], const uint64_t arg1[4]) { fiat_secp256k1_mulx_u64(&x85, &x86, x77, UINT64_C(0xfffffffefffffc2f)); uint64_t x87; fiat_secp256k1_uint1 x88; - fiat_secp256k1_addcarryx_u64(&x87, &x88, 0x0, x83, x86); + fiat_secp256k1_addcarryx_u64(&x87, &x88, 0x0, x86, x83); uint64_t x89; fiat_secp256k1_uint1 x90; - fiat_secp256k1_addcarryx_u64(&x89, &x90, x88, x81, x84); + fiat_secp256k1_addcarryx_u64(&x89, &x90, x88, x84, x81); uint64_t x91; fiat_secp256k1_uint1 x92; - fiat_secp256k1_addcarryx_u64(&x91, &x92, x90, x79, x82); + fiat_secp256k1_addcarryx_u64(&x91, &x92, x90, x82, x79); uint64_t x93; fiat_secp256k1_uint1 x94; - fiat_secp256k1_addcarryx_u64(&x93, &x94, x92, 0x0, x80); + fiat_secp256k1_addcarryx_u64(&x93, &x94, x92, x80, 0x0); uint64_t x95; fiat_secp256k1_uint1 x96; - fiat_secp256k1_addcarryx_u64(&x95, &x96, 0x0, x85, x67); + fiat_secp256k1_addcarryx_u64(&x95, &x96, 0x0, x67, x85); uint64_t x97; fiat_secp256k1_uint1 x98; - fiat_secp256k1_addcarryx_u64(&x97, &x98, x96, x87, x69); + fiat_secp256k1_addcarryx_u64(&x97, &x98, x96, x69, x87); uint64_t x99; fiat_secp256k1_uint1 x100; - fiat_secp256k1_addcarryx_u64(&x99, &x100, x98, x89, x71); + fiat_secp256k1_addcarryx_u64(&x99, &x100, x98, x71, x89); uint64_t x101; fiat_secp256k1_uint1 x102; - fiat_secp256k1_addcarryx_u64(&x101, &x102, x100, x91, x73); + fiat_secp256k1_addcarryx_u64(&x101, &x102, x100, x73, x91); uint64_t x103; fiat_secp256k1_uint1 x104; - fiat_secp256k1_addcarryx_u64(&x103, &x104, x102, x93, x75); + fiat_secp256k1_addcarryx_u64(&x103, &x104, x102, x75, x93); uint64_t x105; fiat_secp256k1_uint1 x106; - fiat_secp256k1_addcarryx_u64(&x105, &x106, x104, 0x0, x76); + fiat_secp256k1_addcarryx_u64(&x105, &x106, x104, x76, 0x0); uint64_t x107; uint64_t x108; fiat_secp256k1_mulx_u64(&x107, &x108, x2, (arg1[3])); @@ -657,31 +657,31 @@ static void fiat_secp256k1_square(uint64_t out1[4], const uint64_t arg1[4]) { fiat_secp256k1_mulx_u64(&x113, &x114, x2, (arg1[0])); uint64_t x115; fiat_secp256k1_uint1 x116; - fiat_secp256k1_addcarryx_u64(&x115, &x116, 0x0, x111, x114); + fiat_secp256k1_addcarryx_u64(&x115, &x116, 0x0, x114, x111); uint64_t x117; fiat_secp256k1_uint1 x118; - fiat_secp256k1_addcarryx_u64(&x117, &x118, x116, x109, x112); + fiat_secp256k1_addcarryx_u64(&x117, &x118, x116, x112, x109); uint64_t x119; fiat_secp256k1_uint1 x120; - fiat_secp256k1_addcarryx_u64(&x119, &x120, x118, x107, x110); + fiat_secp256k1_addcarryx_u64(&x119, &x120, x118, x110, x107); uint64_t x121; fiat_secp256k1_uint1 x122; - fiat_secp256k1_addcarryx_u64(&x121, &x122, x120, 0x0, x108); + fiat_secp256k1_addcarryx_u64(&x121, &x122, x120, x108, 0x0); uint64_t x123; fiat_secp256k1_uint1 x124; - fiat_secp256k1_addcarryx_u64(&x123, &x124, 0x0, x113, x97); + fiat_secp256k1_addcarryx_u64(&x123, &x124, 0x0, x97, x113); uint64_t x125; fiat_secp256k1_uint1 x126; - fiat_secp256k1_addcarryx_u64(&x125, &x126, x124, x115, x99); + fiat_secp256k1_addcarryx_u64(&x125, &x126, x124, x99, x115); uint64_t x127; fiat_secp256k1_uint1 x128; - fiat_secp256k1_addcarryx_u64(&x127, &x128, x126, x117, x101); + fiat_secp256k1_addcarryx_u64(&x127, &x128, x126, x101, x117); uint64_t x129; fiat_secp256k1_uint1 x130; - fiat_secp256k1_addcarryx_u64(&x129, &x130, x128, x119, x103); + fiat_secp256k1_addcarryx_u64(&x129, &x130, x128, x103, x119); uint64_t x131; fiat_secp256k1_uint1 x132; - fiat_secp256k1_addcarryx_u64(&x131, &x132, x130, x121, x105); + fiat_secp256k1_addcarryx_u64(&x131, &x132, x130, x105, x121); uint64_t x133; uint64_t x134; fiat_secp256k1_mulx_u64(&x133, &x134, x123, UINT64_C(0xd838091dd2253531)); @@ -699,34 +699,34 @@ static void fiat_secp256k1_square(uint64_t out1[4], const uint64_t arg1[4]) { fiat_secp256k1_mulx_u64(&x141, &x142, x133, UINT64_C(0xfffffffefffffc2f)); uint64_t x143; fiat_secp256k1_uint1 x144; - fiat_secp256k1_addcarryx_u64(&x143, &x144, 0x0, x139, x142); + fiat_secp256k1_addcarryx_u64(&x143, &x144, 0x0, x142, x139); uint64_t x145; fiat_secp256k1_uint1 x146; - fiat_secp256k1_addcarryx_u64(&x145, &x146, x144, x137, x140); + fiat_secp256k1_addcarryx_u64(&x145, &x146, x144, x140, x137); uint64_t x147; fiat_secp256k1_uint1 x148; - fiat_secp256k1_addcarryx_u64(&x147, &x148, x146, x135, x138); + fiat_secp256k1_addcarryx_u64(&x147, &x148, x146, x138, x135); uint64_t x149; fiat_secp256k1_uint1 x150; - fiat_secp256k1_addcarryx_u64(&x149, &x150, x148, 0x0, x136); + fiat_secp256k1_addcarryx_u64(&x149, &x150, x148, x136, 0x0); uint64_t x151; fiat_secp256k1_uint1 x152; - fiat_secp256k1_addcarryx_u64(&x151, &x152, 0x0, x141, x123); + fiat_secp256k1_addcarryx_u64(&x151, &x152, 0x0, x123, x141); uint64_t x153; fiat_secp256k1_uint1 x154; - fiat_secp256k1_addcarryx_u64(&x153, &x154, x152, x143, x125); + fiat_secp256k1_addcarryx_u64(&x153, &x154, x152, x125, x143); uint64_t x155; fiat_secp256k1_uint1 x156; - fiat_secp256k1_addcarryx_u64(&x155, &x156, x154, x145, x127); + fiat_secp256k1_addcarryx_u64(&x155, &x156, x154, x127, x145); uint64_t x157; fiat_secp256k1_uint1 x158; - fiat_secp256k1_addcarryx_u64(&x157, &x158, x156, x147, x129); + fiat_secp256k1_addcarryx_u64(&x157, &x158, x156, x129, x147); uint64_t x159; fiat_secp256k1_uint1 x160; - fiat_secp256k1_addcarryx_u64(&x159, &x160, x158, x149, x131); + fiat_secp256k1_addcarryx_u64(&x159, &x160, x158, x131, x149); uint64_t x161; fiat_secp256k1_uint1 x162; - fiat_secp256k1_addcarryx_u64(&x161, &x162, x160, 0x0, x132); + fiat_secp256k1_addcarryx_u64(&x161, &x162, x160, x132, 0x0); uint64_t x163; uint64_t x164; fiat_secp256k1_mulx_u64(&x163, &x164, x3, (arg1[3])); @@ -741,31 +741,31 @@ static void fiat_secp256k1_square(uint64_t out1[4], const uint64_t arg1[4]) { fiat_secp256k1_mulx_u64(&x169, &x170, x3, (arg1[0])); uint64_t x171; fiat_secp256k1_uint1 x172; - fiat_secp256k1_addcarryx_u64(&x171, &x172, 0x0, x167, x170); + fiat_secp256k1_addcarryx_u64(&x171, &x172, 0x0, x170, x167); uint64_t x173; fiat_secp256k1_uint1 x174; - fiat_secp256k1_addcarryx_u64(&x173, &x174, x172, x165, x168); + fiat_secp256k1_addcarryx_u64(&x173, &x174, x172, x168, x165); uint64_t x175; fiat_secp256k1_uint1 x176; - fiat_secp256k1_addcarryx_u64(&x175, &x176, x174, x163, x166); + fiat_secp256k1_addcarryx_u64(&x175, &x176, x174, x166, x163); uint64_t x177; fiat_secp256k1_uint1 x178; - fiat_secp256k1_addcarryx_u64(&x177, &x178, x176, 0x0, x164); + fiat_secp256k1_addcarryx_u64(&x177, &x178, x176, x164, 0x0); uint64_t x179; fiat_secp256k1_uint1 x180; - fiat_secp256k1_addcarryx_u64(&x179, &x180, 0x0, x169, x153); + fiat_secp256k1_addcarryx_u64(&x179, &x180, 0x0, x153, x169); uint64_t x181; fiat_secp256k1_uint1 x182; - fiat_secp256k1_addcarryx_u64(&x181, &x182, x180, x171, x155); + fiat_secp256k1_addcarryx_u64(&x181, &x182, x180, x155, x171); uint64_t x183; fiat_secp256k1_uint1 x184; - fiat_secp256k1_addcarryx_u64(&x183, &x184, x182, x173, x157); + fiat_secp256k1_addcarryx_u64(&x183, &x184, x182, x157, x173); uint64_t x185; fiat_secp256k1_uint1 x186; - fiat_secp256k1_addcarryx_u64(&x185, &x186, x184, x175, x159); + fiat_secp256k1_addcarryx_u64(&x185, &x186, x184, x159, x175); uint64_t x187; fiat_secp256k1_uint1 x188; - fiat_secp256k1_addcarryx_u64(&x187, &x188, x186, x177, x161); + fiat_secp256k1_addcarryx_u64(&x187, &x188, x186, x161, x177); uint64_t x189; uint64_t x190; fiat_secp256k1_mulx_u64(&x189, &x190, x179, UINT64_C(0xd838091dd2253531)); @@ -783,34 +783,34 @@ static void fiat_secp256k1_square(uint64_t out1[4], const uint64_t arg1[4]) { fiat_secp256k1_mulx_u64(&x197, &x198, x189, UINT64_C(0xfffffffefffffc2f)); uint64_t x199; fiat_secp256k1_uint1 x200; - fiat_secp256k1_addcarryx_u64(&x199, &x200, 0x0, x195, x198); + fiat_secp256k1_addcarryx_u64(&x199, &x200, 0x0, x198, x195); uint64_t x201; fiat_secp256k1_uint1 x202; - fiat_secp256k1_addcarryx_u64(&x201, &x202, x200, x193, x196); + fiat_secp256k1_addcarryx_u64(&x201, &x202, x200, x196, x193); uint64_t x203; fiat_secp256k1_uint1 x204; - fiat_secp256k1_addcarryx_u64(&x203, &x204, x202, x191, x194); + fiat_secp256k1_addcarryx_u64(&x203, &x204, x202, x194, x191); uint64_t x205; fiat_secp256k1_uint1 x206; - fiat_secp256k1_addcarryx_u64(&x205, &x206, x204, 0x0, x192); + fiat_secp256k1_addcarryx_u64(&x205, &x206, x204, x192, 0x0); uint64_t x207; fiat_secp256k1_uint1 x208; - fiat_secp256k1_addcarryx_u64(&x207, &x208, 0x0, x197, x179); + fiat_secp256k1_addcarryx_u64(&x207, &x208, 0x0, x179, x197); uint64_t x209; fiat_secp256k1_uint1 x210; - fiat_secp256k1_addcarryx_u64(&x209, &x210, x208, x199, x181); + fiat_secp256k1_addcarryx_u64(&x209, &x210, x208, x181, x199); uint64_t x211; fiat_secp256k1_uint1 x212; - fiat_secp256k1_addcarryx_u64(&x211, &x212, x210, x201, x183); + fiat_secp256k1_addcarryx_u64(&x211, &x212, x210, x183, x201); uint64_t x213; fiat_secp256k1_uint1 x214; - fiat_secp256k1_addcarryx_u64(&x213, &x214, x212, x203, x185); + fiat_secp256k1_addcarryx_u64(&x213, &x214, x212, x185, x203); uint64_t x215; fiat_secp256k1_uint1 x216; - fiat_secp256k1_addcarryx_u64(&x215, &x216, x214, x205, x187); + fiat_secp256k1_addcarryx_u64(&x215, &x216, x214, x187, x205); uint64_t x217; fiat_secp256k1_uint1 x218; - fiat_secp256k1_addcarryx_u64(&x217, &x218, x216, 0x0, x188); + fiat_secp256k1_addcarryx_u64(&x217, &x218, x216, x188, 0x0); uint64_t x219; fiat_secp256k1_uint1 x220; fiat_secp256k1_subborrowx_u64(&x219, &x220, 0x0, x209, UINT64_C(0xfffffffefffffc2f)); @@ -858,16 +858,16 @@ static void fiat_secp256k1_square(uint64_t out1[4], const uint64_t arg1[4]) { static void fiat_secp256k1_add(uint64_t out1[4], const uint64_t arg1[4], const uint64_t arg2[4]) { uint64_t x1; fiat_secp256k1_uint1 x2; - fiat_secp256k1_addcarryx_u64(&x1, &x2, 0x0, (arg2[0]), (arg1[0])); + fiat_secp256k1_addcarryx_u64(&x1, &x2, 0x0, (arg1[0]), (arg2[0])); uint64_t x3; fiat_secp256k1_uint1 x4; - fiat_secp256k1_addcarryx_u64(&x3, &x4, x2, (arg2[1]), (arg1[1])); + fiat_secp256k1_addcarryx_u64(&x3, &x4, x2, (arg1[1]), (arg2[1])); uint64_t x5; fiat_secp256k1_uint1 x6; - fiat_secp256k1_addcarryx_u64(&x5, &x6, x4, (arg2[2]), (arg1[2])); + fiat_secp256k1_addcarryx_u64(&x5, &x6, x4, (arg1[2]), (arg2[2])); uint64_t x7; fiat_secp256k1_uint1 x8; - fiat_secp256k1_addcarryx_u64(&x7, &x8, x6, (arg2[3]), (arg1[3])); + fiat_secp256k1_addcarryx_u64(&x7, &x8, x6, (arg1[3]), (arg2[3])); uint64_t x9; fiat_secp256k1_uint1 x10; fiat_secp256k1_subborrowx_u64(&x9, &x10, 0x0, x1, UINT64_C(0xfffffffefffffc2f)); @@ -929,16 +929,16 @@ static void fiat_secp256k1_sub(uint64_t out1[4], const uint64_t arg1[4], const u fiat_secp256k1_cmovznz_u64(&x9, x8, 0x0, UINT64_C(0xffffffffffffffff)); uint64_t x10; fiat_secp256k1_uint1 x11; - fiat_secp256k1_addcarryx_u64(&x10, &x11, 0x0, (x9 & UINT64_C(0xfffffffefffffc2f)), x1); + fiat_secp256k1_addcarryx_u64(&x10, &x11, 0x0, x1, (x9 & UINT64_C(0xfffffffefffffc2f))); uint64_t x12; fiat_secp256k1_uint1 x13; - fiat_secp256k1_addcarryx_u64(&x12, &x13, x11, (x9 & UINT64_C(0xffffffffffffffff)), x3); + fiat_secp256k1_addcarryx_u64(&x12, &x13, x11, x3, (x9 & UINT64_C(0xffffffffffffffff))); uint64_t x14; fiat_secp256k1_uint1 x15; - fiat_secp256k1_addcarryx_u64(&x14, &x15, x13, (x9 & UINT64_C(0xffffffffffffffff)), x5); + fiat_secp256k1_addcarryx_u64(&x14, &x15, x13, x5, (x9 & UINT64_C(0xffffffffffffffff))); uint64_t x16; fiat_secp256k1_uint1 x17; - fiat_secp256k1_addcarryx_u64(&x16, &x17, x15, (x9 & UINT64_C(0xffffffffffffffff)), x7); + fiat_secp256k1_addcarryx_u64(&x16, &x17, x15, x7, (x9 & UINT64_C(0xffffffffffffffff))); out1[0] = x10; out1[1] = x12; out1[2] = x14; @@ -975,16 +975,16 @@ static void fiat_secp256k1_opp(uint64_t out1[4], const uint64_t arg1[4]) { fiat_secp256k1_cmovznz_u64(&x9, x8, 0x0, UINT64_C(0xffffffffffffffff)); uint64_t x10; fiat_secp256k1_uint1 x11; - fiat_secp256k1_addcarryx_u64(&x10, &x11, 0x0, (x9 & UINT64_C(0xfffffffefffffc2f)), x1); + fiat_secp256k1_addcarryx_u64(&x10, &x11, 0x0, x1, (x9 & UINT64_C(0xfffffffefffffc2f))); uint64_t x12; fiat_secp256k1_uint1 x13; - fiat_secp256k1_addcarryx_u64(&x12, &x13, x11, (x9 & UINT64_C(0xffffffffffffffff)), x3); + fiat_secp256k1_addcarryx_u64(&x12, &x13, x11, x3, (x9 & UINT64_C(0xffffffffffffffff))); uint64_t x14; fiat_secp256k1_uint1 x15; - fiat_secp256k1_addcarryx_u64(&x14, &x15, x13, (x9 & UINT64_C(0xffffffffffffffff)), x5); + fiat_secp256k1_addcarryx_u64(&x14, &x15, x13, x5, (x9 & UINT64_C(0xffffffffffffffff))); uint64_t x16; fiat_secp256k1_uint1 x17; - fiat_secp256k1_addcarryx_u64(&x16, &x17, x15, (x9 & UINT64_C(0xffffffffffffffff)), x7); + fiat_secp256k1_addcarryx_u64(&x16, &x17, x15, x7, (x9 & UINT64_C(0xffffffffffffffff))); out1[0] = x10; out1[1] = x12; out1[2] = x14; @@ -1023,43 +1023,43 @@ static void fiat_secp256k1_from_montgomery(uint64_t out1[4], const uint64_t arg1 fiat_secp256k1_mulx_u64(&x10, &x11, x2, UINT64_C(0xfffffffefffffc2f)); uint64_t x12; fiat_secp256k1_uint1 x13; - fiat_secp256k1_addcarryx_u64(&x12, &x13, 0x0, x8, x11); + fiat_secp256k1_addcarryx_u64(&x12, &x13, 0x0, x11, x8); uint64_t x14; fiat_secp256k1_uint1 x15; - fiat_secp256k1_addcarryx_u64(&x14, &x15, x13, x6, x9); + fiat_secp256k1_addcarryx_u64(&x14, &x15, x13, x9, x6); uint64_t x16; fiat_secp256k1_uint1 x17; - fiat_secp256k1_addcarryx_u64(&x16, &x17, x15, x4, x7); + fiat_secp256k1_addcarryx_u64(&x16, &x17, x15, x7, x4); uint64_t x18; fiat_secp256k1_uint1 x19; - fiat_secp256k1_addcarryx_u64(&x18, &x19, 0x0, x10, x1); + fiat_secp256k1_addcarryx_u64(&x18, &x19, 0x0, x1, x10); uint64_t x20; fiat_secp256k1_uint1 x21; - fiat_secp256k1_addcarryx_u64(&x20, &x21, x19, x12, 0x0); + fiat_secp256k1_addcarryx_u64(&x20, &x21, x19, 0x0, x12); uint64_t x22; fiat_secp256k1_uint1 x23; - fiat_secp256k1_addcarryx_u64(&x22, &x23, x21, x14, 0x0); + fiat_secp256k1_addcarryx_u64(&x22, &x23, x21, 0x0, x14); uint64_t x24; fiat_secp256k1_uint1 x25; - fiat_secp256k1_addcarryx_u64(&x24, &x25, x23, x16, 0x0); + fiat_secp256k1_addcarryx_u64(&x24, &x25, x23, 0x0, x16); uint64_t x26; fiat_secp256k1_uint1 x27; - fiat_secp256k1_addcarryx_u64(&x26, &x27, x17, 0x0, x5); + fiat_secp256k1_addcarryx_u64(&x26, &x27, x17, x5, 0x0); uint64_t x28; fiat_secp256k1_uint1 x29; - fiat_secp256k1_addcarryx_u64(&x28, &x29, x25, x26, 0x0); + fiat_secp256k1_addcarryx_u64(&x28, &x29, x25, 0x0, x26); uint64_t x30; fiat_secp256k1_uint1 x31; - fiat_secp256k1_addcarryx_u64(&x30, &x31, 0x0, (arg1[1]), x20); + fiat_secp256k1_addcarryx_u64(&x30, &x31, 0x0, x20, (arg1[1])); uint64_t x32; fiat_secp256k1_uint1 x33; - fiat_secp256k1_addcarryx_u64(&x32, &x33, x31, 0x0, x22); + fiat_secp256k1_addcarryx_u64(&x32, &x33, x31, x22, 0x0); uint64_t x34; fiat_secp256k1_uint1 x35; - fiat_secp256k1_addcarryx_u64(&x34, &x35, x33, 0x0, x24); + fiat_secp256k1_addcarryx_u64(&x34, &x35, x33, x24, 0x0); uint64_t x36; fiat_secp256k1_uint1 x37; - fiat_secp256k1_addcarryx_u64(&x36, &x37, x35, 0x0, x28); + fiat_secp256k1_addcarryx_u64(&x36, &x37, x35, x28, 0x0); uint64_t x38; uint64_t x39; fiat_secp256k1_mulx_u64(&x38, &x39, x30, UINT64_C(0xd838091dd2253531)); @@ -1077,49 +1077,49 @@ static void fiat_secp256k1_from_montgomery(uint64_t out1[4], const uint64_t arg1 fiat_secp256k1_mulx_u64(&x46, &x47, x38, UINT64_C(0xfffffffefffffc2f)); uint64_t x48; fiat_secp256k1_uint1 x49; - fiat_secp256k1_addcarryx_u64(&x48, &x49, 0x0, x44, x47); + fiat_secp256k1_addcarryx_u64(&x48, &x49, 0x0, x47, x44); uint64_t x50; fiat_secp256k1_uint1 x51; - fiat_secp256k1_addcarryx_u64(&x50, &x51, x49, x42, x45); + fiat_secp256k1_addcarryx_u64(&x50, &x51, x49, x45, x42); uint64_t x52; fiat_secp256k1_uint1 x53; - fiat_secp256k1_addcarryx_u64(&x52, &x53, x51, x40, x43); + fiat_secp256k1_addcarryx_u64(&x52, &x53, x51, x43, x40); uint64_t x54; fiat_secp256k1_uint1 x55; - fiat_secp256k1_addcarryx_u64(&x54, &x55, 0x0, x46, x30); + fiat_secp256k1_addcarryx_u64(&x54, &x55, 0x0, x30, x46); uint64_t x56; fiat_secp256k1_uint1 x57; - fiat_secp256k1_addcarryx_u64(&x56, &x57, x55, x48, x32); + fiat_secp256k1_addcarryx_u64(&x56, &x57, x55, x32, x48); uint64_t x58; fiat_secp256k1_uint1 x59; - fiat_secp256k1_addcarryx_u64(&x58, &x59, x57, x50, x34); + fiat_secp256k1_addcarryx_u64(&x58, &x59, x57, x34, x50); uint64_t x60; fiat_secp256k1_uint1 x61; - fiat_secp256k1_addcarryx_u64(&x60, &x61, x59, x52, x36); + fiat_secp256k1_addcarryx_u64(&x60, &x61, x59, x36, x52); uint64_t x62; fiat_secp256k1_uint1 x63; - fiat_secp256k1_addcarryx_u64(&x62, &x63, x29, 0x0, 0x0); + fiat_secp256k1_addcarryx_u64(&x62, &x63, x53, x41, 0x0); uint64_t x64; fiat_secp256k1_uint1 x65; - fiat_secp256k1_addcarryx_u64(&x64, &x65, x37, 0x0, (fiat_secp256k1_uint1)x62); + fiat_secp256k1_addcarryx_u64(&x64, &x65, x29, 0x0, 0x0); uint64_t x66; fiat_secp256k1_uint1 x67; - fiat_secp256k1_addcarryx_u64(&x66, &x67, x53, 0x0, x41); + fiat_secp256k1_addcarryx_u64(&x66, &x67, x37, (fiat_secp256k1_uint1)x64, 0x0); uint64_t x68; fiat_secp256k1_uint1 x69; - fiat_secp256k1_addcarryx_u64(&x68, &x69, x61, x66, x64); + fiat_secp256k1_addcarryx_u64(&x68, &x69, x61, x66, x62); uint64_t x70; fiat_secp256k1_uint1 x71; - fiat_secp256k1_addcarryx_u64(&x70, &x71, 0x0, (arg1[2]), x56); + fiat_secp256k1_addcarryx_u64(&x70, &x71, 0x0, x56, (arg1[2])); uint64_t x72; fiat_secp256k1_uint1 x73; - fiat_secp256k1_addcarryx_u64(&x72, &x73, x71, 0x0, x58); + fiat_secp256k1_addcarryx_u64(&x72, &x73, x71, x58, 0x0); uint64_t x74; fiat_secp256k1_uint1 x75; - fiat_secp256k1_addcarryx_u64(&x74, &x75, x73, 0x0, x60); + fiat_secp256k1_addcarryx_u64(&x74, &x75, x73, x60, 0x0); uint64_t x76; fiat_secp256k1_uint1 x77; - fiat_secp256k1_addcarryx_u64(&x76, &x77, x75, 0x0, x68); + fiat_secp256k1_addcarryx_u64(&x76, &x77, x75, x68, 0x0); uint64_t x78; uint64_t x79; fiat_secp256k1_mulx_u64(&x78, &x79, x70, UINT64_C(0xd838091dd2253531)); @@ -1137,49 +1137,49 @@ static void fiat_secp256k1_from_montgomery(uint64_t out1[4], const uint64_t arg1 fiat_secp256k1_mulx_u64(&x86, &x87, x78, UINT64_C(0xfffffffefffffc2f)); uint64_t x88; fiat_secp256k1_uint1 x89; - fiat_secp256k1_addcarryx_u64(&x88, &x89, 0x0, x84, x87); + fiat_secp256k1_addcarryx_u64(&x88, &x89, 0x0, x87, x84); uint64_t x90; fiat_secp256k1_uint1 x91; - fiat_secp256k1_addcarryx_u64(&x90, &x91, x89, x82, x85); + fiat_secp256k1_addcarryx_u64(&x90, &x91, x89, x85, x82); uint64_t x92; fiat_secp256k1_uint1 x93; - fiat_secp256k1_addcarryx_u64(&x92, &x93, x91, x80, x83); + fiat_secp256k1_addcarryx_u64(&x92, &x93, x91, x83, x80); uint64_t x94; fiat_secp256k1_uint1 x95; - fiat_secp256k1_addcarryx_u64(&x94, &x95, 0x0, x86, x70); + fiat_secp256k1_addcarryx_u64(&x94, &x95, 0x0, x70, x86); uint64_t x96; fiat_secp256k1_uint1 x97; - fiat_secp256k1_addcarryx_u64(&x96, &x97, x95, x88, x72); + fiat_secp256k1_addcarryx_u64(&x96, &x97, x95, x72, x88); uint64_t x98; fiat_secp256k1_uint1 x99; - fiat_secp256k1_addcarryx_u64(&x98, &x99, x97, x90, x74); + fiat_secp256k1_addcarryx_u64(&x98, &x99, x97, x74, x90); uint64_t x100; fiat_secp256k1_uint1 x101; - fiat_secp256k1_addcarryx_u64(&x100, &x101, x99, x92, x76); + fiat_secp256k1_addcarryx_u64(&x100, &x101, x99, x76, x92); uint64_t x102; fiat_secp256k1_uint1 x103; - fiat_secp256k1_addcarryx_u64(&x102, &x103, x69, 0x0, 0x0); + fiat_secp256k1_addcarryx_u64(&x102, &x103, x93, x81, 0x0); uint64_t x104; fiat_secp256k1_uint1 x105; - fiat_secp256k1_addcarryx_u64(&x104, &x105, x77, 0x0, (fiat_secp256k1_uint1)x102); + fiat_secp256k1_addcarryx_u64(&x104, &x105, x69, 0x0, 0x0); uint64_t x106; fiat_secp256k1_uint1 x107; - fiat_secp256k1_addcarryx_u64(&x106, &x107, x93, 0x0, x81); + fiat_secp256k1_addcarryx_u64(&x106, &x107, x77, (fiat_secp256k1_uint1)x104, 0x0); uint64_t x108; fiat_secp256k1_uint1 x109; - fiat_secp256k1_addcarryx_u64(&x108, &x109, x101, x106, x104); + fiat_secp256k1_addcarryx_u64(&x108, &x109, x101, x106, x102); uint64_t x110; fiat_secp256k1_uint1 x111; - fiat_secp256k1_addcarryx_u64(&x110, &x111, 0x0, (arg1[3]), x96); + fiat_secp256k1_addcarryx_u64(&x110, &x111, 0x0, x96, (arg1[3])); uint64_t x112; fiat_secp256k1_uint1 x113; - fiat_secp256k1_addcarryx_u64(&x112, &x113, x111, 0x0, x98); + fiat_secp256k1_addcarryx_u64(&x112, &x113, x111, x98, 0x0); uint64_t x114; fiat_secp256k1_uint1 x115; - fiat_secp256k1_addcarryx_u64(&x114, &x115, x113, 0x0, x100); + fiat_secp256k1_addcarryx_u64(&x114, &x115, x113, x100, 0x0); uint64_t x116; fiat_secp256k1_uint1 x117; - fiat_secp256k1_addcarryx_u64(&x116, &x117, x115, 0x0, x108); + fiat_secp256k1_addcarryx_u64(&x116, &x117, x115, x108, 0x0); uint64_t x118; uint64_t x119; fiat_secp256k1_mulx_u64(&x118, &x119, x110, UINT64_C(0xd838091dd2253531)); @@ -1197,37 +1197,37 @@ static void fiat_secp256k1_from_montgomery(uint64_t out1[4], const uint64_t arg1 fiat_secp256k1_mulx_u64(&x126, &x127, x118, UINT64_C(0xfffffffefffffc2f)); uint64_t x128; fiat_secp256k1_uint1 x129; - fiat_secp256k1_addcarryx_u64(&x128, &x129, 0x0, x124, x127); + fiat_secp256k1_addcarryx_u64(&x128, &x129, 0x0, x127, x124); uint64_t x130; fiat_secp256k1_uint1 x131; - fiat_secp256k1_addcarryx_u64(&x130, &x131, x129, x122, x125); + fiat_secp256k1_addcarryx_u64(&x130, &x131, x129, x125, x122); uint64_t x132; fiat_secp256k1_uint1 x133; - fiat_secp256k1_addcarryx_u64(&x132, &x133, x131, x120, x123); + fiat_secp256k1_addcarryx_u64(&x132, &x133, x131, x123, x120); uint64_t x134; fiat_secp256k1_uint1 x135; - fiat_secp256k1_addcarryx_u64(&x134, &x135, 0x0, x126, x110); + fiat_secp256k1_addcarryx_u64(&x134, &x135, 0x0, x110, x126); uint64_t x136; fiat_secp256k1_uint1 x137; - fiat_secp256k1_addcarryx_u64(&x136, &x137, x135, x128, x112); + fiat_secp256k1_addcarryx_u64(&x136, &x137, x135, x112, x128); uint64_t x138; fiat_secp256k1_uint1 x139; - fiat_secp256k1_addcarryx_u64(&x138, &x139, x137, x130, x114); + fiat_secp256k1_addcarryx_u64(&x138, &x139, x137, x114, x130); uint64_t x140; fiat_secp256k1_uint1 x141; - fiat_secp256k1_addcarryx_u64(&x140, &x141, x139, x132, x116); + fiat_secp256k1_addcarryx_u64(&x140, &x141, x139, x116, x132); uint64_t x142; fiat_secp256k1_uint1 x143; - fiat_secp256k1_addcarryx_u64(&x142, &x143, x109, 0x0, 0x0); + fiat_secp256k1_addcarryx_u64(&x142, &x143, x133, x121, 0x0); uint64_t x144; fiat_secp256k1_uint1 x145; - fiat_secp256k1_addcarryx_u64(&x144, &x145, x117, 0x0, (fiat_secp256k1_uint1)x142); + fiat_secp256k1_addcarryx_u64(&x144, &x145, x109, 0x0, 0x0); uint64_t x146; fiat_secp256k1_uint1 x147; - fiat_secp256k1_addcarryx_u64(&x146, &x147, x133, 0x0, x121); + fiat_secp256k1_addcarryx_u64(&x146, &x147, x117, (fiat_secp256k1_uint1)x144, 0x0); uint64_t x148; fiat_secp256k1_uint1 x149; - fiat_secp256k1_addcarryx_u64(&x148, &x149, x141, x146, x144); + fiat_secp256k1_addcarryx_u64(&x148, &x149, x141, x146, x142); uint64_t x150; fiat_secp256k1_uint1 x151; fiat_secp256k1_subborrowx_u64(&x150, &x151, 0x0, x136, UINT64_C(0xfffffffefffffc2f)); -- cgit v1.2.3