From 5d52b6321b02840d2a64f1663900f15b7c9f22a2 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Tue, 3 Mar 2020 17:57:55 -0800 Subject: Clean up Makefile --- Makefile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index b933478..1a83b37 100644 --- a/Makefile +++ b/Makefile @@ -5,27 +5,30 @@ PK_H := ../riscv-pk/machine/encoding.h ENV_H := ../riscv-tests/env/encoding.h OPENOCD_H := ../riscv-openocd/src/target/riscv/encoding.h -ALL_OPCODES := opcodes-pseudo opcodes opcodes-rvc opcodes-rvc-pseudo opcodes-custom opcodes-rvv opcodes-rvv-pseudo +ALL_REAL_ILEN32_OPCODES := opcodes +ALL_REAL_OPCODES := $(ALL_REAL_ILEN32_OPCODES) opcodes-rvc opcodes-custom opcodes-rvv + +ALL_OPCODES := opcodes-pseudo $(ALL_REAL_OPCODES) opcodes-rvc-pseudo opcodes-rvv-pseudo install: $(ISASIM_H) $(PK_H) $(ENV_H) $(OPENOCD_H) inst.chisel instr-table.tex priv-instr-table.tex $(ISASIM_H) $(PK_H) $(ENV_H) $(OPENOCD_H): $(ALL_OPCODES) parse_opcodes encoding.h cp encoding.h $@ - cat opcodes opcodes-rvc-pseudo opcodes-rvc opcodes-custom opcodes-rvv | python ./parse_opcodes -c >> $@ + cat $(ALL_OPCODES) | python ./parse_opcodes -c >> $@ inst.chisel: $(ALL_OPCODES) parse_opcodes - cat opcodes opcodes-rvc opcodes-rvc-pseudo opcodes-custom opcodes-rvv opcodes-rvv-pseudo opcodes-pseudo | ./parse_opcodes -chisel > $@ + cat $(ALL_OPCODES) | ./parse_opcodes -chisel > $@ -inst.go: opcodes opcodes-pseudo parse_opcodes - cat opcodes opcodes-pseudo | ./parse_opcodes -go > $@ +inst.go: $(ALL_REAL_ILEN32_OPCODES) parse_opcodes + cat $(ALL_REAL_ILEN32_OPCODES) | ./parse_opcodes -go > $@ -inst.sverilog: opcodes opcodes-pseudo parse_opcodes - cat opcodes opcodes-rvc opcodes-rvc-pseudo opcodes-custom opcodes-pseudo | ./parse_opcodes -sverilog > $@ +inst.sverilog: $(ALL_OPCODES) parse_opcodes + cat $(ALL_OPCODES) | ./parse_opcodes -sverilog > $@ instr-table.tex: $(ALL_OPCODES) parse_opcodes - cat opcodes opcodes-pseudo | ./parse_opcodes -tex > $@ + cat $(ALL_OPCODES) | ./parse_opcodes -tex > $@ priv-instr-table.tex: $(ALL_OPCODES) parse_opcodes - cat opcodes opcodes-pseudo | ./parse_opcodes -privtex > $@ + cat $(ALL_OPCODES) | ./parse_opcodes -privtex > $@ .PHONY : install -- cgit v1.1