Skip to content
Snippets Groups Projects
Commit 5d0fe344 authored by rsc's avatar rsc
Browse files

more bugs

parent 5f0c20ec
No related branches found
No related tags found
No related merge requests found
......@@ -4,13 +4,6 @@ index:
mmu.h:
funny \ alignment in mmu.h
main.c:
should use static int bcpu to avoid having live
stack variable across the asm volatile that
changes %esp and %ebp.
cpus[0] -> cpus[bcpu]
proc.c:
as a consequence of the implementation of proc_kill,
any loop calling sleep should check for p->killed
......
......@@ -23,7 +23,7 @@ void
main0(void)
{
int i;
int bcpu;
static int bcpu; // cannot be on stack
struct proc *p;
// clear BSS
......@@ -37,8 +37,8 @@ main0(void)
bcpu = mp_bcpu();
// switch to bootstrap processor's stack
asm volatile("movl %0, %%esp" : : "r" (cpus[0].mpstack + MPSTACK - 32));
asm volatile("movl %0, %%ebp" : : "r" (cpus[0].mpstack + MPSTACK));
asm volatile("movl %0, %%esp" : : "r" (cpus[bcpu].mpstack + MPSTACK - 32));
asm volatile("movl %0, %%ebp" : : "r" (cpus[bcpu].mpstack + MPSTACK));
lapic_init(bcpu);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment