Imbus/xv6-riscv-kernel
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

trampin -> uservec

Browse source 
trampout -> userret
This commit is contained in:
Robert Morris 2019-07-26 04:53:46 -04:00
parent 4e62de64cd
commit ea95a6654c
6 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/proc.c
View file

@ -18,7 +18,7 @@ struct spinlock pid_lock;
extern void forkret(void);
static void wakeup1(struct proc *chan);
extern char trampout[]; // trampoline.S
extern char trampoline[]; // trampoline.S
void
procinit(void)
@ -159,7 +159,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)trampout, PTE_R | PTE_X);
(uint64)trampoline, PTE_R | PTE_X);
// map the trapframe just below TRAMPOLINE, for trampoline.S.
mappages(pagetable, TRAPFRAME, PGSIZE,