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/proc.h | |
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/proc.h')
-rw-r--r-- | kernel/proc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/proc.h b/kernel/proc.h index d515043..655d79f 100644 --- a/kernel/proc.h +++ b/kernel/proc.h @@ -32,10 +32,10 @@ extern struct cpu cpus[NCPU]; // sits in a page by itself just under the trampoline page in the // user page table. not specially mapped in the kernel page table. // the sscratch register points here. -// trampin in trampoline.S saves user registers in the trapframe, +// uservec in trampoline.S saves user registers in the trapframe, // then initializes registers from the trapframe's // kernel_sp, kernel_hartid, kernel_satp, and jumps to kernel_trap. -// usertrapret() and trampout in trampoline.S set up +// usertrapret() and userret in trampoline.S set up // the trapframe's kernel_*, restore user registers from the // trapframe, switch to the user page table, and enter user space. // the trapframe includes callee-saved user registers like s0-s11 because the |