Browse Source

Source tree reorganization

master
Pieter Wuille 10 years ago
parent
commit
2d93809255
  1. 46
      Makefile
  2. 0
      include/secp256k1.h
  3. 0
      src/bench.cpp
  4. 0
      src/ecdsa.cpp
  5. 0
      src/ecdsa.h
  6. 0
      src/ecmult.cpp
  7. 0
      src/ecmult.h
  8. 2
      src/field.cpp
  9. 0
      src/field.h
  10. 2
      src/field_5x52.cpp
  11. 0
      src/field_5x52.h
  12. 0
      src/field_5x52_asm.asm
  13. 0
      src/field_5x52_asm.cpp
  14. 0
      src/field_5x52_int128.cpp
  15. 0
      src/group.cpp
  16. 0
      src/group.h
  17. 0
      src/num.cpp
  18. 0
      src/num.h
  19. 0
      src/num_builtin.h
  20. 0
      src/num_gmp.cpp
  21. 0
      src/num_gmp.h
  22. 0
      src/num_openssl.cpp
  23. 0
      src/num_openssl.h
  24. 0
      src/num_openssl_.cpp
  25. 0
      src/secp256k1.cpp
  26. 0
      src/tests.cpp

46
Makefile

@ -3,39 +3,44 @@ FLAGS_PROD:=-DNDEBUG -O2 -march=native @@ -3,39 +3,44 @@ FLAGS_PROD:=-DNDEBUG -O2 -march=native
FLAGS_DEBUG:=-DVERIFY -ggdb3 -O1
FLAGS_TEST:=-DVERIFY -ggdb3 -O2 -march=native
SECP256K1_FILES := num.h field.h field_5x52.h group.h ecmult.h ecdsa.h \
num.cpp field.cpp field_5x52.cpp group.cpp ecmult.cpp ecdsa.cpp
SECP256K1_FILES := src/num.h src/field.h src/field_5x52.h src/group.h src/ecmult.h src/ecdsa.h \
src/num.cpp src/field.cpp src/field_5x52.cpp src/group.cpp src/ecmult.cpp src/ecdsa.cpp
ifndef CONF
CONF := gmp
endif
OBJS := obj/secp256k1-$(CONF).o
default: all
ifeq ($(CONF), openssl)
FLAGS_CONF:=-DUSE_NUM_OPENSSL -DUSE_FIELDINVERSE_BUILTIN
FLAGS_CONF:=-DUSE_NUM_OPENSSL -DUSE_FIELD_INV_BUILTIN
LIBS:=-lcrypto
SECP256K1_FILES := $(SECP256K1_FILES) num_openssl.h num_openssl.cpp field_5x52_int128.cpp
SECP256K1_FILES := $(SECP256K1_FILES) src/num_openssl.h src/num_openssl.cpp src/field_5x52_int128.cpp
else
ifeq ($(CONF), gmp)
FLAGS_CONF:=-DUSE_NUM_GMP
LIBS:=-lgmp
SECP256K1_FILES := $(SECP256K1_FILES) num_gmp.h num_gmp.cpp field_5x52_int128.cpp
SECP256K1_FILES := $(SECP256K1_FILES) src/num_gmp.h src/num_gmp.cpp src/field_5x52_int128.cpp
else
ifeq ($(CONF), gmpasm)
FLAGS_CONF:=-DUSE_NUM_GMP -DINLINE_ASM
FLAGS_CONF:=-DUSE_NUM_GMP -DUSE_FIELD_5X52_ASM
LIBS:=-lgmp obj/field_5x52_asm.o
SECP256K1_FILES := $(SECP256K1_FILES) num_gmp.h num_gmp.cpp field_5x52_asm.cpp obj/field_5x52_asm.o
OBJS:=$(OBJS) obj/field_5x52_asm.o
SECP256K1_FILES := $(SECP256K1_FILES) src/num_gmp.h src/num_gmp.cpp src/field_5x52_asm.cpp
obj/field_5x52_asm.o: field_5x52_asm.asm
yasm -f elf64 -o obj/field_5x52_asm.o field_5x52_asm.asm
obj/field_5x52_asm.o: src/field_5x52_asm.asm
yasm -f elf64 -o obj/field_5x52_asm.o src/field_5x52_asm.asm
else
SECP256K1_FILES := $(SECP256K1_FILES) field_5x52_int128.cpp
SECP256K1_FILES := $(SECP256K1_FILES) src/field_5x52_int128.cpp
endif
endif
endif
all: *.cpp *.asm *.h
all: src/*.cpp src/*.asm src/*.h include/*.h
+make CONF=openssl all-openssl
+make CONF=gmp all-gmp
+make CONF=gmpasm all-gmpasm
@ -48,16 +53,19 @@ clean: @@ -48,16 +53,19 @@ clean:
bench-any: bench-$(CONF)
tests-any: tests-$(CONF)
all-$(CONF): bench-$(CONF) tests-$(CONF) obj/secp256k1-$(CONF).o
all-$(CONF): bench-$(CONF) tests-$(CONF) libsecp256k1-$(CONF).a
clean-$(CONF):
rm -f bench-$(CONF) tests-$(CONF) obj/secp256k1-$(CONF).o
rm -f bench-$(CONF) tests-$(CONF) libsecp256k1-$(CONF).a obj/*
obj/secp256k1-$(CONF).o: $(SECP256K1_FILES) src/secp256k1.cpp include/secp256k1.h
$(CXX) $(FLAGS_COMMON) $(FLAGS_PROD) $(FLAGS_CONF) src/secp256k1.cpp -c -o obj/secp256k1-$(CONF).o
obj/secp256k1-$(CONF).o: $(SECP256K1_FILES)
$(CXX) $(FLAGS_COMMON) $(FLAGS_PROD) $(FLAGS_CONF) secp256k1.cpp -c -o obj/secp256k1-$(CONF).o
bench-$(CONF): $(OBJS) src/bench.cpp
$(CXX) $(FLAGS_COMMON) $(FLAGS_PROD) $(FLAGS_CONF) src/bench.cpp $(LIBS) -o bench-$(CONF)
bench-$(CONF): $(SECP256K1_FILES) bench.cpp
$(CXX) $(FLAGS_COMMON) $(FLAGS_PROD) $(FLAGS_CONF) bench.cpp $(LIBS) -o bench-$(CONF)
tests-$(CONF): $(OBJS) src/tests.cpp
$(CXX) $(FLAGS_COMMON) $(FLAGS_TEST) $(FLAGS_CONF) src/tests.cpp $(LIBS) -o tests-$(CONF)
tests-$(CONF): $(SECP256K1_FILES) tests.cpp
$(CXX) $(FLAGS_COMMON) $(FLAGS_TEST) $(FLAGS_CONF) tests.cpp $(LIBS) -o tests-$(CONF)
libsecp256k1-$(CONF).a: $(OBJS)
$(AR) -rs $@ $(OBJS)

0
secp256k1.h → include/secp256k1.h

0
bench.cpp → src/bench.cpp

0
ecdsa.cpp → src/ecdsa.cpp

0
ecdsa.h → src/ecdsa.h

0
ecmult.cpp → src/ecmult.cpp

0
ecmult.h → src/ecmult.h

2
field.cpp → src/field.cpp

@ -135,7 +135,7 @@ void static secp256k1_fe_inv(secp256k1_fe_t *r, const secp256k1_fe_t *a) { @@ -135,7 +135,7 @@ void static secp256k1_fe_inv(secp256k1_fe_t *r, const secp256k1_fe_t *a) {
}
void static secp256k1_fe_inv_var(secp256k1_fe_t *r, const secp256k1_fe_t *a) {
#if defined(USE_FIELDINVERSE_BUILTIN)
#if defined(USE_FIELD_INV_BUILTIN)
secp256k1_fe_inv(r, a);
#else
unsigned char b[32];

0
field.h → src/field.h

2
field_5x52.cpp → src/field_5x52.cpp

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
#include "num.h"
#include "field.h"
#ifdef INLINE_ASM
#ifdef USE_FIELD_5X52_ASM
#include "field_5x52_asm.cpp"
#else
#include "field_5x52_int128.cpp"

0
field_5x52.h → src/field_5x52.h

0
field_5x52_asm.asm → src/field_5x52_asm.asm

0
field_5x52_asm.cpp → src/field_5x52_asm.cpp

0
field_5x52_int128.cpp → src/field_5x52_int128.cpp

0
group.cpp → src/group.cpp

0
group.h → src/group.h

0
num.cpp → src/num.cpp

0
num.h → src/num.h

0
num_builtin.h → src/num_builtin.h

0
num_gmp.cpp → src/num_gmp.cpp

0
num_gmp.h → src/num_gmp.h

0
num_openssl.cpp → src/num_openssl.cpp

0
num_openssl.h → src/num_openssl.h

0
num_openssl_.cpp → src/num_openssl_.cpp

0
secp256k1.cpp → src/secp256k1.cpp

0
tests.cpp → src/tests.cpp

Loading…
Cancel
Save