diff options
| author | Andrew Waterman <andrew@sifive.com> | 2020-09-21 17:53:35 -0700 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2020-09-21 17:53:35 -0700 |
| commit | ac46e18f82fd2c040680633e089860998baa5a5d (patch) | |
| tree | c199bbf7284de55b52eaa8b2c66e774bce73f219 /riscv | |
| parent | fbb5a7620ffd2d6f7583148881e2c9fc501a4614 (diff) | |
| download | spike-ac46e18f82fd2c040680633e089860998baa5a5d.zip spike-ac46e18f82fd2c040680633e089860998baa5a5d.tar.gz spike-ac46e18f82fd2c040680633e089860998baa5a5d.tar.bz2 | |
Raise virtual-instruction traps correctly for WFI/SRET/SFENCE
Diffstat (limited to 'riscv')
| -rw-r--r-- | riscv/insns/sfence_vma.h | 2 | ||||
| -rw-r--r-- | riscv/insns/sret.h | 4 | ||||
| -rw-r--r-- | riscv/insns/wfi.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/riscv/insns/sfence_vma.h b/riscv/insns/sfence_vma.h index 3d42b70..aca14d0 100644 --- a/riscv/insns/sfence_vma.h +++ b/riscv/insns/sfence_vma.h @@ -1,3 +1,5 @@ require_extension('S'); +if (STATE.v && (STATE.prv == PRV_U || get_field(STATE.hstatus, HSTATUS_VTVM))) + require_novirt(); require_privilege(get_field(STATE.mstatus, MSTATUS_TVM) ? PRV_M : PRV_S); MMU.flush_tlb(); diff --git a/riscv/insns/sret.h b/riscv/insns/sret.h index bc063e6..4423506 100644 --- a/riscv/insns/sret.h +++ b/riscv/insns/sret.h @@ -1,7 +1,7 @@ require_extension('S'); -require_privilege(get_field(STATE.mstatus, MSTATUS_TSR) ? PRV_M : PRV_S); -if (STATE.v && get_field(STATE.hstatus, HSTATUS_VTSR)) +if (STATE.v && (STATE.prv == PRV_U || get_field(STATE.hstatus, HSTATUS_VTSR))) require_novirt(); +require_privilege(get_field(STATE.mstatus, MSTATUS_TSR) ? PRV_M : PRV_S); reg_t next_pc = (STATE.v) ? p->get_state()->vsepc : p->get_state()->sepc; set_pc_and_serialize(next_pc); reg_t s = STATE.mstatus; diff --git a/riscv/insns/wfi.h b/riscv/insns/wfi.h index 5b1d1d6..edcd863 100644 --- a/riscv/insns/wfi.h +++ b/riscv/insns/wfi.h @@ -1,4 +1,4 @@ -require_privilege(get_field(STATE.mstatus, MSTATUS_TW) ? PRV_M : PRV_S); -if (STATE.v && get_field(STATE.hstatus, HSTATUS_VTW)) +if (STATE.v && (STATE.prv == PRV_U || get_field(STATE.hstatus, HSTATUS_VTW))) require_novirt(); +require_privilege(get_field(STATE.mstatus, MSTATUS_TW) ? PRV_M : PRV_S); wfi(); |