diff options
| author | Robert Morris <[email protected]> | 2019-07-26 04:53:46 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2019-07-26 04:53:46 -0400 |
| commit | ea95a6654c3f921849f3541aa856a8806ebf571e (patch) | |
| tree | 39c865dd156a02712124697570579f93d2e6f37e /kernel/trampoline.S | |
| parent | 4e62de64cd3b8b67bdb2c3d8edab1ca353427a84 (diff) | |
| download | xv6-labs-ea95a6654c3f921849f3541aa856a8806ebf571e.tar.gz xv6-labs-ea95a6654c3f921849f3541aa856a8806ebf571e.tar.bz2 xv6-labs-ea95a6654c3f921849f3541aa856a8806ebf571e.zip | |
trampin -> uservec
trampout -> userret
Diffstat (limited to 'kernel/trampoline.S')
| -rw-r--r-- | kernel/trampoline.S | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/kernel/trampoline.S b/kernel/trampoline.S index d4066c9..bc31974 100644 --- a/kernel/trampoline.S +++ b/kernel/trampoline.S @@ -5,14 +5,15 @@ # in user and kernel space so that it continues # to work when it switches page tables. # - # kernel.ld causes trampout to be aligned + # kernel.ld causes userret to be aligned # to a page boundary. # -.globl usertrap - .section trampoline -.globl trampout -trampout: - # trampout(trapframe, pagetable) + .section trampsec +.globl trampoline +trampoline: +.globl userret +userret: + # userret(trapframe, pagetable) # switch from kernel to user. # usertrapret() calls here. # a0: p->tf in user page table @@ -67,8 +68,8 @@ trampout: sret .align 4 -.globl trampin -trampin: +.globl uservec +uservec: # # trap.c set stvec to point here, so # user interrupts and exceptions start here, |