From 2e370d1d3288b3dca6c7b20cdd81a376724276a7 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Fri, 3 Nov 2017 13:08:41 -0400 Subject: fibe: Only define bitwidth on the command line We generate the PRI macros and the limb_t type from the bitwidth in the C preprocessor My reasoning here is that generate_parameters.py and the generated *.json files are more user-facing than fibe.c, so we should optimize for cleanliness of that user-facing code. If this is the wrong direction to go in, then this commit should be reverted. --- src/Specific/CurveParameters/montgomery64_2e196m15.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Specific/CurveParameters/montgomery64_2e196m15.json') diff --git a/src/Specific/CurveParameters/montgomery64_2e196m15.json b/src/Specific/CurveParameters/montgomery64_2e196m15.json index 936dac4df..bc7bbf9bb 100644 --- a/src/Specific/CurveParameters/montgomery64_2e196m15.json +++ b/src/Specific/CurveParameters/montgomery64_2e196m15.json @@ -1,7 +1,7 @@ { "base": "64", - "compiler": "gcc -fno-peephole2 `#GCC BUG 81300` -march=native -mtune=native -std=gnu11 -O3 -flto -fomit-frame-pointer -fwrapv -Wno-attributes -Wno-incompatible-pointer-types -fno-strict-aliasing -DPRIulimb=PRIu64 -Da24_val='12345' -Dq_mpz='(1_mpz<<196) - 15' -Dlimb_t=uint64_t -Dmodulus_bytes_val='25' -Dlimb_weight_gaps_array='{64,64,64,64}' -Dmodulus_limbs='4' -Dmodulus_array='{0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf1}' -DPRIxlimb=PRIx64 -Da24_hex='0x3039' -Da_minus_two_over_four_array='{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x39}'", - "compilerxx": "g++ -fno-peephole2 `#GCC BUG 81300` -march=native -mtune=native -std=gnu++11 -O3 -flto -fomit-frame-pointer -fwrapv -Wno-attributes -fno-strict-aliasing -DPRIulimb=PRIu64 -Da24_val='12345' -Dq_mpz='(1_mpz<<196) - 15' -Dlimb_t=uint64_t -Dmodulus_bytes_val='25' -Dlimb_weight_gaps_array='{64,64,64,64}' -Dmodulus_limbs='4' -Dmodulus_array='{0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf1}' -DPRIxlimb=PRIx64 -Da24_hex='0x3039' -Da_minus_two_over_four_array='{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x39}'", + "compiler": "gcc -fno-peephole2 `#GCC BUG 81300` -march=native -mtune=native -std=gnu11 -O3 -flto -fomit-frame-pointer -fwrapv -Wno-attributes -Wno-incompatible-pointer-types -fno-strict-aliasing -Da_minus_two_over_four_array='{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x39}' -Dmodulus_limbs='4' -Da24_val='12345' -Dbitwidth='64' -Dq_mpz='(1_mpz<<196) - 15' -Dlimb_weight_gaps_array='{64,64,64,64}' -Da24_hex='0x3039' -Dmodulus_bytes_val='25' -Dmodulus_array='{0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf1}'", + "compilerxx": "g++ -fno-peephole2 `#GCC BUG 81300` -march=native -mtune=native -std=gnu++11 -O3 -flto -fomit-frame-pointer -fwrapv -Wno-attributes -fno-strict-aliasing -Da_minus_two_over_four_array='{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x39}' -Dmodulus_limbs='4' -Da24_val='12345' -Dbitwidth='64' -Dq_mpz='(1_mpz<<196) - 15' -Dlimb_weight_gaps_array='{64,64,64,64}' -Da24_hex='0x3039' -Dmodulus_bytes_val='25' -Dmodulus_array='{0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf1}'", "extra_files": [ "montgomery64/fesquare.c" ], -- cgit v1.2.3