Merge pull request #1630 from mylai-mtk/zicfilp

aswaterman · web-flow · commit 534fe05b836d · 2024-03-22T14:00:26.000-07:00
Allow software check exception to be delegated from M mode regardless of Zicfilp being enabled
diff --git a/riscv/csrs.cc b/riscv/csrs.cc
@@ -906,7 +906,7 @@ bool medeleg_csr_t::unlogged_write(const reg_t val) noexcept {
     | (1 << CAUSE_LOAD_PAGE_FAULT)
     | (1 << CAUSE_STORE_PAGE_FAULT)
     | (proc->extension_enabled('H') ? hypervisor_exceptions : 0)
-    | (proc->extension_enabled(EXT_ZICFILP) ? (1 << CAUSE_SOFTWARE_CHECK_FAULT) : 0)
+    | (1 << CAUSE_SOFTWARE_CHECK_FAULT)
     ;
   return basic_csr_t::unlogged_write((read() & ~mask) | (val & mask));
 }

Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,7 @@ bool medeleg_csr_t::unlogged_write(const reg_t val) noexcept {`
`906`	`906`	`\| (1 << CAUSE_LOAD_PAGE_FAULT)`
`907`	`907`	`\| (1 << CAUSE_STORE_PAGE_FAULT)`
`908`	`908`	`\| (proc->extension_enabled('H') ? hypervisor_exceptions : 0)`
`909`		`- \| (proc->extension_enabled(EXT_ZICFILP) ? (1 << CAUSE_SOFTWARE_CHECK_FAULT) : 0)`
	`909`	`+ \| (1 << CAUSE_SOFTWARE_CHECK_FAULT)`
`910`	`910`	`;`
`911`	`911`	`return basic_csr_t::unlogged_write((read() & ~mask) \| (val & mask));`
`912`	`912`	`}`