X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=riscv%2Friscv.mk.in;h=882f34db7163643e98c41adff43da11aafbe6a21;hb=3fddbcc0a5b2fc6a446967405e58a92be5db9f5f;hp=9a4ef57505c6f89cc7f10a00ddfcddcae3050f25;hpb=b3f7c6045cea1d5132bd4b0d367eff315f044cc0;p=riscv-isa-sim.git

diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 9a4ef57..882f34d 100644
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -1,49 +1,273 @@
+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_install_prog_srcs = \
-	spike.cc \
 
-riscv_hdrs := \
+riscv_hdrs = \
 	htif.h \
 	common.h \
 	decode.h \
+	disasm.h \
 	mmu.h \
 	processor.h \
 	sim.h \
 	trap.h \
-	opcodes.h \
-	insn_header.h \
+	encoding.h \
 	cachesim.h \
 	memtracer.h \
+	extension.h \
+	rocc.h \
+	insn_template.h \
+	mulhi.h \
+
+riscv_precompiled_hdrs = \
+	insn_template.h \
 
 riscv_srcs = \
 	htif.cc \
 	processor.cc \
+	execute.cc \
 	sim.cc \
 	interactive.cc \
 	trap.cc \
 	cachesim.cc \
 	mmu.cc \
 	disasm.cc \
-	$(DISPATCH_SRCS) \
+	extension.cc \
+	extensions.cc \
+	rocc.cc \
+	regnames.cc \
+	$(riscv_gen_srcs) \
 
 riscv_test_srcs =
 
-riscv_gen_hdrs: \
-	dispatch.h \
+riscv_gen_hdrs = \
+	icache.h \
+	insn_list.h \
+
+riscv_insn_list = \
+	add \
+	addi \
+	addiw \
+	addw \
+	amoadd_d \
+	amoadd_w \
+	amoand_d \
+	amoand_w \
+	amomax_d \
+	amomaxu_d \
+	amomaxu_w \
+	amomax_w \
+	amomin_d \
+	amominu_d \
+	amominu_w \
+	amomin_w \
+	amoor_d \
+	amoor_w \
+	amoswap_d \
+	amoswap_w \
+	amoxor_d \
+	amoxor_w \
+	and \
+	andi \
+	auipc \
+	beq \
+	bge \
+	bgeu \
+	blt \
+	bltu \
+	bne \
+	c_add \
+	c_addi16sp \
+	c_addi4spn \
+	c_addi \
+	c_addw \
+	c_and \
+	c_andi \
+	c_beqz \
+	c_bnez \
+	c_ebreak \
+	c_fld \
+	c_fldsp \
+	c_flw \
+	c_flwsp \
+	c_fsd \
+	c_fsdsp \
+	c_fsw \
+	c_fswsp \
+	c_jal \
+	c_jalr \
+	c_j \
+	c_jr \
+	c_li \
+	c_lui \
+	c_lbu \
+	c_lw \
+	c_lwsp \
+	c_mv \
+	c_or \
+	c_sll \
+	c_slli \
+	c_srai \
+	c_srl \
+	c_srli \
+	c_sub \
+	c_subw \
+	c_xor \
+	csrrc \
+	csrrci \
+	csrrs \
+	csrrsi \
+	csrrw \
+	csrrwi \
+	c_sw \
+	c_swsp \
+	div \
+	divu \
+	divuw \
+	divw \
+	fadd_d \
+	fadd_s \
+	fclass_d \
+	fclass_s \
+	fcvt_d_l \
+	fcvt_d_lu \
+	fcvt_d_s \
+	fcvt_d_w \
+	fcvt_d_wu \
+	fcvt_l_d \
+	fcvt_l_s \
+	fcvt_lu_d \
+	fcvt_lu_s \
+	fcvt_s_d \
+	fcvt_s_l \
+	fcvt_s_lu \
+	fcvt_s_w \
+	fcvt_s_wu \
+	fcvt_w_d \
+	fcvt_w_s \
+	fcvt_wu_d \
+	fcvt_wu_s \
+	fdiv_d \
+	fdiv_s \
+	fence \
+	fence_i \
+	feq_d \
+	feq_s \
+	fld \
+	fle_d \
+	fle_s \
+	flt_d \
+	flt_s \
+	flw \
+	fmadd_d \
+	fmadd_s \
+	fmax_d \
+	fmax_s \
+	fmin_d \
+	fmin_s \
+	fmsub_d \
+	fmsub_s \
+	fmul_d \
+	fmul_s \
+	fmv_d_x \
+	fmv_s_x \
+	fmv_x_d \
+	fmv_x_s \
+	fnmadd_d \
+	fnmadd_s \
+	fnmsub_d \
+	fnmsub_s \
+	fsd \
+	fsgnj_d \
+	fsgnjn_d \
+	fsgnjn_s \
+	fsgnj_s \
+	fsgnjx_d \
+	fsgnjx_s \
+	fsqrt_d \
+	fsqrt_s \
+	fsub_d \
+	fsub_s \
+	fsw \
+	hrts \
+	jal \
+	jalr \
+	lb \
+	lbu \
+	ld \
+	lh \
+	lhu \
+	lr_d \
+	lr_w \
+	lui \
+	lw \
+	lwu \
+	mrth \
+	mrts \
+	mul \
+	mulh \
+	mulhsu \
+	mulhu \
+	mulw \
+	or \
+	ori \
+	rem \
+	remu \
+	remuw \
+	remw \
+	sb \
+	sbreak \
+	scall \
+	sc_d \
+	sc_w \
+	sd \
+	sfence_vm \
+	sh \
+	sll \
+	slli \
+	slliw \
+	sllw \
+	slt \
+	slti \
+	sltiu \
+	sltu \
+	sra \
+	srai \
+	sraiw \
+	sraw \
+	sret \
+	srl \
+	srli \
+	srliw \
+	srlw \
+	sub \
+	subw \
+	sw \
+	wfi \
+	xor \
+	xori \
+
+riscv_gen_srcs = \
+	$(addsuffix .cc,$(riscv_insn_list))
+
+icache_entries := `grep "ICACHE_ENTRIES =" $(src_dir)/riscv/mmu.h | sed 's/.* = \(.*\);/\1/'`
 
-NDISPATCH := 9
-DISPATCH_SRCS = $(addsuffix .cc,$(addprefix dispatch,$(call range,0,$(NDISPATCH))))
+icache.h: mmu.h
+	$(src_dir)/riscv/gen_icache $(icache_entries) > $@.tmp
+	mv $@.tmp $@
 
-$(DISPATCH_SRCS): %.cc: dispatch $(wildcard insns/*.h) opcodes.h
-	$< $(subst dispatch,,$(subst .cc,,$@)) $(NDISPATCH) 1024 < $(src_dir)/riscv/opcodes.h > $@
+insn_list.h: $(src_dir)/riscv/riscv.mk.in
+	for insn in $(foreach insn,$(riscv_insn_list),$(subst .,_,$(insn))) ; do \
+		printf 'DEFINE_INSN(%s)\n' "$${insn}" ; \
+	done > $@.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 = \
-  dispatch.h \
-  $(DISPATCH_SRCS) \
+	$(riscv_gen_srcs) \