Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear MPRV on xret as per spec.

Browse Source
This commit is contained in:
Florian Nücke
2020-09-18 09:31:11 +02:00
parent fba9fa6616
commit e2c6185e32
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/li/cil/circuity/vm/riscv/R5CPU.java
View File

@@ -1428,8 +1428,7 @@ public class R5CPU implements Steppable, RealTimeCounter, InterruptController {
(spie << spp);
mstatus |= R5.STATUS_SPIE_MASK;
mstatus &= ~R5.STATUS_SPP_MASK;
// set MPRV = 0
mstatus &= ~R5.STATUS_MPRV_MASK;
setPrivilege(spp);
@@ -1446,9 +1445,8 @@ public class R5CPU implements Steppable, RealTimeCounter, InterruptController {
mstatus = (mstatus & ~R5.STATUS_MIE_MASK) | ((R5.STATUS_MIE_MASK * mpie) << R5.STATUS_MIE_SHIFT);
mstatus |= R5.STATUS_MPIE_MASK;
mstatus &= ~R5.STATUS_MPP_MASK;
if (mpp != R5.PRIVILEGE_M) {
// set MPRV = 0
mstatus &= ~R5.STATUS_MPRV_MASK;
}
setPrivilege(mpp);