Support setting ISA/subsets with --isa flag

[riscv-isa-sim.git] / riscv / riscv.mk.in

diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index f6553c169a8cd60b011849dde769c6e8e6bf0f2b..d30725935583f929c8a0017b3dfecf7feb4f3e5b 100644 (file)
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -1,39 +1,61 @@
+get_insn_list = $(shell grep ^DECLARE_INSN $(1) | sed 's/DECLARE_INSN(\(.*\),.*,.*)/\1/')
+get_opcode = $(shell grep ^DECLARE_INSN.*\\\<$(2)\\\> $(1) | sed 's/DECLARE_INSN(.*,\(.*\),.*)/\1/')
+
 riscv_subproject_deps = \
-       softfloat_riscv \
        softfloat \
 
-riscv_insn_hdrs := $(notdir $(wildcard $(src_dir)/riscv/insns/*.h))
+riscv_install_prog_srcs = \
 
 riscv_hdrs = \
-       applink.h \
+       htif.h \
        common.h \
        decode.h \
        mmu.h \
        processor.h \
        sim.h \
        trap.h \
-       opcodes.h \
-       insn_header.h \
-       insn_footer.h \
-
-$(patsubst %.h, %.cc, $(riscv_insn_hdrs)): %.cc: insns/%.h $(riscv_hdrs)
-       @echo \#define FUNC insn_func_$(@:.cc=)      > $@
-       @echo \#define OPCODE_MASK MASK_$(@:.cc=)   >> $@
-       @echo \#define OPCODE_MATCH MATCH_$(@:.cc=) >> $@
-       @cat $(src_dir)/riscv/insn_header.h         >> $@
-       @cat $<                                     >> $@
-       @cat $(src_dir)/riscv/insn_footer.h         >> $@
+       encoding.h \
+       cachesim.h \
+       memtracer.h \
+       extension.h \
+       rocc.h \
+       insn_template.h \
+       mulhi.h \
+
+riscv_precompiled_hdrs = \
+       insn_template.h \
 
 riscv_srcs = \
-       applink.cc \
+       htif.cc \
        processor.cc \
        sim.cc \
+       interactive.cc \
        trap.cc \
-       icsim.cc \
+       cachesim.cc \
        mmu.cc \
-       $(patsubst %.h, %.cc, $(riscv_insn_hdrs)) \
+       disasm.cc \
+       extension.cc \
+       extensions.cc \
+       rocc.cc \
+       regnames.cc \
+       $(riscv_gen_srcs) \
 
 riscv_test_srcs =
 
-riscv_install_prog_srcs = \
-       riscv-isa-run.cc \
+riscv_gen_hdrs = \
+       icache.h \
+
+riscv_gen_srcs = \
+       $(addsuffix .cc, $(call get_insn_list,$(src_dir)/riscv/encoding.h))
+
+icache_entries := `grep "ICACHE_ENTRIES =" $(src_dir)/riscv/mmu.h | sed 's/.* = \(.*\);/\1/'`
+
+icache.h: mmu.h
+       $(src_dir)/riscv/gen_icache $(icache_entries) > $@.tmp
+       mv $@.tmp $@
+
+$(riscv_gen_srcs): %.cc: insns/%.h insn_template.cc
+       sed 's/NAME/$(subst .cc,,$@)/' $(src_dir)/riscv/insn_template.cc | sed 's/OPCODE/$(call get_opcode,$(src_dir)/riscv/encoding.h,$(subst .cc,,$@))/' > $@
+
+riscv_junk = \
+       $(riscv_gen_srcs) \