Merge branch 'riscv:master' into improve_readme

Makefile

@@ -7,48 +7,41 @@ INSTALL_HEADER_FILES := $(ISASIM_H) $(PK_H) $(ENV_H) $(OPENOCD_H)
 
 default: everything
 
-.PHONY : everything
+.PHONY: everything encoding.out.h inst.chisel inst.go latex inst.sverilog inst.rs clean install instr-table.tex priv-instr-table.tex inst.spinalhdl
+
 everything:
 	@./parse.py -c -go -chisel -sverilog -rust -latex -spinalhdl $(EXTENSIONS)
 
-.PHONY : encoding.out.h
 encoding.out.h:
 	@./parse.py -c rv* unratified/rv_* unratified/rv32* unratified/rv64*
 
-.PHONY : inst.chisel
 inst.chisel:
 	@./parse.py -chisel $(EXTENSIONS)
 
-.PHONY : inst.go
 inst.go:
 	@./parse.py -go $(EXTENSIONS)
 
-.PHONY : latex
 latex:
 	@./parse.py -latex $(EXTENSIONS)
 
-.PHONY : inst.sverilog
 inst.sverilog:
 	@./parse.py -sverilog $(EXTENSIONS)
 
-.PHONY : inst.rs
 inst.rs:
 	@./parse.py -rust $(EXTENSIONS)
 
-.PHONY : clean
 clean:
 	rm -f inst* priv-instr-table.tex encoding.out.h
 
-.PHONY : install
 install: everything
-	set -e; for FILE in $(INSTALL_HEADER_FILES); do cp -f encoding.out.h $$FILE; done
+	set -e; \
+	for FILE in $(INSTALL_HEADER_FILES); do \
+	    cp -f encoding.out.h $$FILE; \
+	done
 
-.PHONY: instr-table.tex
 instr-table.tex: latex
 
-.PHONY: priv-instr-table.tex
 priv-instr-table.tex: latex
 
-.PHONY: inst.spinalhdl
 inst.spinalhdl:
 	@./parse.py -spinalhdl $(EXTENSIONS)

parse.py

@@ -508,7 +508,7 @@ def create_inst_dict(file_filter, include_pseudo=False, include_pseudo_ops=[]):
 def make_priv_latex_table():
     latex_file = open("priv-instr-table.tex", "w")
     type_list = ["R-type", "I-type"]
-    system_instr = ["_h", "_s", "_system", "_svinval", "64_h"]
+    system_instr = ["_h", "_s", "_system", "_svinval", "64_h", "_svinval_h"]
     dataset_list = [(system_instr, "Trap-Return Instructions", ["sret", "mret"], False)]
     dataset_list.append(
         (system_instr, "Interrupt-Management Instructions", ["wfi"], False)

rv_svinval

@@ -2,5 +2,3 @@
 sinval.vma      11..7=0 rs1        rs2        31..25=0x0b  14..12=0 6..2=0x1C 1..0=3
 sfence.w.inval  11..7=0 19..15=0x0 24..20=0x0 31..25=0x0c  14..12=0 6..2=0x1C 1..0=3
 sfence.inval.ir 11..7=0 19..15=0x0 24..20=0x1 31..25=0x0c  14..12=0 6..2=0x1C 1..0=3
-hinval.vvma     11..7=0 rs1        rs2        31..25=0x13  14..12=0 6..2=0x1C 1..0=3
-hinval.gvma     11..7=0 rs1        rs2        31..25=0x33  14..12=0 6..2=0x1C 1..0=3

rv_svinval_h

@@ -0,0 +1,3 @@
+# Svinval
+hinval.vvma     11..7=0 rs1        rs2        31..25=0x13  14..12=0 6..2=0x1C 1..0=3
+hinval.gvma     11..7=0 rs1        rs2        31..25=0x33  14..12=0 6..2=0x1C 1..0=3