diff options
| author | Thomas Bauereiss | 2018-03-15 13:08:41 +0000 |
|---|---|---|
| committer | Thomas Bauereiss | 2018-03-15 13:08:41 +0000 |
| commit | 3896c50644568214c06014eb54d27f86f3d446f3 (patch) | |
| tree | 10be0b534b2f4d60358131173999928d33d5c430 | |
| parent | e99f9e060575930bac00240f252bf6f975a13deb (diff) | |
Some CHERI compilation fixes
| -rw-r--r-- | cheri/Makefile | 2 | ||||
| -rw-r--r-- | src/sail_lib.ml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cheri/Makefile b/cheri/Makefile index 6fa738a7..e6fe09a5 100644 --- a/cheri/Makefile +++ b/cheri/Makefile @@ -20,7 +20,7 @@ CHERI_SAILS:=$(SAIL_LIB_HEADERS) $(MIPS_PRE) $(MIPS_TLB) $(CHERI_PRE) $(MIPS_INS CHERI_NO_TLB_SAILS:=$(SAIL_LIB_HEADERS) $(MIPS_PRE) $(MIPS_TLB_STUB) $(CHERI_PRE) $(MIPS_INSTS) $(CHERI_INSTS) $(MIPS_EPILOGUE) CHERI128_SAILS:=$(SAIL_LIB_HEADERS) $(MIPS_PRE) $(MIPS_TLB) $(CHERI128_PRE) $(MIPS_INSTS) $(CHERI_INSTS) $(MIPS_EPILOGUE) CHERI128_NO_TLB_SAILS:=$(SAIL_LIB_HEADERS) $(MIPS_PRE) $(MIPS_TLB_STUB) $(CHERI128_PRE) $(MIPS_INSTS) $(CHERI_INSTS) $(MIPS_EPILOGUE) -CHERI_MAIN:=$(CHERI_SAIL_DIR)/main.sail +CHERI_MAIN:=$(MIPS_SAIL_DIR)/main.sail cheri: $(CHERI_SAILS) $(CHERI_MAIN) $(SAIL) -ocaml -o $@ $^ diff --git a/src/sail_lib.ml b/src/sail_lib.ml index 96baa279..e839d142 100644 --- a/src/sail_lib.ml +++ b/src/sail_lib.ml @@ -284,7 +284,7 @@ let mult_vec (x, y) = to_bits' (2*len, prod) (* signed multiplication of two n bit lists producing a list of 2n bits. *) -let smult_vec (x, y) = +let mults_vec (x, y) = let xi = sint(x) in let yi = sint(y) in let len = List.length x in |