Make WFI test more strict

diff --git a/env b/env
index a6dae9f422fc86a6459d26b71672e1cb55a4fc22..b7528b89c8673bf38e5e4ec1e8f037ec2bcbee24 160000 (submodule)
--- a/env
+++ b/env
@@ -1 +1 @@
-Subproject commit a6dae9f422fc86a6459d26b71672e1cb55a4fc22
+Subproject commit b7528b89c8673bf38e5e4ec1e8f037ec2bcbee24

diff --git a/isa/rv64si/wfi.S b/isa/rv64si/wfi.S
index 4575f5984fd012c5185afe95067b77babfff4d1f..6b1e81899e8ea5841bb13345d47c1c18f23d313e 100644 (file)
--- a/isa/rv64si/wfi.S
+++ b/isa/rv64si/wfi.S
@@ -15,7 +15,6 @@ RVTEST_CODE_BEGIN
 
 #ifdef __MACHINE_MODE
   #define sstatus mstatus
-  #define sie mie
   #define sip mip
   #undef MIP_SSIP
   #define MIP_SSIP MIP_MSIP
@@ -23,9 +22,8 @@ RVTEST_CODE_BEGIN
   #define SSTATUS_SIE MSTATUS_MIE
 #endif
 
-  # Make sure wfi doesn't stall if an interrupt is pending
+  # Make sure wfi doesn't stall if an interrupt is pending, even if masked
   csrc sstatus, SSTATUS_SIE
-  csrs sie, MIP_SSIP
   csrs sip, MIP_SSIP
   wfi