summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/coq/Makefile2
-rw-r--r--lib/coq/_CoqProject2
-rw-r--r--mips/Makefile2
-rw-r--r--mips/_CoqProject2
-rwxr-xr-xtest/coq/run_tests.sh2
5 files changed, 7 insertions, 3 deletions
diff --git a/lib/coq/Makefile b/lib/coq/Makefile
index 816a6c3d..97869e3c 100644
--- a/lib/coq/Makefile
+++ b/lib/coq/Makefile
@@ -1,4 +1,4 @@
-BBV_DIR=../../../bbv
+BBV_DIR=../../../bbv/theories
SRC=Sail2_prompt_monad.v Sail2_prompt.v Sail2_impl_base.v Sail2_instr_kinds.v Sail2_operators_bitlists.v Sail2_operators_mwords.v Sail2_operators.v Sail2_values.v Sail2_state_monad.v Sail2_state.v
diff --git a/lib/coq/_CoqProject b/lib/coq/_CoqProject
new file mode 100644
index 00000000..9f5d26b8
--- /dev/null
+++ b/lib/coq/_CoqProject
@@ -0,0 +1,2 @@
+-R . Sail
+-R ../../../bbv/theories bbv
diff --git a/mips/Makefile b/mips/Makefile
index f8b7588f..062ccd8b 100644
--- a/mips/Makefile
+++ b/mips/Makefile
@@ -48,7 +48,7 @@ mips.v: $(MIPS_PRE) $(MIPS_TLB) $(MIPS_SAILS)
mips_types.v: mips.v
MIPS_COQ = mips_types.v mips_extras.v mips.v
-COQ_LIBS = -R ../../bbv bbv -R ../lib/coq Sail
+COQ_LIBS = -R ../../bbv/theories bbv -R ../lib/coq Sail
%.vo: %.v
coqc $(COQ_LIBS) $<
diff --git a/mips/_CoqProject b/mips/_CoqProject
new file mode 100644
index 00000000..ad38d28d
--- /dev/null
+++ b/mips/_CoqProject
@@ -0,0 +1,2 @@
+-R ../../bbv/theories bbv
+-R ../lib/coq Sail \ No newline at end of file
diff --git a/test/coq/run_tests.sh b/test/coq/run_tests.sh
index 2be5e535..5a723a06 100755
--- a/test/coq/run_tests.sh
+++ b/test/coq/run_tests.sh
@@ -5,7 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SAILDIR="$DIR/../.."
TYPECHECKTESTSDIR="$DIR/../typecheck/pass"
EXTRATESTSDIR="$DIR/pass"
-BBVDIR="$DIR/../../../bbv"
+BBVDIR="$DIR/../../../bbv/theories"
RED='\033[0;31m'
GREEN='\033[0;32m'