diff options
| author | Andrew Waterman <andrew@sifive.com> | 2022-08-01 14:43:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-01 14:43:59 -0700 |
| commit | 14cb6b2a6244e3a1511c4c169676a6e2bd6785ed (patch) | |
| tree | 01155f3543986158ff705089ce3824ac1ac04a43 | |
| parent | 5cabfe7b861d809007fa1954a596c3659db9cb3d (diff) | |
| parent | 2d69ec069e6e771eaf59b419b2bfd89d5298c53c (diff) | |
| download | riscv-isa-sim-14cb6b2a6244e3a1511c4c169676a6e2bd6785ed.zip riscv-isa-sim-14cb6b2a6244e3a1511c4c169676a6e2bd6785ed.tar.gz riscv-isa-sim-14cb6b2a6244e3a1511c4c169676a6e2bd6785ed.tar.bz2 | |
Merge pull request #1055 from ctopal/umode_wfi
WFI condition fix
| -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(); |