From 384e03dde463d77f2e032ef6ab56e0b4b8be5e65 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Thu, 12 Mar 2015 23:06:40 -0700
Subject: [PATCH] Use hcall instead of mcall

---
 riscv/encoding.h    | 15 +++++++++------
 riscv/insns/hcall.h |  2 ++
 riscv/insns/mcall.h |  3 +--
 riscv/trap.h        |  1 +
 4 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 riscv/insns/hcall.h

diff --git a/riscv/encoding.h b/riscv/encoding.h
index 25091cf..354e67d 100644
--- a/riscv/encoding.h
+++ b/riscv/encoding.h
@@ -150,10 +150,12 @@
 #define MASK_AMOMAX_D  0xf800707f
 #define MATCH_BLTU 0x6063
 #define MASK_BLTU  0x707f
+#define MATCH_FCLASS_S 0xe0001053
+#define MASK_FCLASS_S  0xfff0707f
 #define MATCH_FSGNJN_D 0x22001053
 #define MASK_FSGNJN_D  0xfe00707f
-#define MATCH_FMIN_S 0x28000053
-#define MASK_FMIN_S  0xfe00707f
+#define MATCH_HCALL 0x10000073
+#define MASK_HCALL  0xffffffff
 #define MATCH_MRET 0x30200073
 #define MASK_MRET  0xffffffff
 #define MATCH_CSRRW 0x1073
@@ -242,8 +244,8 @@
 #define MASK_BLT  0x707f
 #define MATCH_SCALL 0x73
 #define MASK_SCALL  0xffffffff
-#define MATCH_FCLASS_S 0xe0001053
-#define MASK_FCLASS_S  0xfff0707f
+#define MATCH_FMIN_S 0x28000053
+#define MASK_FMIN_S  0xfe00707f
 #define MATCH_SFENCE_VM 0x10400073
 #define MASK_SFENCE_VM  0xfff07fff
 #define MATCH_SC_W 0x1800202f
@@ -530,8 +532,9 @@ DECLARE_INSN(remuw, MATCH_REMUW, MASK_REMUW)
 DECLARE_INSN(fmin_d, MATCH_FMIN_D, MASK_FMIN_D)
 DECLARE_INSN(amomax_d, MATCH_AMOMAX_D, MASK_AMOMAX_D)
 DECLARE_INSN(bltu, MATCH_BLTU, MASK_BLTU)
+DECLARE_INSN(fclass_s, MATCH_FCLASS_S, MASK_FCLASS_S)
 DECLARE_INSN(fsgnjn_d, MATCH_FSGNJN_D, MASK_FSGNJN_D)
-DECLARE_INSN(fmin_s, MATCH_FMIN_S, MASK_FMIN_S)
+DECLARE_INSN(hcall, MATCH_HCALL, MASK_HCALL)
 DECLARE_INSN(mret, MATCH_MRET, MASK_MRET)
 DECLARE_INSN(csrrw, MATCH_CSRRW, MASK_CSRRW)
 DECLARE_INSN(slliw, MATCH_SLLIW, MASK_SLLIW)
@@ -576,7 +579,7 @@ DECLARE_INSN(xor, MATCH_XOR, MASK_XOR)
 DECLARE_INSN(sub, MATCH_SUB, MASK_SUB)
 DECLARE_INSN(blt, MATCH_BLT, MASK_BLT)
 DECLARE_INSN(scall, MATCH_SCALL, MASK_SCALL)
-DECLARE_INSN(fclass_s, MATCH_FCLASS_S, MASK_FCLASS_S)
+DECLARE_INSN(fmin_s, MATCH_FMIN_S, MASK_FMIN_S)
 DECLARE_INSN(sfence_vm, MATCH_SFENCE_VM, MASK_SFENCE_VM)
 DECLARE_INSN(sc_w, MATCH_SC_W, MASK_SC_W)
 DECLARE_INSN(rem, MATCH_REM, MASK_REM)
diff --git a/riscv/insns/hcall.h b/riscv/insns/hcall.h
new file mode 100644
index 0000000..fcc57d6
--- /dev/null
+++ b/riscv/insns/hcall.h
@@ -0,0 +1,2 @@
+require_privilege(PRV_S);
+throw trap_hcall();
diff --git a/riscv/insns/mcall.h b/riscv/insns/mcall.h
index 97f55f8..a627bbe 100644
--- a/riscv/insns/mcall.h
+++ b/riscv/insns/mcall.h
@@ -1,2 +1 @@
-require_privilege(PRV_S); // or PRV_H if implemented
-throw trap_mcall();
+throw trap_illegal_instruction();
diff --git a/riscv/trap.h b/riscv/trap.h
index 7110073..8bc94f3 100644
--- a/riscv/trap.h
+++ b/riscv/trap.h
@@ -46,6 +46,7 @@ DECLARE_MEM_TRAP(CAUSE_MISALIGNED_FETCH, instruction_address_misaligned)
 DECLARE_MEM_TRAP(CAUSE_FAULT_FETCH, instruction_access_fault)
 DECLARE_TRAP(CAUSE_ILLEGAL_INSTRUCTION, illegal_instruction)
 DECLARE_TRAP(CAUSE_SCALL, scall)
+DECLARE_TRAP(CAUSE_HCALL, hcall)
 DECLARE_TRAP(CAUSE_MCALL, mcall)
 DECLARE_TRAP(CAUSE_BREAKPOINT, breakpoint)
 DECLARE_MEM_TRAP(CAUSE_MISALIGNED_LOAD, load_address_misaligned)
-- 
2.30.2