Update WFI test for priv v1.9

diff --git a/env b/env
index 5c613fe43d1bc44e6ae408b5356c7d60d93a1ca0..92fb0bd7d7d2723f90896bb351f5cdb0eb36b73b 160000 (submodule)
--- a/env
+++ b/env
@@ -1 +1 @@
-Subproject commit 5c613fe43d1bc44e6ae408b5356c7d60d93a1ca0
+Subproject commit 92fb0bd7d7d2723f90896bb351f5cdb0eb36b73b

diff --git a/isa/rv32mi/Makefrag b/isa/rv32mi/Makefrag
index 9aeb12d387aefe3ace6d7982fc712cf5bce60677..c8fbcf4f81287583e256e2fc7ecb2037b3297423 100644 (file)
--- a/isa/rv32mi/Makefrag
+++ b/isa/rv32mi/Makefrag
@@ -12,7 +12,6 @@ rv32mi_sc_tests = \
        scall \
        sbreak \
        shamt \
-       wfi \
 
 rv32mi_mc_tests = \
        ipi \

diff --git a/isa/rv32mi/wfi.S b/isa/rv32mi/wfi.S
deleted file mode 100644 (file)
index d5cb3cb..0000000
--- a/isa/rv32mi/wfi.S
+++ /dev/null
@@ -1,8 +0,0 @@
-# See LICENSE for license details.
-
-#include "riscv_test.h"
-#undef RVTEST_RV64S
-#define RVTEST_RV64S RVTEST_RV32M
-#define __MACHINE_MODE
-
-#include "../rv64si/wfi.S"

diff --git a/isa/rv64si/wfi.S b/isa/rv64si/wfi.S
index 8e569097208561ebcd3e8a54309c4acdae6d67ae..03020342bcb5ad7979be96173dac3b048f0054f9 100644 (file)
--- a/isa/rv64si/wfi.S
+++ b/isa/rv64si/wfi.S
@@ -13,9 +13,10 @@
 RVTEST_RV64S
 RVTEST_CODE_BEGIN
 
-  # Make sure wfi doesn't stall if an interrupt is pending, even if masked
+  # Make sure wfi doesn't halt the hart, even if interrupts are disabled
   csrc sstatus, SSTATUS_SIE
-  csrs sip, MIP_SSIP
+  csrs sie, SIP_SSIP
+  csrs sip, SIP_SSIP
   wfi
 
   RVTEST_PASS