Merge pull request #2 from sipa/impl

Move implementations from impl/*.h to *_impl.h
bitcoin-core · Mar 12, 2014 · 8b3263b · 8b3263b
2 parents 78cb860 + 11ab562
commit 8b3263b
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 59 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -7,30 +7,30 @@ libsecp256k1_la_LIBADD = $(SECP_LIBS)
 include_HEADERS = include/secp256k1.h
 noinst_HEADERS =
 noinst_HEADERS += src/group.h
+noinst_HEADERS += src/group_impl.h
 noinst_HEADERS += src/num_openssl.h
+noinst_HEADERS += src/num_openssl_impl.h
 noinst_HEADERS += src/num_gmp.h
+noinst_HEADERS += src/num_gmp_impl.h
 noinst_HEADERS += src/ecdsa.h
+noinst_HEADERS += src/ecdsa_impl.h
 noinst_HEADERS += src/ecmult.h
+noinst_HEADERS += src/ecmult_impl.h
 noinst_HEADERS += src/num.h
+noinst_HEADERS += src/num_impl.h
 noinst_HEADERS += src/field_10x26.h
+noinst_HEADERS += src/field_10x26_impl.h
 noinst_HEADERS += src/field_5x52.h
+noinst_HEADERS += src/field_5x52_impl.h
+noinst_HEADERS += src/field_5x52_int128_impl.h
+noinst_HEADERS += src/field_5x52_asm_impl.h
 noinst_HEADERS += src/java/org_bitcoin_NativeSecp256k1.h
 noinst_HEADERS += src/util.h
+noinst_HEADERS += src/util_impl.h
 noinst_HEADERS += src/field_gmp.h
-noinst_HEADERS += src/impl/group.h
-noinst_HEADERS += src/impl/num_openssl.h
-noinst_HEADERS += src/impl/num_gmp.h
-noinst_HEADERS += src/impl/ecdsa.h
-noinst_HEADERS += src/impl/field_5x52_int128.h
-noinst_HEADERS += src/impl/ecmult.h
-noinst_HEADERS += src/impl/num.h
-noinst_HEADERS += src/impl/field_10x26.h
-noinst_HEADERS += src/impl/field_5x52.h
-noinst_HEADERS += src/impl/util.h
-noinst_HEADERS += src/impl/field_gmp.h
-noinst_HEADERS += src/impl/field_5x52_asm.h
-noinst_HEADERS += src/impl/field.h
+noinst_HEADERS += src/field_gmp_impl.h
 noinst_HEADERS += src/field.h
+noinst_HEADERS += src/field_impl.h
 
 if USE_ASM
 libsecp256k1_la_SOURCES += src/field_5x52_asm.asm

diff --git a/src/bench.c b/src/bench.c
@@ -4,12 +4,12 @@
 
 #include <stdio.h>
 
-#include "impl/num.h"
-#include "impl/field.h"
-#include "impl/group.h"
-#include "impl/ecmult.h"
-#include "impl/ecdsa.h"
-#include "impl/util.h"
+#include "num_impl.h"
+#include "field_impl.h"
+#include "group_impl.h"
+#include "ecmult_impl.h"
+#include "ecdsa_impl.h"
+#include "util_impl.h"
 
 void random_num_order(secp256k1_num_t *num) {
     do {

diff --git a/src/impl/ecdsa.h → src/ecdsa_impl.h b/src/impl/ecdsa.h → src/ecdsa_impl.h
@@ -5,11 +5,11 @@
 #ifndef _SECP256K1_ECDSA_IMPL_H_
 #define _SECP256K1_ECDSA_IMPL_H_
 
-#include "../num.h"
-#include "../field.h"
-#include "../group.h"
-#include "../ecmult.h"
-#include "../ecdsa.h"
+#include "num.h"
+#include "field.h"
+#include "group.h"
+#include "ecmult.h"
+#include "ecdsa.h"
 
 void static secp256k1_ecdsa_sig_init(secp256k1_ecdsa_sig_t *r) {
     secp256k1_num_init(&r->r);

diff --git a/src/impl/ecmult.h → src/ecmult_impl.h b/src/impl/ecmult.h → src/ecmult_impl.h
@@ -5,9 +5,9 @@
 #ifndef _SECP256K1_ECMULT_IMPL_H_
 #define _SECP256K1_ECMULT_IMPL_H_
 
-#include "../num.h"
-#include "../group.h"
-#include "../ecmult.h"
+#include "num.h"
+#include "group.h"
+#include "ecmult.h"
 
 // optimal for 128-bit and 256-bit exponents.
 #define WINDOW_A 5

diff --git a/src/impl/field_10x26.h → src/field_10x26_impl.h b/src/impl/field_10x26.h → src/field_10x26_impl.h
@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
-#include "../num.h"
-#include "../field.h"
+#include "num.h"
+#include "field.h"
 
 void static secp256k1_fe_inner_start(void) {}
 void static secp256k1_fe_inner_stop(void) {}

diff --git a/src/impl/field_5x52_asm.h → src/field_5x52_asm_impl.h b/src/impl/field_5x52_asm.h → src/field_5x52_asm_impl.h
diff --git a/src/impl/field_5x52.h → src/field_5x52_impl.h b/src/impl/field_5x52.h → src/field_5x52_impl.h
@@ -11,13 +11,13 @@
 
 #include <assert.h>
 #include <string.h>
-#include "../num.h"
-#include "../field.h"
+#include "num.h"
+#include "field.h"
 
 #if defined(USE_FIELD_5X52_ASM)
-#include "field_5x52_asm.h"
+#include "field_5x52_asm_impl.h"
 #elif defined(USE_FIELD_5X52_INT128)
-#include "field_5x52_int128.h"
+#include "field_5x52_int128_impl.h"
 #else
 #error "Please select field_5x52 implementation"
 #endif

diff --git a/src/impl/field_5x52_int128.h → src/field_5x52_int128_impl.h b/src/impl/field_5x52_int128.h → src/field_5x52_int128_impl.h
diff --git a/src/impl/field_gmp.h → src/field_gmp_impl.h b/src/impl/field_gmp.h → src/field_gmp_impl.h
@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
-#include "../num.h"
-#include "../field.h"
+#include "num.h"
+#include "field.h"
 
 static mp_limb_t secp256k1_field_p[FIELD_LIMBS];
 static mp_limb_t secp256k1_field_pc[(33+GMP_NUMB_BITS-1)/GMP_NUMB_BITS];

diff --git a/src/impl/field.h → src/field_impl.h b/src/impl/field.h → src/field_impl.h
@@ -10,11 +10,11 @@
 #endif
 
 #if defined(USE_FIELD_GMP)
-#include "field_gmp.h"
+#include "field_gmp_impl.h"
 #elif defined(USE_FIELD_10X26)
-#include "field_10x26.h"
+#include "field_10x26_impl.h"
 #elif defined(USE_FIELD_5X52)
-#include "field_5x52.h"
+#include "field_5x52_impl.h"
 #else
 #error "Please select field implementation"
 #endif

diff --git a/src/impl/group.h → src/group_impl.h b/src/impl/group.h → src/group_impl.h
@@ -7,9 +7,9 @@
 
 #include <string.h>
 
-#include "../num.h"
-#include "../field.h"
-#include "../group.h"
+#include "num.h"
+#include "field.h"
+#include "group.h"
 
 void static secp256k1_ge_set_infinity(secp256k1_ge_t *r) {
     r->infinity = 1;

diff --git a/src/impl/num_gmp.h → src/num_gmp_impl.h b/src/impl/num_gmp.h → src/num_gmp_impl.h
diff --git a/src/impl/num.h → src/num_impl.h b/src/impl/num.h → src/num_impl.h
@@ -9,12 +9,12 @@
 #include "libsecp256k1-config.h"
 #endif
 
-#include "../num.h"
+#include "num.h"
 
 #if defined(USE_NUM_GMP)
-#include "num_gmp.h"
+#include "num_gmp_impl.h"
 #elif defined(USE_NUM_OPENSSL)
-#include "num_openssl.h"
+#include "num_openssl_impl.h"
 #else
 #error "Please select num implementation"
 #endif

diff --git a/src/impl/num_openssl.h → src/num_openssl_impl.h b/src/impl/num_openssl.h → src/num_openssl_impl.h
@@ -11,7 +11,7 @@
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
 
-#include "../num.h"
+#include "num.h"
 
 void static secp256k1_num_init(secp256k1_num_t *r) {
     BN_init(&r->bn);

diff --git a/src/secp256k1.c b/src/secp256k1.c
@@ -2,11 +2,11 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "impl/num.h"
-#include "impl/field.h"
-#include "impl/group.h"
-#include "impl/ecmult.h"
-#include "impl/ecdsa.h"
+#include "num_impl.h"
+#include "field_impl.h"
+#include "group_impl.h"
+#include "ecmult_impl.h"
+#include "ecdsa_impl.h"
 
 void secp256k1_start(void) {
     secp256k1_fe_start();

diff --git a/src/tests.c b/src/tests.c
@@ -9,12 +9,12 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "impl/num.h"
-#include "impl/field.h"
-#include "impl/group.h"
-#include "impl/ecmult.h"
-#include "impl/ecdsa.h"
-#include "impl/util.h"
+#include "num_impl.h"
+#include "field_impl.h"
+#include "group_impl.h"
+#include "ecmult_impl.h"
+#include "ecdsa_impl.h"
+#include "util_impl.h"
 
 #ifdef ENABLE_OPENSSL_TESTS
 #include "openssl/bn.h"

diff --git a/src/util.h b/src/util.h
@@ -14,6 +14,4 @@ static void secp256k1_rand256(unsigned char *b32);
 /** Generate a pseudorandom 32-byte array with long sequences of zero and one bits. */
 static void secp256k1_rand256_test(unsigned char *b32);
 
-#include "impl/util.h"
-
 #endif
diff --git a/src/impl/util.h → src/util_impl.h b/src/impl/util.h → src/util_impl.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "../util.h"
+#include "util.h"
 
 static inline uint32_t secp256k1_rand32(void) {
     static uint32_t Rz = 11, Rw = 11;