Add missing priv qualification to prev_virt

ved-rivos · ved-rivos · commit 64972b7d9fb8 · 2024-11-14T06:37:24.000-06:00
diff --git a/riscv/insns/mret.h b/riscv/insns/mret.h
@@ -14,7 +14,7 @@ if (ZICFILP_xLPE(prev_virt, prev_prv)) {
 }
 s = set_field(s, MSTATUS_MPELP, elp_t::NO_LP_EXPECTED);
 s = set_field(s, MSTATUS_MDT, 0);
-if (prev_prv == PRV_U || prev_virt)
+if (prev_prv == PRV_U || (prev_virt && prev_prv != PRV_M))
   s = set_field(s, MSTATUS_SDT, 0);
 if (prev_virt && prev_prv == PRV_U)
   STATE.vsstatus->write(STATE.vsstatus->read() & ~SSTATUS_SDT);

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ if (ZICFILP_xLPE(prev_virt, prev_prv)) {`
`14`	`14`	`}`
`15`	`15`	`s = set_field(s, MSTATUS_MPELP, elp_t::NO_LP_EXPECTED);`
`16`	`16`	`s = set_field(s, MSTATUS_MDT, 0);`
`17`		`-if (prev_prv == PRV_U \|\| prev_virt)`
	`17`	`+if (prev_prv == PRV_U \|\| (prev_virt && prev_prv != PRV_M))`
`18`	`18`	`s = set_field(s, MSTATUS_SDT, 0);`
`19`	`19`	`if (prev_virt && prev_prv == PRV_U)`
`20`	`20`	`STATE.vsstatus->write(STATE.vsstatus->read() & ~SSTATUS_SDT);`