Merge [shm]call into ecall, [shm]ret into eret

diff --git a/benchmarks/common/crt.S b/benchmarks/common/crt.S
index debee6dbc3d962146afd71bb967201ebfee6ed7f..19ff3b262f065873ed20bdd51d95b998f53509cd 100644 (file)
--- a/benchmarks/common/crt.S
+++ b/benchmarks/common/crt.S
@@ -135,7 +135,7 @@ _start:
 
   la t0, _init
   csrw mepc, t0
-  mret
+  eret
 
 trap_entry:
   addi sp, sp, -272
@@ -211,7 +211,7 @@ trap_entry:
   LREG x31, 248(sp)
 
   addi sp, sp, 272
-  mret
+  eret
 
 .section ".tdata.begin"
 .globl _tdata_begin

diff --git a/benchmarks/common/syscalls.c b/benchmarks/common/syscalls.c
index 12dab700af9b2e5b339d5dcbd42e3efcdca4a948..b1c100dd10ce0830bc4ac68c921cd397f8bfd316 100644 (file)
--- a/benchmarks/common/syscalls.c
+++ b/benchmarks/common/syscalls.c
@@ -75,7 +75,7 @@ long handle_trap(long cause, long epc, long regs[32])
   if (cause == CAUSE_ILLEGAL_INSTRUCTION &&
       (*(int*)epc & *csr_insn) == *csr_insn)
     ;
-  else if (cause != CAUSE_SCALL)
+  else if (cause != CAUSE_ECALL)
     tohost_exit(1337);
   else if (regs[17] == SYS_exit)
     tohost_exit(regs[10]);

diff --git a/env b/env
index be6511639c2d9291e9050682c4d7ce3e7042d061..9d64d0579feaac16578158b29c94767823f19a83 160000 (submodule)
--- a/env
+++ b/env
@@ -1 +1 @@
-Subproject commit be6511639c2d9291e9050682c4d7ce3e7042d061
+Subproject commit 9d64d0579feaac16578158b29c94767823f19a83

diff --git a/isa/rv32si/scall.S b/isa/rv32si/scall.S
index c5cc3ac98ce7b68d3865b53db928c1f8ac796b3b..a036aaf648e62c0a5dadd96d87438b8944649b77 100644 (file)
--- a/isa/rv32si/scall.S
+++ b/isa/rv32si/scall.S
@@ -25,7 +25,7 @@ RVTEST_CODE_BEGIN
   TEST_PASSFAIL
 
 stvec:
-  li t1, CAUSE_SCALL
+  li t1, CAUSE_ECALL
   csrr t0, scause
   bne t0, t1, fail
   csrr t0, sepc

diff --git a/isa/rv64si/csr.S b/isa/rv64si/csr.S
index 2a326a6cc807a0de79b11190651859328f25c02c..edaaeb3e1da32cca2f899457c8d7343a945d0e61 100644 (file)
--- 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 87a619ab999bd3a4fa22d232bbcb4db743bded09..78e333b62995714cccf891d4c5013a3fcf301840 100644 (file)
--- 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