Update WFI test for priv v1.9

[riscv-tests.git] / isa / rv64si / wfi.S

diff --git a/isa/rv64si/wfi.S b/isa/rv64si/wfi.S
index 956121a0485ee85f35089a8879a4b86bedf16daf..03020342bcb5ad7979be96173dac3b048f0054f9 100644 (file)
--- a/isa/rv64si/wfi.S
+++ b/isa/rv64si/wfi.S
@@ -13,18 +13,10 @@
 RVTEST_RV64S
 RVTEST_CODE_BEGIN
 
-#ifdef __MACHINE_MODE
-  #define sstatus mstatus
-  #define sie mie
-  #define sip mip
-  #undef MIP_SSIP
-  #define MIP_SSIP MIP_MSIP
-#endif
-
-  # Make sure wfi doesn't stall if an interrupt is pending
-  csrc sstatus, SSTATUS_IE
-  csrs sie, MIP_SSIP
-  csrs sip, MIP_SSIP
+  # Make sure wfi doesn't halt the hart, even if interrupts are disabled
+  csrc sstatus, SSTATUS_SIE
+  csrs sie, SIP_SSIP
+  csrs sip, SIP_SSIP
   wfi
 
   RVTEST_PASS