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 /riscv | |
| 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 'riscv')
| -rw-r--r-- | riscv/Holmakefile | 2 | ||||
| -rw-r--r-- | riscv/Makefile | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/riscv/Holmakefile b/riscv/Holmakefile index 626e6f2f..8269bc36 100644 --- a/riscv/Holmakefile +++ b/riscv/Holmakefile @@ -2,7 +2,7 @@ LEMDIR=../../lem/hol-lib INCLUDES = $(LEMDIR) ../lib/hol -all: riscv_sequentialTheory.uo +all: riscvTheory.uo .PHONY: all ifdef POLY diff --git a/riscv/Makefile b/riscv/Makefile index 9d3a2196..110236d7 100644 --- a/riscv/Makefile +++ b/riscv/Makefile @@ -37,11 +37,11 @@ riscv.lem: $(SAIL_SRCS) Makefile riscv_sequential.lem: $(SAIL_SRCS) Makefile $(SAIL_DIR)/sail -lem -lem_sequential -o riscv_sequential -lem_mwords -lem_lib Riscv_extras_sequential $(SAIL_SRCS) -riscv_sequentialScript.sml : riscv_sequential.lem riscv_extras_sequential.lem +riscvScript.sml : riscv.lem riscv_extras.lem lem -hol -outdir . -lib ../lib/hol -lib ../src/lem_interp -lib ../src/gen_lib \ - riscv_extras_sequential.lem \ - riscv_sequential_types.lem \ - riscv_sequential.lem + riscv_extras.lem \ + riscv_types.lem \ + riscv.lem # we exclude prelude.sail here, most code there should move to sail lib LOC_FILES:=$(SAIL_SRCS) main.sail |