diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-07-07 19:29:03 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-07-07 19:29:03 -0700 |
| commit | 3dc00e7b04834f862a074ac8822892e1ecfc009c (patch) | |
| tree | 363394fe4b6ff532cb4c5d500cd0f3d08043a9c0 | |
| parent | aff36b0963e6eee63906b3d8622be5a98ba27a43 (diff) | |
| download | riscv-tests-3dc00e7b04834f862a074ac8822892e1ecfc009c.zip riscv-tests-3dc00e7b04834f862a074ac8822892e1ecfc009c.tar.gz riscv-tests-3dc00e7b04834f862a074ac8822892e1ecfc009c.tar.bz2 | |
Update WFI test for priv v1.9
| m--------- | env | 10 | ||||
| -rw-r--r-- | isa/rv32mi/Makefrag | 1 | ||||
| -rw-r--r-- | isa/rv32mi/wfi.S | 8 | ||||
| -rw-r--r-- | isa/rv64si/wfi.S | 5 |
4 files changed, 8 insertions, 16 deletions
diff --git a/env b/env -Subproject 5c613fe43d1bc44e6ae408b5356c7d60d93a1ca +Subproject 92fb0bd7d7d2723f90896bb351f5cdb0eb36b73 diff --git a/isa/rv32mi/Makefrag b/isa/rv32mi/Makefrag index 9aeb12d..c8fbcf4 100644 --- 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 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 8e56909..0302034 100644 --- 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 |