Merge pull request #1862 from NewPaulWalker/fix-hvip

aswaterman · web-flow · commit 7812eabb441e · 2024-11-27T15:44:35.000-08:00
Fix WMASK of LCOFI bit(bit 13) in hvip
diff --git a/riscv/csrs.cc b/riscv/csrs.cc
@@ -1836,7 +1836,8 @@ reg_t hvip_csr_t::read() const noexcept {
 
 bool hvip_csr_t::unlogged_write(const reg_t val) noexcept {
   state->mip->write_with_mask(MIP_VSSIP, val); // hvip.VSSIP is an alias of mip.VSSIP
-  return basic_csr_t::unlogged_write(val & (MIP_VSEIP | MIP_VSTIP));
+  const reg_t lscof_int = proc->extension_enabled(EXT_SSCOFPMF) ? MIP_LCOFIP : 0;
+  return basic_csr_t::unlogged_write(val & (lscof_int | MIP_VSEIP | MIP_VSTIP));
 }
 
 ssp_csr_t::ssp_csr_t(processor_t* const proc, const reg_t addr, const reg_t mask, const reg_t init):

Original file line number	Diff line number	Diff line change
`@@ -1836,7 +1836,8 @@ reg_t hvip_csr_t::read() const noexcept {`
`1836`	`1836`
`1837`	`1837`	`bool hvip_csr_t::unlogged_write(const reg_t val) noexcept {`
`1838`	`1838`	`state->mip->write_with_mask(MIP_VSSIP, val); // hvip.VSSIP is an alias of mip.VSSIP`
`1839`		`- return basic_csr_t::unlogged_write(val & (MIP_VSEIP \| MIP_VSTIP));`
	`1839`	`+ const reg_t lscof_int = proc->extension_enabled(EXT_SSCOFPMF) ? MIP_LCOFIP : 0;`
	`1840`	`+ return basic_csr_t::unlogged_write(val & (lscof_int \| MIP_VSEIP \| MIP_VSTIP));`
`1840`	`1841`	`}`
`1841`	`1842`
`1842`	`1843`	`ssp_csr_t::ssp_csr_t(processor_t* const proc, const reg_t addr, const reg_t mask, const reg_t init):`