diff options
| author | glenda <glenda@9front.local> | 2025-05-14 01:33:55 +0000 |
|---|---|---|
| committer | glenda <glenda@9front.local> | 2025-05-14 01:33:55 +0000 |
| commit | a7081490dbeda19788e6374a080ee38606aa3cd3 (patch) | |
| tree | 8c440e3611573ee60322e7e84e5204e3e326028a /sys/src/9/pc | |
| parent | 635cb9e7425577dae44eb415ad42e8d3892850b5 (diff) | |
kernel: get rid of Proc.kstack
The kernel stack is now above the Proc structure,
so the explicit kstack pointer can be eliminated.
Diffstat (limited to 'sys/src/9/pc')
| -rw-r--r-- | sys/src/9/pc/mmu.c | 4 | ||||
| -rw-r--r-- | sys/src/9/pc/trap.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/src/9/pc/mmu.c b/sys/src/9/pc/mmu.c index be5b9fd25..80701b82d 100644 --- a/sys/src/9/pc/mmu.c +++ b/sys/src/9/pc/mmu.c @@ -298,9 +298,9 @@ mmuswitch(Proc* proc) pdb = tmpmap(proc->mmupdb); pdb[PDX(MACHADDR)] = m->pdb[PDX(MACHADDR)]; tmpunmap(pdb); - taskswitch(proc->mmupdb->pa, (ulong)(proc->kstack+KSTACK)); + taskswitch(proc->mmupdb->pa, (ulong)proc); }else - taskswitch(PADDR(m->pdb), (ulong)(proc->kstack+KSTACK)); + taskswitch(PADDR(m->pdb), (ulong)proc); memmove(&m->gdt[PROCSEG0], proc->gdt, sizeof(proc->gdt)); if((x = (ulong)proc->ldt) && (n = proc->nldt) > 0){ diff --git a/sys/src/9/pc/trap.c b/sys/src/9/pc/trap.c index 584c25309..eb1e8c5fe 100644 --- a/sys/src/9/pc/trap.c +++ b/sys/src/9/pc/trap.c @@ -293,9 +293,9 @@ _dumpstack(Ureg *ureg) x += iprint("ktrace /kernel/path %.8lux %.8lux <<EOF\n", ureg->pc, ureg->sp); i = 0; if(up - && (uintptr)&l >= (uintptr)up->kstack - && (uintptr)&l <= (uintptr)up->kstack+KSTACK) - estack = (uintptr)up->kstack+KSTACK; + && (uintptr)&l >= (uintptr)up - KSTACK + && (uintptr)&l <= (uintptr)up) + estack = (uintptr)up; else if((uintptr)&l >= (uintptr)m->stack && (uintptr)&l <= (uintptr)m+MACHSIZE) estack = (uintptr)m+MACHSIZE; @@ -775,7 +775,7 @@ kprocchild(Proc *p, void (*entry)(void)) * to linkproc(). */ p->sched.pc = (ulong)entry; - p->sched.sp = (ulong)p->kstack+KSTACK-BY2WD; + p->sched.sp = (ulong)p - BY2WD; } void @@ -788,7 +788,7 @@ forkchild(Proc *p, Ureg *ureg) * - the return PC * - trap's argument (ur) */ - p->sched.sp = (ulong)p->kstack+KSTACK-(sizeof(Ureg)+2*BY2WD); + p->sched.sp = (ulong)p - (sizeof(Ureg)+2*BY2WD); p->sched.pc = (ulong)forkret; cureg = (Ureg*)(p->sched.sp+2*BY2WD); |