From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Mon, 2 May 2016 22:05:38 +0000 (-0700)
Subject: Remove incorrect M-mode WFI test
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ef625f6968e0a862b324d0d855f5edde13191e1f;p=riscv-tests.git

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 ed973db..01f75c2 100644
--- 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
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 6b1e818..8e56909 100644
--- 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