diff options
author | Canberk Topal <ctopal@lowrisc.org> | 2022-07-26 16:26:39 +0100 |
---|---|---|
committer | Canberk Topal <ctopal@lowrisc.org> | 2022-08-01 15:28:22 +0100 |
commit | 2d69ec069e6e771eaf59b419b2bfd89d5298c53c (patch) | |
tree | 3feb5a0367af1ed42300df6cadc97802d644f536 | |
parent | 66fd65c0d2ebc84bd8d8f82258e0988fdca07719 (diff) | |
download | riscv-isa-sim-2d69ec069e6e771eaf59b419b2bfd89d5298c53c.zip riscv-isa-sim-2d69ec069e6e771eaf59b419b2bfd89d5298c53c.tar.gz riscv-isa-sim-2d69ec069e6e771eaf59b419b2bfd89d5298c53c.tar.bz2 |
WFI condition fix
Before this commit Spike was requiring S mode privilege even without
S mode implemented. This commit fixes it.
Signed-off-by: Canberk Topal <ctopal@lowrisc.org>
-rw-r--r-- | riscv/insns/wfi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/riscv/insns/wfi.h b/riscv/insns/wfi.h index 299cb01..3411da0 100644 --- a/riscv/insns/wfi.h +++ b/riscv/insns/wfi.h @@ -5,7 +5,9 @@ if (STATE.v && STATE.prv == PRV_U) { } else if (STATE.v) { // VS-mode if (get_field(STATE.hstatus->read(), HSTATUS_VTW)) require_novirt(); -} else { +} else if (p->extension_enabled('S')) { + // When S-mode is implemented, then executing WFI in + // U-mode causes an illegal instruction exception. require_privilege(PRV_S); } wfi(); |