diff options
| author | Robert Morris <[email protected]> | 2019-06-01 05:33:38 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2019-06-01 05:33:38 -0400 |
| commit | 50cbc7510250a64674d619d13f5912edf08b767d (patch) | |
| tree | 874895d11adb72fed959619d85596b062260276f /proc.c | |
| parent | 7fd1f1eb0aab4d52852fc4f5e83eafc991f9a627 (diff) | |
| download | xv6-labs-50cbc7510250a64674d619d13f5912edf08b767d.tar.gz xv6-labs-50cbc7510250a64674d619d13f5912edf08b767d.tar.bz2 xv6-labs-50cbc7510250a64674d619d13f5912edf08b767d.zip | |
first shell prints $ prompt, though no console input yet
Diffstat (limited to 'proc.c')
| -rw-r--r-- | proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -24,7 +24,7 @@ extern void sysexit(void); static void wakeup1(void *chan); -extern char trampstart[]; // trampoline.S +extern char trampout[]; // trampoline.S void procinit(void) @@ -123,7 +123,7 @@ proc_pagetable(struct proc *p) // only the supervisor uses it, on the way // to/from user space, so not PTE_U. mappages(pagetable, TRAMPOLINE, PGSIZE, - (uint64)trampstart, PTE_R | PTE_X); + (uint64)trampout, PTE_R | PTE_X); // map the trapframe, for trampoline.S. mappages(pagetable, (TRAMPOLINE - PGSIZE), PGSIZE, |