aboutsummaryrefslogtreecommitdiff
path: root/isa
diff options
context:
space:
mode:
authorPaul Donahue <48959409+pdonahue-ventana@users.noreply.github.com>2021-01-08 18:32:03 -0800
committerGitHub <noreply@github.com>2021-01-08 18:32:03 -0800
commite35ee2822f3ffa3c24e7c857c3688f8f260cd98c (patch)
tree7c7caa3e35fb5c847a5c4284fa109d524fa5c380 /isa
parent474323978e1773c4dcefbe085933daa5e955665b (diff)
downloadriscv-tests-e35ee2822f3ffa3c24e7c857c3688f8f260cd98c.zip
riscv-tests-e35ee2822f3ffa3c24e7c857c3688f8f260cd98c.tar.gz
riscv-tests-e35ee2822f3ffa3c24e7c857c3688f8f260cd98c.tar.bz2
Don't rely on the implementation-specific WFI time limit (#318)
* Bump riscv-test-env * Merge master * Don't assume that mscratch is initialized to a particular value on reset * Remove testcase that relies on the implementation-specific WFI time limit being 0.
Diffstat (limited to 'isa')
-rw-r--r--isa/rv64mi/illegal.S18
1 files changed, 0 insertions, 18 deletions
diff --git a/isa/rv64mi/illegal.S b/isa/rv64mi/illegal.S
index 5531570..17566c1 100644
--- a/isa/rv64mi/illegal.S
+++ b/isa/rv64mi/illegal.S
@@ -59,14 +59,6 @@ msip:
1:
# Make sure WFI doesn't trap when TW=0.
wfi
-bad3:
- .word 0
- j fail
-
-bad4:
- # Make sure WFI does trap when TW=1.
- wfi
- j fail
# Make sure SFENCE.VMA and sptbr don't trap when TVM=0.
sfence.vma
@@ -144,10 +136,6 @@ synchronous_exception:
la t1, bad2
beq t0, t1, 2f
- la t1, bad3
- beq t0, t1, 3f
- la t1, bad4
- beq t0, t1, 4f
la t1, bad5
beq t0, t1, 5f
la t1, bad6
@@ -160,18 +148,12 @@ synchronous_exception:
beq t0, t1, 9f
j fail
2:
-4:
6:
7:
addi t0, t0, 8
csrw mepc, t0
mret
-3:
- li t1, MSTATUS_TW
- csrs mstatus, t1
- j 2b
-
5:
li t1, MSTATUS_TVM
csrs mstatus, t1