Remove hret instruction

[riscv-isa-sim.git] / riscv / encoding.h

diff --git a/riscv/encoding.h b/riscv/encoding.h
index b07d976556aaa4a237299de74d5652ac0a91ff7d..92106ab8b183556c63741c6cf18a40b3b691578e 100644 (file)
--- a/riscv/encoding.h
+++ b/riscv/encoding.h
@@ -127,13 +127,14 @@
 #define PMP_R     0x01
 #define PMP_W     0x02
 #define PMP_X     0x04
-#define PMP_M     0x08
-#define PMP_NAPOT 0x10
-#define PMP_TOR   0x20
-#define PMP_EN    0x40
-#define PMP_LOCK  0x80
+#define PMP_A     0x18
+#define PMP_L     0x80
 #define PMP_SHIFT 2
 
+#define PMP_TOR   0x08
+#define PMP_NA4   0x10
+#define PMP_NAPOT 0x18
+
 #define IRQ_S_SOFT   1
 #define IRQ_H_SOFT   2
 #define IRQ_M_SOFT   3
@@ -400,8 +401,6 @@
 #define MASK_URET  0xffffffff
 #define MATCH_SRET 0x10200073
 #define MASK_SRET  0xffffffff
-#define MATCH_HRET 0x20200073
-#define MASK_HRET  0xffffffff
 #define MATCH_MRET 0x30200073
 #define MASK_MRET  0xffffffff
 #define MATCH_DRET 0x7b200073
@@ -1064,7 +1063,6 @@ DECLARE_INSN(ecall, MATCH_ECALL, MASK_ECALL)
 DECLARE_INSN(ebreak, MATCH_EBREAK, MASK_EBREAK)
 DECLARE_INSN(uret, MATCH_URET, MASK_URET)
 DECLARE_INSN(sret, MATCH_SRET, MASK_SRET)
-DECLARE_INSN(hret, MATCH_HRET, MASK_HRET)
 DECLARE_INSN(mret, MATCH_MRET, MASK_MRET)
 DECLARE_INSN(dret, MATCH_DRET, MASK_DRET)
 DECLARE_INSN(sfence_vma, MATCH_SFENCE_VMA, MASK_SFENCE_VMA)