summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--riscv/Makefile3
-rwxr-xr-xtest/riscv/run_tests.sh4
2 files changed, 4 insertions, 3 deletions
diff --git a/riscv/Makefile b/riscv/Makefile
index c80c0758..4bdbb71a 100644
--- a/riscv/Makefile
+++ b/riscv/Makefile
@@ -3,7 +3,7 @@ SAIL_DIR ?= $(realpath ..)
export SAIL_DIR
-all: riscv.ml platform # Riscv.thy
+all: riscv.ml platform Riscv.thy
check: $(SAIL_SRCS) main.sail Makefile
$(SAIL_DIR)/sail $(SAIL_SRCS) main.sail
@@ -63,5 +63,6 @@ clean:
Riscv_extras.thy
-rm -f Riscv_duopod.thy Riscv_duopod_types.thy riscv_duopod.lem riscv_duopod_types.lem
-rm -f riscvScript.sml riscv_typesScript.sml riscv_extrasScript.sml
+ -rm -f platform_main.native platform
-Holmake cleanAll
ocamlbuild -clean
diff --git a/test/riscv/run_tests.sh b/test/riscv/run_tests.sh
index 70ce4998..006ed425 100755
--- a/test/riscv/run_tests.sh
+++ b/test/riscv/run_tests.sh
@@ -51,7 +51,7 @@ cd $SAILDIR/riscv
printf "Building RISCV specification...\n"
-if make -C $SAILDIR/riscv riscv ;
+if make -C $SAILDIR/riscv platform ;
then
green "Building RISCV specification" "ok"
else
@@ -59,7 +59,7 @@ else
fi
for test in $DIR/tests/*.elf; do
- if $SAILDIR/riscv/riscv "$test" >"${test/.elf/.out}" 2>&1 && grep -q SUCCESS "${test/.elf/.out}"
+ if $SAILDIR/riscv/platform "$test" >"${test/.elf/.out}" 2>&1 && grep -q SUCCESS "${test/.elf/.out}"
then
green "$(basename $test)" "ok"
else