projects
/
riscv-isa-sim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Factor out the dummy RoCC accelerator
[riscv-isa-sim.git]
/
riscv
/
riscv.mk.in
diff --git
a/riscv/riscv.mk.in
b/riscv/riscv.mk.in
index 7863e99ebd3698fc84d898bf42a2d40021a19444..0d5869dae2a290c409c64c8d3490e33bae74fe7a 100644
(file)
--- a/
riscv/riscv.mk.in
+++ b/
riscv/riscv.mk.in
@@
-1,11
+1,12
@@
+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 = \
riscv_subproject_deps = \
- softfloat_riscv \
softfloat \
riscv_install_prog_srcs = \
softfloat \
riscv_install_prog_srcs = \
- riscv-isa-run.cc \
-riscv_hdrs
:
= \
+riscv_hdrs = \
htif.h \
common.h \
decode.h \
htif.h \
common.h \
decode.h \
@@
-13,10
+14,16
@@
riscv_hdrs := \
processor.h \
sim.h \
trap.h \
processor.h \
sim.h \
trap.h \
- opcodes.h \
- insn_header.h \
+ encoding.h \
cachesim.h \
memtracer.h \
cachesim.h \
memtracer.h \
+ extension.h \
+ rocc.h \
+ insn_template.h \
+ mulhi.h \
+
+riscv_precompiled_hdrs = \
+ insn_template.h \
riscv_srcs = \
htif.cc \
riscv_srcs = \
htif.cc \
@@
-27,23
+34,25
@@
riscv_srcs = \
cachesim.cc \
mmu.cc \
disasm.cc \
cachesim.cc \
mmu.cc \
disasm.cc \
- $(DISPATCH_SRCS) \
+ extension.cc \
+ rocc.cc \
+ regnames.cc \
+ $(riscv_gen_srcs) \
riscv_test_srcs =
riscv_test_srcs =
-riscv_gen_hdrs
:
\
-
dispatch
.h \
+riscv_gen_hdrs
=
\
+
icache
.h \
-NDISPATCH := 9
-
DISPATCH_SRCS = $(addsuffix .cc,$(addprefix dispatch,$(call range,0,$(NDISPATCH)+1)
))
+riscv_gen_srcs = \
+
$(addsuffix .cc, $(call get_insn_list,$(src_dir)/riscv/encoding.h
))
-$(DISPATCH_SRCS): %.cc: dispatch $(wildcard insns/*.h) opcodes.h
- $< $(subst dispatch,,$(subst .cc,,$@)) $(NDISPATCH) 1024 < $(src_dir)/riscv/opcodes.h > $@
+icache.h:
+ $(src_dir)/riscv/gen_icache 1024 > $@.tmp
+ mv $@.tmp $@
-dispatch.h: %.h: dispatch opcodes.h
- echo $(riscv_srcs)
- $< $(NDISPATCH) 1024 < $(src_dir)/riscv/opcodes.h > $@
+$(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_junk = \
- dispatch.h \
- $(DISPATCH_SRCS) \
+ $(riscv_gen_srcs) \