diff options
| author | Frans Kaashoek <[email protected]> | 2020-08-10 13:05:17 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-10 13:05:17 -0400 |
| commit | c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9 (patch) | |
| tree | a6c903e1c61c08f4cb87700c320752a737081dcb /kernel/trampoline.S | |
| parent | 90eb90b5e203299427c3fde8c996a48835fc93cf (diff) | |
| parent | d8fe1773b26758c7c7b8f36724cd822555b33612 (diff) | |
| download | xv6-labs-c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9.tar.gz xv6-labs-c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9.tar.bz2 xv6-labs-c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9.zip | |
Merge branch 'riscv' into riscv
Diffstat (limited to 'kernel/trampoline.S')
| -rw-r--r-- | kernel/trampoline.S | 12 |
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 |