summaryrefslogtreecommitdiff
path: root/kernel/trap.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-07-26 10:17:02 -0400
committerRobert Morris <[email protected]>2019-07-26 10:17:02 -0400
commitc714e3e35c98ed1fb13a8f1b52f6b1a03cfad783 (patch)
tree0c780982a4f824c79d8f5511c99e1b096ce47286 /kernel/trap.c
parentfa2e2e3c81b2686229acc204ece380953a8031ea (diff)
downloadxv6-labs-c714e3e35c98ed1fb13a8f1b52f6b1a03cfad783.tar.gz
xv6-labs-c714e3e35c98ed1fb13a8f1b52f6b1a03cfad783.tar.bz2
xv6-labs-c714e3e35c98ed1fb13a8f1b52f6b1a03cfad783.zip
machinevec -> timervec
Diffstat (limited to 'kernel/trap.c')
-rw-r--r--kernel/trap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/trap.c b/kernel/trap.c
index ce7a65a..6d5e46b 100644
--- a/kernel/trap.c
+++ b/kernel/trap.c
@@ -98,12 +98,12 @@ usertrapret(void)
// send interrupts and exceptions to trampoline.S
w_stvec(TRAMPOLINE + (uservec - trampoline));
- // set up values that trampoline.S will need when
+ // set up values that uservec will need when
// the process next re-enters the kernel.
- p->tf->kernel_satp = r_satp();
- p->tf->kernel_sp = p->kstack + PGSIZE;
+ p->tf->kernel_satp = r_satp(); // kernel page table
+ p->tf->kernel_sp = p->kstack + PGSIZE; // process's kernel stack
p->tf->kernel_trap = (uint64)usertrap;
- p->tf->kernel_hartid = r_tp();
+ p->tf->kernel_hartid = r_tp(); // hartid for cpuid()
// set up the registers that trampoline.S's sret will use
// to get to user space.
@@ -193,7 +193,7 @@ devintr()
return 1;
} else if(scause == 0x8000000000000001){
// software interrupt from a machine-mode timer interrupt,
- // forwarded by machinevec in kernelvec.S.
+ // forwarded by timervec in kernelvec.S.
if(cpuid() == 0){
clockintr();