yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 22:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/riscv: Generate illegal instruction on WFI when V=1

Browse source 
Backports commit 9d0d11269671646be7475cc01142e9d3ed8ae59c from qemu
This commit is contained in:
Alistair Francis 2020-03-22 01:38:12 -04:00 committed by Lioncash
parent 4af0dc9a7e
commit f6b14e146e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qemu/target/riscv/op_helper.c
View file

@ -129,9 +129,10 @@ void helper_wfi(CPURISCVState *env)
{ {
CPUState *cs = env_cpu(env); CPUState *cs = env_cpu(env);
if (env->priv == PRV_S && if ((env->priv == PRV_S &&
env->priv_ver >= PRIV_VERSION_1_10_0 && env->priv_ver >= PRIV_VERSION_1_10_0 &&
get_field(env->mstatus, MSTATUS_TW)) { get_field(env->mstatus, MSTATUS_TW)) ||
riscv_cpu_virt_enabled(env)) {
riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC());
} else { } else {
cs->halted = 1; cs->halted = 1;