summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-09-12 10:48:48 -0400
committerRobert Morris <[email protected]>2019-09-12 10:48:48 -0400
commit036b5edf12fccc06a11287ad58565f253ab2eef6 (patch)
tree1b89d28a2b7ea1ceebb59a5b28b097e447bc889f /kernel
parent35010f0d0fae49e91b92585f3e97e56da4ac0082 (diff)
downloadxv6-labs-036b5edf12fccc06a11287ad58565f253ab2eef6.tar.gz
xv6-labs-036b5edf12fccc06a11287ad58565f253ab2eef6.tar.bz2
xv6-labs-036b5edf12fccc06a11287ad58565f253ab2eef6.zip
set architecture riscv:rv64 -- fix gdb trampoline disassembly, thanks jonathan
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trampoline.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trampoline.S b/kernel/trampoline.S
index f47c3ff..b113bf6 100644
--- a/kernel/trampoline.S
+++ b/kernel/trampoline.S
@@ -70,7 +70,7 @@ uservec:
# make tp hold the current hartid, from p->tf->kernel_hartid
ld tp, 32(a0)
- # remember the address of usertrap(), p->tf->kernel_trap
+ # load the address of usertrap(), p->tf->kernel_trap
ld t0, 16(a0)
# restore kernel page table from p->tf->kernel_satp
@@ -79,7 +79,7 @@ uservec:
sfence.vma zero, zero
# a0 is no longer valid, since the kernel page
- # table does not specially map p->td.
+ # table does not specially map p->tf.
# jump to usertrap(), which does not return
jr t0
@@ -89,8 +89,8 @@ userret:
# userret(TRAPFRAME, pagetable)
# switch from kernel to user.
# usertrapret() calls here.
- # a0: TRAPFRAME, in user page table
- # a1: user page table, for satp
+ # a0: TRAPFRAME, in user page table.
+ # a1: user page table, for satp.
# switch to the user page table.
csrw satp, a1