Split hinval.vvma and hinval.gvma from rv_svinval to rv_svinval_h

Because hinval.vvma and hinval.gvma can only be used legally when both Svinval and H extensions are supported, move them out from rv_svinval to rv_svinval_h.
riscv · Oct 9, 2024 · c184fb8 · c184fb8
1 parent dcbdd96
commit c184fb8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/parse.py b/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)

diff --git a/rv_svinval b/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
diff --git a/rv_svinval_h b/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