diff options
| author | Andrew Waterman <andrew@sifive.com> | 2024-02-19 01:49:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-19 01:49:04 -0800 |
| commit | 066a3c1fb05653034fa5e05acc938f4200a161e0 (patch) | |
| tree | a3a352e955f1d6e5e687f6c7dfd8f5d1fee92ff3 | |
| parent | 8b4fffe23c802406019bc2ea84cb0f2cee2f375d (diff) | |
| parent | 4a2b38ffcf8dd01320f601d6014464f510904e53 (diff) | |
| download | spike-066a3c1fb05653034fa5e05acc938f4200a161e0.zip spike-066a3c1fb05653034fa5e05acc938f4200a161e0.tar.gz spike-066a3c1fb05653034fa5e05acc938f4200a161e0.tar.bz2 | |
Merge pull request #1610 from YenHaoChen/pr-wfi
Raise illegal instruction instead of virtual instruction on WFI when TW=1 and VTW=0 in VU-mode
| -rw-r--r-- | riscv/insns/wfi.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/riscv/insns/wfi.h b/riscv/insns/wfi.h index 3411da0..5382072 100644 --- a/riscv/insns/wfi.h +++ b/riscv/insns/wfi.h @@ -1,9 +1,7 @@ -if (STATE.v && STATE.prv == PRV_U) { - require_novirt(); -} else if (get_field(STATE.mstatus->read(), MSTATUS_TW)) { +if (get_field(STATE.mstatus->read(), MSTATUS_TW)) { require_privilege(PRV_M); -} else if (STATE.v) { // VS-mode - if (get_field(STATE.hstatus->read(), HSTATUS_VTW)) +} else if (STATE.v) { + if (STATE.prv == PRV_U || get_field(STATE.hstatus->read(), HSTATUS_VTW)) require_novirt(); } else if (p->extension_enabled('S')) { // When S-mode is implemented, then executing WFI in |