From c9cafde3d3b8075031c0786a589a05ad54732a5d Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Wed, 2 Mar 2016 23:19:58 -0800
Subject: [PATCH] Make WFI test more strict

---
 env              | 2 +-
 isa/rv64si/wfi.S | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/env b/env
index a6dae9f..b7528b8 160000
--- 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 4575f59..6b1e818 100644
--- 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
 
-- 
2.30.2