aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorrsnikhil <nikhil@acm.org>2019-10-21 14:25:47 -0400
committerrsnikhil <nikhil@acm.org>2019-10-21 14:25:47 -0400
commit130502465d947d93442fb5ca4c748a8ad502c8aa (patch)
treefd324a856e598005700dbb4812573804419079c2 /Makefile
parent5c1e9ab5ecaf3316ecfca23e85e10fb960e4a13e (diff)
downloadsail-riscv-130502465d947d93442fb5ca4c748a8ad502c8aa.zip
sail-riscv-130502465d947d93442fb5ca4c748a8ad502c8aa.tar.gz
sail-riscv-130502465d947d93442fb5ca4c748a8ad502c8aa.tar.bz2
Interim commit while developing code for F, D extensions (detail below).
Commit ecb29cb115c9 added all the AST, encdec, and assembly clauses for F,D, and execute clauses with empty bodies (just LOAD_FP and STORE_FP are done). This commit is after fixing all syntax and type-checking errors.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 13 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index df48372..d0c8453 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,8 @@ endif
# Instruction sources, depending on target
SAIL_CHECK_SRCS = riscv_addr_checks_common.sail riscv_addr_checks.sail riscv_misa_ext.sail
-SAIL_DEFAULT_INST = riscv_insts_base.sail riscv_insts_aext.sail riscv_insts_cext.sail riscv_insts_mext.sail riscv_insts_zicsr.sail riscv_insts_next.sail
+SAIL_DEFAULT_INST = riscv_insts_base.sail riscv_insts_aext.sail riscv_insts_cext.sail riscv_insts_mext.sail riscv_insts_zicsr.sail riscv_insts_next.sail riscv_insts_fdext.sail
+
SAIL_SEQ_INST = $(SAIL_DEFAULT_INST) riscv_jalr_seq.sail
SAIL_RMEM_INST = $(SAIL_DEFAULT_INST) riscv_jalr_rmem.sail riscv_insts_rmem.sail
@@ -50,10 +51,15 @@ SAIL_REGS_SRCS = riscv_reg_type.sail riscv_regs.sail riscv_pc_access.sail riscv_
SAIL_REGS_SRCS += riscv_pmp_regs.sail riscv_pmp_control.sail
SAIL_REGS_SRCS += riscv_ext_regs.sail $(SAIL_CHECK_SRCS)
+SAIL_FD_SRCS = riscv_flen_D.sail
+SAIL_FD_SRCS += riscv_freg_type.sail
+SAIL_FD_SRCS += riscv_fdext_regs.sail
+
SAIL_ARCH_SRCS = $(PRELUDE)
SAIL_ARCH_SRCS += riscv_types_ext.sail riscv_types.sail
SAIL_ARCH_SRCS += riscv_vmem_types.sail $(SAIL_REGS_SRCS) $(SAIL_SYS_SRCS) riscv_platform.sail
SAIL_ARCH_SRCS += riscv_mem.sail $(SAIL_VM_SRCS)
+SAIL_ARCH_SRCS += $(SAIL_FD_SRCS)
SAIL_ARCH_RVFI_SRCS = $(PRELUDE) rvfi_dii.sail riscv_types.sail $(SAIL_REGS_SRCS) $(SAIL_SYS_SRCS) riscv_platform.sail riscv_mem.sail $(SAIL_VM_SRCS)
SAIL_STEP_SRCS = riscv_step_common.sail riscv_step_ext.sail riscv_decode_ext.sail riscv_fetch.sail riscv_step.sail
RVFI_STEP_SRCS = riscv_step_common.sail riscv_step_rvfi.sail riscv_decode_ext.sail riscv_fetch_rvfi.sail riscv_step.sail
@@ -139,6 +145,12 @@ else
RISCV_EXTRAS_LEM = riscv_extras.lem
endif
+.PHONY: test
+test:
+ touch model/riscv_insts_base.sail
+ make ocaml_emulator/riscv_ocaml_sim_$(ARCH)
+ ./ocaml_emulator/riscv_ocaml_sim_RV64 test/riscv-tests/rv64ui-p-add.elf
+
all: ocaml_emulator/riscv_ocaml_sim_$(ARCH) c_emulator/riscv_sim_$(ARCH) riscv_isa riscv_coq riscv_hol riscv_rmem
.PHONY: all