summaryrefslogtreecommitdiff
path: root/p
diff options
context:
space:
mode:
authorAndrew Waterman <waterman@cs.berkeley.edu>2015-03-12 23:09:06 -0700
committerAndrew Waterman <waterman@cs.berkeley.edu>2015-03-12 23:09:06 -0700
commitbd2090129b328fa9803275df0e52459d645e8ceb (patch)
tree3122d39fe7d9b463508979c1291f0460fbaed0be /p
parent3a2ed4c0966add8f9730c3962a784cc423891663 (diff)
downloadenv-bd2090129b328fa9803275df0e52459d645e8ceb.zip
env-bd2090129b328fa9803275df0e52459d645e8ceb.tar.gz
env-bd2090129b328fa9803275df0e52459d645e8ceb.tar.bz2
Use hcall instead of mcall
Diffstat (limited to 'p')
-rw-r--r--p/riscv_test.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/p/riscv_test.h b/p/riscv_test.h
index 36d723d..0c677f7 100644
--- a/p/riscv_test.h
+++ b/p/riscv_test.h
@@ -110,7 +110,7 @@
.text; \
.align 6; \
tvec_user: \
- la t5, mcall; \
+ la t5, hcall; \
csrr t6, mepc; \
beq t5, t6, write_tohost; \
li t5, 0xbadbad0; \
@@ -131,7 +131,7 @@ tvec_hypervisor: \
.align 6; \
tvec_machine: \
.weak mtvec; \
- la t5, mcall; \
+ la t5, hcall; \
csrr t6, mepc; \
beq t5, t6, write_tohost; \
la t5, mtvec; \
@@ -157,8 +157,8 @@ _start: \
//-----------------------------------------------------------------------
#define RVTEST_CODE_END \
-mcall: mcall; \
- j mcall
+hcall: hcall; \
+ j hcall
//-----------------------------------------------------------------------
// Pass/Fail Macro
@@ -167,7 +167,7 @@ mcall: mcall; \
#define RVTEST_PASS \
fence; \
li TESTNUM, 1; \
- j mcall
+ j hcall
#define TESTNUM x28
#define RVTEST_FAIL \
@@ -175,7 +175,7 @@ mcall: mcall; \
1: beqz TESTNUM, 1b; \
sll TESTNUM, TESTNUM, 1; \
or TESTNUM, TESTNUM, 1; \
- j mcall
+ j hcall
//-----------------------------------------------------------------------
// Data Section Macro