diff options
| author | Robert Norton | 2018-04-04 17:06:03 +0100 |
|---|---|---|
| committer | Robert Norton | 2018-04-04 17:06:24 +0100 |
| commit | 252460bc33fc26d8ef8aa905592fd4029d97d419 (patch) | |
| tree | 190ac6bde29d8d2846d3ae073e6727fe3de16053 /cheri | |
| parent | 48f38c64fb68208d0b245f15ec2a3453ed00690f (diff) | |
Fix another infinite loop in cast bit_to_bool. Following introduction of eq_bool this was preferred over eq_bit when compiling the match on bit in bit_to_bool... Fix is to overload == before including flow.sail but feels a bit inelegant.
Diffstat (limited to 'cheri')
| -rw-r--r-- | cheri/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cheri/Makefile b/cheri/Makefile index 69f12fda..663c8763 100644 --- a/cheri/Makefile +++ b/cheri/Makefile @@ -5,7 +5,7 @@ SAIL_LIB_DIR:=$(SAIL_DIR)/lib MIPS_SAIL_DIR:=$(SAIL_DIR)/mips CHERI_SAIL_DIR:=$(SAIL_DIR)/cheri SAIL:=$(SAIL_DIR)/sail -SAIL_LIB_HEADERS:=$(SAIL_LIB_DIR)/flow.sail +SAIL_LIB_HEADERS:= MIPS_PRE:=$(MIPS_SAIL_DIR)/prelude.sail $(MIPS_SAIL_DIR)/mips_prelude.sail MIPS_TLB:=$(MIPS_SAIL_DIR)/mips_tlb.sail @@ -28,6 +28,9 @@ cheri: $(CHERI_SAILS) $(CHERI_MAIN) cheri.c: $(CHERI_SAILS) $(CHERI_MAIN) $(SAIL) -memo_z3 -c $^ 1> $@ +latex: $(CHERI_SAILS) + $(SAIL) -latex $^ + cheri128: $(CHERI128_SAILS) $(CHERI_MAIN) $(SAIL) -ocaml -o $@ $^ |