Fix envcfg check when S-mode is not available

mimiqdev · mimiqdev · commit a3feb90af786 · 2025-01-21T22:04:50.000+08:00
diff --git a/riscv/csrs.cc b/riscv/csrs.cc
@@ -1846,6 +1846,7 @@ ssp_csr_t::ssp_csr_t(processor_t* const proc, const reg_t addr, const reg_t mask
 void ssp_csr_t::verify_permissions(insn_t insn, bool write) const {
   masked_csr_t::verify_permissions(insn, write);
   DECLARE_XENVCFG_VARS(SSE);
+  auto p = proc; // To match macro usage
   require_envcfg(SSE);
 }
 
diff --git a/riscv/decode_macros.h b/riscv/decode_macros.h
@@ -193,7 +193,7 @@ static inline bool is_aligned(const unsigned val, const unsigned pos)
 #define require_envcfg(field) \
   do { \
     if (((STATE.prv != PRV_M) && (m##field == 0)) || \
-        ((STATE.prv == PRV_U && !STATE.v) && (s##field == 0))) \
+        (p->extension_enabled('S') && (STATE.prv == PRV_U && !STATE.v) && (s##field == 0))) \
       throw trap_illegal_instruction(insn.bits()); \
     else if (STATE.v && ((h##field == 0) || \
                         ((STATE.prv == PRV_U) && (s##field == 0)))) \

Original file line number	Diff line number	Diff line change
`@@ -1846,6 +1846,7 @@ ssp_csr_t::ssp_csr_t(processor_t* const proc, const reg_t addr, const reg_t mask`
`1846`	`1846`	`void ssp_csr_t::verify_permissions(insn_t insn, bool write) const {`
`1847`	`1847`	`masked_csr_t::verify_permissions(insn, write);`
`1848`	`1848`	`DECLARE_XENVCFG_VARS(SSE);`
	`1849`	`+ auto p = proc; // To match macro usage`
`1849`	`1850`	`require_envcfg(SSE);`
`1850`	`1851`	`}`
`1851`	`1852`