diff --git a/src/Makefile b/src/Makefile index 1001829f..80e48e29 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,9 @@ CC ?= clang CFLAGS ?= -O3 -Wall -Wextra -Wpedantic -Wvla -Werror -std=c99 \ -Wundef -Wshadow -Wcast-align -Wpointer-arith -Wmissing-prototypes \ -fstrict-aliasing -fno-common -pipe -JASMIN ?= jasminc + +JASMIN ?= jasminc +JASMIN_CT ?= jasmin-ct # -------------------------------------------------------------------- CI ?= 0 diff --git a/src/Makefile.checksct b/src/Makefile.checksct index 7a1bfc0c..d2a2ce09 100644 --- a/src/Makefile.checksct +++ b/src/Makefile.checksct @@ -5,10 +5,11 @@ ifneq ($(OP),) -SCT_FLAGS ?= +# TODO: remove --infer +SCT_FLAGS ?= --infer -CHECK_SCT_S = ($(JASMINC) -slice $* -checkSCT $(SCT_FLAGS) $< > $@ 2>&1) $(CIT) -CHECK_SCT = ($(JASMINC) -checkSCT $(SCT_FLAGS) $< > $@ 2>&1) $(CIT) +CHECK_SCT_SLICE = ($(JASMIN_CT) $(JINCLUDE) -slice $* --sct $(SCT_FLAGS) $< > $@ 2>&1) $(CIT) +CHECK_SCT = ($(JASMIN_CT) $(JINCLUDE) --sct $(SCT_FLAGS) $< > $@ 2>&1) $(CIT) SCT_TARGETS = $(addsuffix .sct, $(FUNCTIONS)) @@ -21,7 +22,7 @@ $(OP).sct : $(OP).jazz $(DEPS_DIR)/$(OP).sct.d | $(DEPS_DIR) $(CI_DIR) $(SCT_TARGETS): %.sct : $(OP).jazz $(DEPS_DIR)/%.sct.d | $(DEPS_DIR) $(CI_DIR) $(DEPS) - $(CHECK_SCT_S) + $(CHECK_SCT_SLICE) DEPFILES := \ $(DEPFILES) \ diff --git a/src/Makefile.common b/src/Makefile.common index ab28f62b..0606c32d 100644 --- a/src/Makefile.common +++ b/src/Makefile.common @@ -35,10 +35,13 @@ endif JEXT ?= jazz override JFLAGS += -noinsertarraycopy JINCLUDE = -I Jade:$(SRC) + JASMIN ?= jasminc JASMINC := $(JASMIN) $(JFLAGS) $(JINCLUDE) COMPILE = ($(JASMINC) -o $@ $<) $(CIT) +JASMIN_CT ?= jasmin-ct + # -------------------------------------------------------------------- include $(SRC)/$(OPERATION)/EcFlags.mk