diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-03-17 01:18:36 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-03-17 01:18:36 -0700 |
| commit | 211d78276b07b17f831cefaf79961d3e6dad3c90 (patch) | |
| tree | f640b72bdf446e7f78eb9cae97ee99c80e54dbf1 /benchmarks | |
| parent | dd0d4036430dc812c9168fad8870d58ce151f498 (diff) | |
| download | riscv-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 'benchmarks')
| -rw-r--r-- | benchmarks/common/crt.S | 4 | ||||
| -rw-r--r-- | benchmarks/common/syscalls.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/benchmarks/common/crt.S b/benchmarks/common/crt.S index debee6d..19ff3b2 100644 --- 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 12dab70..b1c100d 100644 --- 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]); |