From: Andrew Waterman <andrew@sifive.com>
Date: Tue, 25 Apr 2017 18:40:39 +0000 (-0700)
Subject: Remove hret instruction
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b6843b58bd2e3f0ec461f9708e605623c3c13b1;p=riscv-isa-sim.git

Remove hret instruction
---

diff --git a/riscv/encoding.h b/riscv/encoding.h
index 55f8461..92106ab 100644
--- a/riscv/encoding.h
+++ b/riscv/encoding.h
@@ -401,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
@@ -1065,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)
diff --git a/spike_main/disasm.cc b/spike_main/disasm.cc
index bdbef9c..6931681 100644
--- a/spike_main/disasm.cc
+++ b/spike_main/disasm.cc
@@ -418,7 +418,6 @@ disassembler_t::disassembler_t(int xlen)
   DEFINE_NOARG(ebreak);
   DEFINE_NOARG(uret);
   DEFINE_NOARG(sret);
-  DEFINE_NOARG(hret);
   DEFINE_NOARG(mret);
   DEFINE_NOARG(fence);
   DEFINE_NOARG(fence_i);