diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-03-17 01:16:09 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-03-17 01:16:09 -0700 |
| commit | 9d64d0579feaac16578158b29c94767823f19a83 (patch) | |
| tree | bfb2cc4e2165c665bd2a07cfa5f12206aa734659 /p | |
| parent | be6511639c2d9291e9050682c4d7ce3e7042d061 (diff) | |
| download | env-9d64d0579feaac16578158b29c94767823f19a83.zip env-9d64d0579feaac16578158b29c94767823f19a83.tar.gz env-9d64d0579feaac16578158b29c94767823f19a83.tar.bz2 | |
Merge [shm]call into ecall, [shm]ret into eret
Diffstat (limited to 'p')
| -rw-r--r-- | p/riscv_test.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/p/riscv_test.h b/p/riscv_test.h index bea9b3a..4efb6fc 100644 --- a/p/riscv_test.h +++ b/p/riscv_test.h @@ -121,7 +121,7 @@ .align 6; \ tvec_user: \ EXTRA_TVEC_USER; \ - la t5, hcall; \ + la t5, ecall; \ csrr t6, mepc; \ beq t5, t6, write_tohost; \ li t5, 0xbadbad0; \ @@ -145,7 +145,7 @@ tvec_hypervisor: \ tvec_machine: \ EXTRA_TVEC_MACHINE; \ .weak mtvec; \ - la t5, hcall; \ + la t5, ecall; \ csrr t6, mepc; \ beq t5, t6, write_tohost; \ la t5, mtvec; \ @@ -163,7 +163,7 @@ _start: \ la t0, 1f; \ csrw mepc, t0; \ csrr a0, hartid; \ - mret; \ + eret; \ 1: //----------------------------------------------------------------------- @@ -171,8 +171,8 @@ _start: \ //----------------------------------------------------------------------- #define RVTEST_CODE_END \ -hcall: hcall; \ - j hcall +ecall: ecall; \ + j ecall //----------------------------------------------------------------------- // Pass/Fail Macro @@ -181,7 +181,7 @@ hcall: hcall; \ #define RVTEST_PASS \ fence; \ li TESTNUM, 1; \ - j hcall + j ecall #define TESTNUM x28 #define RVTEST_FAIL \ @@ -189,7 +189,7 @@ hcall: hcall; \ 1: beqz TESTNUM, 1b; \ sll TESTNUM, TESTNUM, 1; \ or TESTNUM, TESTNUM, 1; \ - j hcall + j ecall //----------------------------------------------------------------------- // Data Section Macro |