aboutsummaryrefslogtreecommitdiff
path: root/isa/rv64si
diff options
context:
space:
mode:
authorAndrew Waterman <waterman@cs.berkeley.edu>2015-03-17 01:18:36 -0700
committerAndrew Waterman <waterman@cs.berkeley.edu>2015-03-17 01:18:36 -0700
commit211d78276b07b17f831cefaf79961d3e6dad3c90 (patch)
treef640b72bdf446e7f78eb9cae97ee99c80e54dbf1 /isa/rv64si
parentdd0d4036430dc812c9168fad8870d58ce151f498 (diff)
downloadriscv-tests-211d78276b07b17f831cefaf79961d3e6dad3c90.zip
riscv-tests-211d78276b07b17f831cefaf79961d3e6dad3c90.tar.gz
riscv-tests-211d78276b07b17f831cefaf79961d3e6dad3c90.tar.bz2
Merge [shm]call into ecall, [shm]ret into eret
Diffstat (limited to 'isa/rv64si')
-rw-r--r--isa/rv64si/csr.S2
-rw-r--r--isa/rv64si/dirty.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/isa/rv64si/csr.S b/isa/rv64si/csr.S
index 2a326a6..edaaeb3 100644
--- a/isa/rv64si/csr.S
+++ b/isa/rv64si/csr.S
@@ -78,7 +78,7 @@ privileged:
syscall:
# Make sure CAUSE indicates a syscall.
csrr t0, scause
- li t1, CAUSE_SCALL
+ li t1, CAUSE_ECALL
bne t0, t1, fail
# We're done.
diff --git a/isa/rv64si/dirty.S b/isa/rv64si/dirty.S
index 87a619a..78e333b 100644
--- a/isa/rv64si/dirty.S
+++ b/isa/rv64si/dirty.S
@@ -23,7 +23,7 @@ RVTEST_CODE_BEGIN
csrs mstatus, a1
la a1, 1f
csrw mepc, a1
- mret
+ eret
1:
# Try a faulting store to make sure dirty bit is not set