summaryrefslogtreecommitdiff
path: root/v/entry.S
diff options
context:
space:
mode:
authorAndrew Waterman <waterman@cs.berkeley.edu>2016-04-30 20:44:46 -0700
committerAndrew Waterman <waterman@cs.berkeley.edu>2016-04-30 20:44:46 -0700
commit3d45ca302dbf5ac22cfac8fb025c05c735c35e26 (patch)
treebc0184068ab372b75d30feb6ef2f1e0465c67fa3 /v/entry.S
parent0fc840489c21530a8bfdaecac1131fcd20bdaea2 (diff)
downloadenv-3d45ca302dbf5ac22cfac8fb025c05c735c35e26.zip
env-3d45ca302dbf5ac22cfac8fb025c05c735c35e26.tar.gz
env-3d45ca302dbf5ac22cfac8fb025c05c735c35e26.tar.bz2
ERET -> xRET; change memory map
Diffstat (limited to 'v/entry.S')
-rw-r--r--v/entry.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/v/entry.S b/v/entry.S
index f503764..64d9606 100644
--- a/v/entry.S
+++ b/v/entry.S
@@ -32,6 +32,8 @@ trap_vector:
j wtf
handle_reset:
+ la t0, trap_vector
+ csrw mtvec, t0
la sp, STACK_TOP - SIZEOF_TRAPFRAME_T
csrw mscratch, sp
li a1, 1337
@@ -73,7 +75,7 @@ pop_tf:
LOAD x30,30*REGBYTES(a0)
LOAD x31,31*REGBYTES(a0)
LOAD a0,10*REGBYTES(a0)
- eret
+ sret
.global trap_entry
trap_entry:
@@ -142,7 +144,7 @@ handle_tohost:
csrr t0, mepc
addi t0, t0, 4
csrw mepc, t0
- eret
+ mret
wtf:
li a0, 841