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/trap.c | |
| 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/trap.c')
| -rw-r--r-- | kernel/trap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trap.c b/kernel/trap.c index ef2b618..ad2d0f8 100644 --- a/kernel/trap.c +++ b/kernel/trap.c @@ -9,7 +9,7 @@ struct spinlock tickslock; uint ticks; -extern char trampout[], trampin[]; +extern char trampoline[], uservec[]; // in kernelvec.S, calls kerneltrap(). void kernelvec(); @@ -96,7 +96,7 @@ usertrapret(void) intr_off(); // send interrupts and exceptions to trampoline.S - w_stvec(TRAMPOLINE + (trampin - trampout)); + w_stvec(TRAMPOLINE + (uservec - trampoline)); // set up values that trampoline.S will need when // the process next re-enters the kernel. |