From ac46e18f82fd2c040680633e089860998baa5a5d Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Mon, 21 Sep 2020 17:53:35 -0700 Subject: Raise virtual-instruction traps correctly for WFI/SRET/SFENCE --- riscv/insns/wfi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'riscv/insns/wfi.h') 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(); -- cgit v1.1