Add const csr hedelegh and masks for stateen.priv113/stateen.context

Author: JJ-Gaisler

riscv/csr_init.cc

@@ -179,6 +179,7 @@ void state_t::csr_init(processor_t* const proc, reg_t max_isa)
     (1 << CAUSE_SOFTWARE_CHECK_FAULT) |
     (1 << CAUSE_HARDWARE_ERROR_FAULT);
   add_hypervisor_csr(CSR_HEDELEG, hedeleg = std::make_shared<masked_csr_t>(proc, CSR_HEDELEG, hedeleg_mask, 0));
+  add_hypervisor_csr(CSR_HEDELEGH, std::make_shared<hedelegh_csr_t>(proc, CSR_HEDELEGH, 0));
   add_hypervisor_csr(CSR_HCOUNTEREN, hcounteren = std::make_shared<masked_csr_t>(proc, CSR_HCOUNTEREN, counteren_mask, 0));
   htimedelta = std::make_shared<basic_csr_t>(proc, CSR_HTIMEDELTA, 0);
   if (xlen == 32) {
@@ -285,8 +286,10 @@ void state_t::csr_init(processor_t* const proc, reg_t max_isa)
                                  (proc->extension_enabled(EXT_ZCMT) ? SSTATEEN0_JVT : 0) |
                                  SSTATEEN0_CS;
     const reg_t hstateen0_mask = sstateen0_mask | HSTATEEN0_SENVCFG | HSTATEEN_SSTATEEN |
-                                (proc->extension_enabled(EXT_SSCSRIND) ? HSTATEEN0_CSRIND : 0);
-    const reg_t mstateen0_mask = hstateen0_mask | (proc->extension_enabled(EXT_SSQOSID) ?  MSTATEEN0_PRIV114 : 0);
+                                 (proc->extension_enabled(EXT_SSCSRIND) ? HSTATEEN0_CSRIND : 0) |
+                                 (proc->get_cfg().trigger_count > 0 ? HSTATEEN0_SCONTEXT : 0);
+    const reg_t mstateen0_mask = hstateen0_mask | MSTATEEN0_PRIV113 |
+                                 (proc->extension_enabled(EXT_SSQOSID) ?  MSTATEEN0_PRIV114 : 0);
     for (int i = 0; i < 4; i++) {
       const reg_t mstateen_mask = i == 0 ? mstateen0_mask : MSTATEEN_HSTATEEN;
       mstateen[i] = std::make_shared<masked_csr_t>(proc, CSR_MSTATEEN0 + i, mstateen_mask, 0);

riscv/csrs.cc

@@ -1978,3 +1978,18 @@ void hcontext_csr_t::verify_permissions(insn_t insn, bool write) const {
   masked_csr_t::verify_permissions(insn, write);
 
 }
+
+hedelegh_csr_t::hedelegh_csr_t(processor_t* const proc, const reg_t addr, const reg_t init) :
+const_csr_t(proc, addr, init){};
+void hedelegh_csr_t::verify_permissions(insn_t insn, bool write) const {
+  if (proc->get_const_xlen() != 32)
+    throw trap_illegal_instruction(insn.bits());
+  if (proc->extension_enabled(EXT_SMSTATEEN)) {
+    if ((state->prv < PRV_M) &&
+        !(state->mstateen[0]->read() & MSTATEEN0_PRIV113))
+      throw trap_illegal_instruction(insn.bits());
+
+  }
+  const_csr_t::verify_permissions(insn, write);
+
+}

riscv/csrs.h

@@ -924,4 +924,10 @@ class hcontext_csr_t: public masked_csr_t {
   hcontext_csr_t(processor_t* const proc, const reg_t addr, const reg_t mask, const reg_t init);
   virtual void verify_permissions(insn_t insn, bool write) const override;
 };
+
+class hedelegh_csr_t: public const_csr_t {
+ public:
+  hedelegh_csr_t(processor_t* const proc, const reg_t addr, const reg_t init);
+  virtual void verify_permissions(insn_t insn, bool write) const override;
+};
 #endif

riscv/encoding.h

@@ -4,7 +4,7 @@
 
 /*
  * This file is auto-generated by running 'make' in
- * https://github.com/riscv/riscv-opcodes (47862ce)
+ * https://github.com/riscv/riscv-opcodes (9f70bcd)
  */
 
 #ifndef RISCV_CSR_ENCODING_H
@@ -81,8 +81,9 @@
 #define USTATUS_UPIE        0x00000010
 
 #define MNSTATUS_NMIE       0x00000008
-#define MNSTATUS_MNPP       0x00001800
 #define MNSTATUS_MNPV       0x00000080
+#define MNSTATUS_MNPELP     0x00000200
+#define MNSTATUS_MNPP       0x00001800
 
 #define DCSR_XDEBUGVER      (15U<<28)
 #define DCSR_EXTCAUSE       (7<<24)
@@ -194,6 +195,7 @@
 #define MSTATEEN0_FCSR     0x00000002
 #define MSTATEEN0_JVT      0x00000004
 #define MSTATEEN0_CTR      0x0040000000000000
+#define MSTATEEN0_PRIV113  0x0100000000000000
 #define MSTATEEN0_PRIV114  0x0080000000000000
 #define MSTATEEN0_HCONTEXT 0x0200000000000000
 #define MSTATEEN0_AIA      0x0800000000000000
@@ -202,6 +204,7 @@
 #define MSTATEEN_HSTATEEN  0x8000000000000000
 
 #define MSTATEEN0H_CTR      0x00400000
+#define MSTATEEN0H_PRIV113  0x01000000
 #define MSTATEEN0H_PRIV114  0x00800000
 #define MSTATEEN0H_HCONTEXT 0x02000000
 #define MSTATEEN0H_AIA      0x08000000
@@ -2768,6 +2771,7 @@
 #define CSR_VSIEH 0x214
 #define CSR_VSIPH 0x254
 #define CSR_VSTIMECMPH 0x25d
+#define CSR_HEDELEGH 0x612
 #define CSR_HTIMEDELTAH 0x615
 #define CSR_HIDELEGH 0x613
 #define CSR_HVIENH 0x618
@@ -4313,6 +4317,7 @@ DECLARE_CSR(stimecmph, CSR_STIMECMPH)
 DECLARE_CSR(vsieh, CSR_VSIEH)
 DECLARE_CSR(vsiph, CSR_VSIPH)
 DECLARE_CSR(vstimecmph, CSR_VSTIMECMPH)
+DECLARE_CSR(hedelegh, CSR_HEDELEGH)
 DECLARE_CSR(htimedeltah, CSR_HTIMEDELTAH)
 DECLARE_CSR(hidelegh, CSR_HIDELEGH)
 DECLARE_CSR(hvienh, CSR_HVIENH)