summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2020-08-07 05:33:23 -0400
committerRobert Morris <[email protected]>2020-08-07 05:33:23 -0400
commite4b93466792125248bc5e2dfd9c000ab10c59528 (patch)
tree06061ac01e5403761cb8e886c628e889b2299e3c /kernel
parent8b9b7999376f67f45cf9efde675d418841a264ce (diff)
parent6c3099d31401dfb76204c276572b7a34caad9b44 (diff)
downloadxv6-labs-e4b93466792125248bc5e2dfd9c000ab10c59528.tar.gz
xv6-labs-e4b93466792125248bc5e2dfd9c000ab10c59528.tar.bz2
xv6-labs-e4b93466792125248bc5e2dfd9c000ab10c59528.zip
Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trampoline.S12
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/trampoline.S b/kernel/trampoline.S
index b113bf6..fabaaf9 100644
--- a/kernel/trampoline.S
+++ b/kernel/trampoline.S
@@ -20,7 +20,7 @@ uservec:
# in supervisor mode, but with a
# user page table.
#
- # sscratch points to where the process's p->tf is
+ # sscratch points to where the process's p->trapframe is
# mapped into user space, at TRAPFRAME.
#
@@ -60,20 +60,20 @@ uservec:
sd t5, 272(a0)
sd t6, 280(a0)
- # save the user a0 in p->tf->a0
+ # save the user a0 in p->trapframe->a0
csrr t0, sscratch
sd t0, 112(a0)
- # restore kernel stack pointer from p->tf->kernel_sp
+ # restore kernel stack pointer from p->trapframe->kernel_sp
ld sp, 8(a0)
- # make tp hold the current hartid, from p->tf->kernel_hartid
+ # make tp hold the current hartid, from p->trapframe->kernel_hartid
ld tp, 32(a0)
- # load the address of usertrap(), p->tf->kernel_trap
+ # load the address of usertrap(), p->trapframe->kernel_trap
ld t0, 16(a0)
- # restore kernel page table from p->tf->kernel_satp
+ # restore kernel page table from p->trapframe->kernel_satp
ld t1, 0(a0)
csrw satp, t1
sfence.vma zero, zero