Remove incorrect M-mode WFI test

MSIP isn't supposed to be writable locally!

diff --git a/isa/rv64mi/Makefrag b/isa/rv64mi/Makefrag
index ed973db67148e8590908a2c158068589b4eb7151..01f75c25cb7756dd7fa3cb31f61b1682ee620c54 100644 (file)
--- a/isa/rv64mi/Makefrag
+++ b/isa/rv64mi/Makefrag
@@ -10,7 +10,6 @@ rv64mi_sc_tests = \
        ma_fetch \
        ma_addr \
        scall \
-       wfi \
        sbreak \
 
 rv64mi_mc_tests = \

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

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