diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-03-02 23:19:58 -0800 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-03-03 11:03:59 -0800 |
| commit | c9cafde3d3b8075031c0786a589a05ad54732a5d (patch) | |
| tree | 5d82e3847d8e7283332e93acd268f15568dbfa5f | |
| parent | 4d1491df727e9aeb5fdfeac25c22eaf24cafb908 (diff) | |
| download | riscv-tests-c9cafde3d3b8075031c0786a589a05ad54732a5d.zip riscv-tests-c9cafde3d3b8075031c0786a589a05ad54732a5d.tar.gz riscv-tests-c9cafde3d3b8075031c0786a589a05ad54732a5d.tar.bz2 | |
Make WFI test more strict
| m--------- | env | 8 | ||||
| -rw-r--r-- | isa/rv64si/wfi.S | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/env b/env -Subproject a6dae9f422fc86a6459d26b71672e1cb55a4fc2 +Subproject b7528b89c8673bf38e5e4ec1e8f037ec2bcbee2 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 |