aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--src/Specific/Framework/bench/gmpsec.c (renamed from gmpsec.c)0
-rw-r--r--src/Specific/Framework/bench/gmpvar.c (renamed from gmpvar.c)0
-rw-r--r--src/Specific/Framework/bench/gmpxx.cpp (renamed from gmpxx.cpp)0
-rw-r--r--src/Specific/Framework/bench/montladder.py (renamed from montladder.py)0
-rwxr-xr-x[-rw-r--r--]src/Specific/Framework/bench/prettyprint.py (renamed from prettyprint.py)1
6 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a41c4e692..ee318d53a 100644
--- a/Makefile
+++ b/Makefile
@@ -179,8 +179,9 @@ c: $(filter-out $(UNMADE_C_FILES),$(DISPLAY_NON_JAVA_VO:Display.vo=.c) $(DISPLAY
DISPLAY_X25519_C64_VO := $(filter src/Specific/X25519/C64/%,$(DISPLAY_NON_JAVA_VO))
DISPLAY_X25519_C32_VO := $(filter src/Specific/X25519/C32/%,$(DISPLAY_NON_JAVA_VO))
-DISPLAY_NON_JAVA_C32_VO := $(DISPLAY_X25519_C32_VO) $(filter src/Specific/solinas32% src/Specific/montgomery32%,$(DISPLAY_NON_JAVA_VO))
-DISPLAY_NON_JAVA_C64_VO := $(filter-out $(DISPLAY_NON_JAVA_C32_VO),$(DISPLAY_NON_JAVA_VO))
+DISPLAY_NON_JAVA_C32_VO := $(DISPLAY_X25519_C32_VO)
+DISPLAY_NON_JAVA_C64_VO := $(filter-out $(DISPLAY_NON_JAVA_C32_VO) $(SPECIFIC_GENERATED_VOFILES),$(DISPLAY_NON_JAVA_VO))
+DISPLAY_GENERATED_VO := $(filter $(SPECIFIC_GENERATED_VOFILES),$(DISPLAY_NON_JAVA_VO))
$(DISPLAY_NON_JAVA_C64_VO:Display.vo=.c) : %.c : %Display.log extract-function.sh
BITWIDTH=64 FIAT_CRYPTO_EXTRACT_FUNCTION_IS_ASM="" ./extract-function.sh $(patsubst %Display.log,%,$(notdir $<)) < $< > $@
@@ -194,6 +195,9 @@ $(DISPLAY_NON_JAVA_C64_VO:Display.vo=.h) : %.h : %Display.log extract-function-h
$(DISPLAY_NON_JAVA_C32_VO:Display.vo=.h) : %.h : %Display.log extract-function-header.sh
BITWIDTH=32 ./extract-function-header.sh $(patsubst %Display.log,%,$(notdir $<)) < $< > $@
+$(DISPLAY_GENERATED_VO:Display.vo=.c) : %.c : %Display.log src/Specific/Framework/bench/prettyprint.py
+ ./src/Specific/Framework/bench/prettyprint.py $(patsubst %Display.log,%,$(notdir $<)) < $< > $@
+
$(DISPLAY_JAVA_VO:.vo=.log) : %JavaDisplay.log : %.vo %JavaDisplay.v src/Compilers/Z/JavaNotations.vo src/Specific/Framework/IntegrationTestDisplayCommon.vo
$(SHOW)"COQC $*JavaDisplay > $@"
$(HIDE)$(COQC) $(COQDEBUG) $(COQFLAGS) $*JavaDisplay.v | sed s'/\r\n/\n/g' > $@.tmp && mv -f $@.tmp $@
diff --git a/gmpsec.c b/src/Specific/Framework/bench/gmpsec.c
index aa949952a..aa949952a 100644
--- a/gmpsec.c
+++ b/src/Specific/Framework/bench/gmpsec.c
diff --git a/gmpvar.c b/src/Specific/Framework/bench/gmpvar.c
index 97b10109e..97b10109e 100644
--- a/gmpvar.c
+++ b/src/Specific/Framework/bench/gmpvar.c
diff --git a/gmpxx.cpp b/src/Specific/Framework/bench/gmpxx.cpp
index 4710f8ad3..4710f8ad3 100644
--- a/gmpxx.cpp
+++ b/src/Specific/Framework/bench/gmpxx.cpp
diff --git a/montladder.py b/src/Specific/Framework/bench/montladder.py
index da32c73d2..da32c73d2 100644
--- a/montladder.py
+++ b/src/Specific/Framework/bench/montladder.py
diff --git a/prettyprint.py b/src/Specific/Framework/bench/prettyprint.py
index 8d53ee4b6..f349cee5c 100644..100755
--- a/prettyprint.py
+++ b/src/Specific/Framework/bench/prettyprint.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
import re, sys
def translate_typename(t):