diff options
| author | Brian Campbell | 2018-05-17 11:15:37 +0100 |
|---|---|---|
| committer | Brian Campbell | 2018-05-17 11:15:37 +0100 |
| commit | 053717c7ac21d3ee86f8346896e6066d93730c1e (patch) | |
| tree | 56de9b33ed2d1f7673990287684ffe5f0d95cd0f /cheri | |
| parent | 9bed157a93741a62a3b8f550bfeeef2a049dc301 (diff) | |
Use an intermediate base_monad type alias in Lem,
resolving the difference in type parameters between the prompt and state
monads, and allowing a single output file to be used with either.
Normally, the type alias is to the prompt monad, but for HOL4 we use the
state monad.
Diffstat (limited to 'cheri')
| -rw-r--r-- | cheri/Holmakefile | 2 | ||||
| -rw-r--r-- | cheri/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cheri/Holmakefile b/cheri/Holmakefile index 604555b5..d64fc3fd 100644 --- a/cheri/Holmakefile +++ b/cheri/Holmakefile @@ -2,7 +2,7 @@ LEMDIR=../../lem/hol-lib INCLUDES = $(LEMDIR) ../lib/hol -all: cheri_sequentialTheory.uo +all: cheriTheory.uo .PHONY: all ifdef POLY diff --git a/cheri/Makefile b/cheri/Makefile index a1fb337e..1f3e5179 100644 --- a/cheri/Makefile +++ b/cheri/Makefile @@ -80,7 +80,7 @@ C%.thy: c%.lem c%_types.lem $(MIPS_SAIL_DIR)/mips_extras.lem lem -isa -outdir . -lib $(SAIL_DIR)/src/gen_lib -lib $(SAIL_DIR)/src/lem_interp $^ sed -i 's/datatype ast/datatype (plugins only: size) ast/' C$*_types.thy -%Script.sml: %.lem %_types.lem $(MIPS_SAIL_DIR)/mips_extras_sequential.lem +%Script.sml: %.lem %_types.lem $(MIPS_SAIL_DIR)/mips_extras.lem lem -hol -outdir . -lib $(SAIL_DIR)/lib/hol -lib $(SAIL_DIR)/src/gen_lib -lib $(SAIL_DIR)/src/lem_interp $^ clean: |