zkr: check extension availability in csr_mseccef permssion check

binno · chihminchao · commit 50c89eaba38c · 2024-07-16T02:18:42.000-07:00
diff --git a/riscv/csrs.cc b/riscv/csrs.cc
@@ -286,7 +286,8 @@ mseccfg_csr_t::mseccfg_csr_t(processor_t* const proc, const reg_t addr):
 void mseccfg_csr_t::verify_permissions(insn_t insn, bool write) const {
   basic_csr_t::verify_permissions(insn, write);
   if (!proc->extension_enabled(EXT_SMEPMP) &&
-      !proc->extension_enabled(EXT_ZICFILP))
+      !proc->extension_enabled(EXT_ZICFILP) &&
+      !proc->extension_enabled(EXT_ZKR))
     throw trap_illegal_instruction(insn.bits());
 }
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,8 @@ mseccfg_csr_t::mseccfg_csr_t(processor_t* const proc, const reg_t addr):`
`286`	`286`	`void mseccfg_csr_t::verify_permissions(insn_t insn, bool write) const {`
`287`	`287`	`basic_csr_t::verify_permissions(insn, write);`
`288`	`288`	`if (!proc->extension_enabled(EXT_SMEPMP) &&`
`289`		`- !proc->extension_enabled(EXT_ZICFILP))`
	`289`	`+ !proc->extension_enabled(EXT_ZICFILP) &&`
	`290`	`+ !proc->extension_enabled(EXT_ZKR))`
`290`	`291`	`throw trap_illegal_instruction(insn.bits());`
`291`	`292`	`}`
`292`	`293`