Split off .c file from precomputed_ecmult.h

Author: sipa

.gitattributes

@@ -1,3 +1,4 @@
 src/precomputed_ecmult.h linguist-generated
+src/precomputed_ecmult.c linguist-generated
 src/precomputed_ecmult_gen.c linguist-generated
 src/precomputed_ecmult_gen.h linguist-generated

Makefile.am

@@ -64,7 +64,7 @@ noinst_HEADERS += contrib/lax_der_privatekey_parsing.c
 
 PRECOMPUTED_LIB = libsecp256k1_precomputed.la
 noinst_LTLIBRARIES = $(PRECOMPUTED_LIB)
-libsecp256k1_precomputed_la_SOURCES = src/precomputed_ecmult_gen.c
+libsecp256k1_precomputed_la_SOURCES = src/precomputed_ecmult.c src/precomputed_ecmult_gen.c
 libsecp256k1_precomputed_la_CPPFLAGS = $(SECP_INCLUDES)
 
 if USE_EXTERNAL_ASM
@@ -152,7 +152,7 @@ precompute_LDADD = $(SECP_LIBS) $(COMMON_LIB)
 # build by a normal user) depends on mtimes, and thus is very fragile.
 # This means that rebuilds of the prebuilt files always need to be
 # forced by deleting them, e.g., by invoking `make clean-precomp`.
-PRECOMP = src/precomputed_ecmult.h src/precomputed_ecmult_gen.h src/precomputed_ecmult_gen.c
+PRECOMP = src/precomputed_ecmult.h src/precomputed_ecmult.c src/precomputed_ecmult_gen.h src/precomputed_ecmult_gen.c
 $(PRECOMP)&:
 	$(MAKE) $(AM_MAKEFLAGS) precompute$(EXEEXT)
 	./precompute$(EXEEXT)

src/precompute.c

@@ -28,7 +28,7 @@ static void precompute_ecmult_print_table(FILE *fp, const char *name, int window
     int j;
     int i;
 
-    fprintf(fp, "static const secp256k1_ge_storage %s[ECMULT_TABLE_SIZE(WINDOW_G)] = {\n", name);
+    fprintf(fp, "const secp256k1_ge_storage %s[ECMULT_TABLE_SIZE(WINDOW_G)] = {\n", name);
 
     fprintf(fp, " S(%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32
                   ",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32",%"PRIx32")\n",
@@ -64,10 +64,16 @@ static int precompute_ecmult(void) {
     const secp256k1_ge g = SECP256K1_G;
     const int window_g_13 = 4;
     const int window_g_199 = 8;
-    FILE* fp;
+    FILE *fp, *fp_h;
 
-    fp = fopen("src/precomputed_ecmult.h","w");
+    fp = fopen("src/precomputed_ecmult.c","w");
     if (fp == NULL) {
+        fprintf(stderr, "Could not open src/precomputed_ecmult.c for writing!\n");
+        return -1;
+    }
+    fp_h = fopen("src/precomputed_ecmult.h","w");
+    if (fp_h == NULL) {
+        fclose(fp);
         fprintf(stderr, "Could not open src/precomputed_ecmult.h for writing!\n");
         return -1;
     }
@@ -76,37 +82,54 @@ static int precompute_ecmult(void) {
     fprintf(fp, "/* This file contains an array secp256k1_pre_g with odd multiples of the base point G and\n");
     fprintf(fp, " * an array secp256k1_pre_g_128 with odd multiples of 2^128*G for accelerating the computation of a*P + b*G.\n");
     fprintf(fp, " */\n");
-    fprintf(fp, "#ifndef SECP256K1_PRECOMPUTED_ECMULT_H\n");
-    fprintf(fp, "#define SECP256K1_PRECOMPUTED_ECMULT_H\n");
+    fprintf(fp, "#if defined HAVE_CONFIG_H\n");
+    fprintf(fp, "#include \"libsecp256k1-config.h\"\n");
+    fprintf(fp, "#endif\n");
+    fprintf(fp, "#include \"../include/secp256k1.h\"\n");
     fprintf(fp, "#include \"group.h\"\n");
+    fprintf(fp, "#include \"precomputed_ecmult.h\"\n");
     fprintf(fp, "#ifdef S\n");
     fprintf(fp, "   #error macro identifier S already in use.\n");
     fprintf(fp, "#endif\n");
     fprintf(fp, "#define S(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) "
                 "SECP256K1_GE_STORAGE_CONST(0x##a##u,0x##b##u,0x##c##u,0x##d##u,0x##e##u,0x##f##u,0x##g##u,"
                 "0x##h##u,0x##i##u,0x##j##u,0x##k##u,0x##l##u,0x##m##u,0x##n##u,0x##o##u,0x##p##u)\n");
-    fprintf(fp, "#if ECMULT_TABLE_SIZE(ECMULT_WINDOW_SIZE) > %ld\n", ECMULT_TABLE_SIZE(ECMULT_WINDOW_SIZE));
-    fprintf(fp, "   #error configuration mismatch, invalid ECMULT_WINDOW_SIZE. Try deleting precomputed_ecmult.h before the build.\n");
-    fprintf(fp, "#endif\n");
     fprintf(fp, "#if defined(EXHAUSTIVE_TEST_ORDER)\n");
-    fprintf(fp, "#if EXHAUSTIVE_TEST_ORDER == 13\n");
-    fprintf(fp, "#define WINDOW_G %d\n", window_g_13);
-    fprintf(fp, "#elif EXHAUSTIVE_TEST_ORDER == 199\n");
-    fprintf(fp, "#define WINDOW_G %d\n", window_g_199);
-    fprintf(fp, "#else\n");
-    fprintf(fp, "   #error No known generator for the specified exhaustive test group order.\n");
-    fprintf(fp, "#endif\n");
-    fprintf(fp, "static secp256k1_ge_storage secp256k1_pre_g[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
-    fprintf(fp, "static secp256k1_ge_storage secp256k1_pre_g_128[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
-    fprintf(fp, "#else /* !defined(EXHAUSTIVE_TEST_ORDER) */\n");
-    fprintf(fp, "#define WINDOW_G ECMULT_WINDOW_SIZE\n");
+    fprintf(fp, "#error Cannot compile precomputed_ecmult.c in exhaustive test mode\n");
+    fprintf(fp, "#endif /* EXHAUSTIVE_TEST_ORDER */\n");
 
     precompute_ecmult_print_two_tables(fp, ECMULT_WINDOW_SIZE, &g);
 
-    fprintf(fp, "#endif /* EXHAUSTIVE_TEST_ORDER */\n");
     fprintf(fp, "#undef S\n");
-    fprintf(fp, "#endif /* SECP256K1_PRECOMPUTED_ECMULT_H */\n");
     fclose(fp);
+
+    fprintf(fp_h, "/* This file was automatically generated by precompute. */\n");
+    fprintf(fp_h, "#ifndef SECP256K1_PRECOMPUTED_ECMULT_H\n");
+    fprintf(fp_h, "#define SECP256K1_PRECOMPUTED_ECMULT_H\n");
+    fprintf(fp_h, "#include \"group.h\"\n");
+    fprintf(fp_h, "#include \"ecmult.h\"\n");
+    fprintf(fp_h, "#if ECMULT_TABLE_SIZE(ECMULT_WINDOW_SIZE) > %ld\n", ECMULT_TABLE_SIZE(ECMULT_WINDOW_SIZE));
+    fprintf(fp_h, "   #error configuration mismatch, invalid ECMULT_WINDOW_SIZE. Try deleting precomputed_ecmult.h before the build.\n");
+    fprintf(fp_h, "#endif\n");
+    fprintf(fp_h, "#if defined(EXHAUSTIVE_TEST_ORDER)\n");
+    fprintf(fp_h, "#if EXHAUSTIVE_TEST_ORDER == 13\n");
+    fprintf(fp_h, "#define WINDOW_G %d\n", window_g_13);
+    fprintf(fp_h, "#elif EXHAUSTIVE_TEST_ORDER == 199\n");
+    fprintf(fp_h, "#define WINDOW_G %d\n", window_g_199);
+    fprintf(fp_h, "#else\n");
+    fprintf(fp_h, "   #error No known generator for the specified exhaustive test group order.\n");
+    fprintf(fp_h, "#endif\n");
+    fprintf(fp_h, "static secp256k1_ge_storage secp256k1_pre_g[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
+    fprintf(fp_h, "static secp256k1_ge_storage secp256k1_pre_g_128[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
+    fprintf(fp_h, "#else /* !defined(EXHAUSTIVE_TEST_ORDER) */\n");
+    fprintf(fp_h, "#define WINDOW_G ECMULT_WINDOW_SIZE\n");
+    fprintf(fp_h, "extern const secp256k1_ge_storage secp256k1_pre_g[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
+    fprintf(fp_h, "extern const secp256k1_ge_storage secp256k1_pre_g_128[ECMULT_TABLE_SIZE(WINDOW_G)];\n");
+    fprintf(fp_h, "#endif /* EXHAUSTIVE_TEST_ORDER */\n");
+    fprintf(fp_h, "#undef S\n");
+    fprintf(fp_h, "#endif /* SECP256K1_PRECOMPUTED_ECMULT_H */\n");
+    fclose(fp_h);
+
     return 0;
 }