greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use bootstrap processor as specified by MP table. typically 0, but not

Browse source 
guaranteed.
This commit is contained in:
kaashoek 2006-09-08 14:48:07 +00:00
parent f80873e602
commit 5cb7877e0f
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
main.c
View file

@ -23,22 +23,24 @@ void
main0(void) main0(void)
{ {
int i; int i;
int bcpu;
struct proc *p; struct proc *p;
// clear BSS // clear BSS
memset(edata, 0, end - edata); memset(edata, 0, end - edata);
// 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));
// Prevent release() from enabling interrupts. // Prevent release() from enabling interrupts.
for(i=0; i<NCPU; i++) for(i=0; i<NCPU; i++)
cpus[i].nlock = 1; cpus[i].nlock = 1;
mp_init(); // collect info about this machine mp_init(); // collect info about this machine
bcpu = mp_bcpu();
lapic_init(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));
lapic_init(bcpu);
cprintf("\ncpu%d: starting xv6\n\n", cpu()); cprintf("\ncpu%d: starting xv6\n\n", cpu());

3
mp.c
View file

@ -191,7 +191,8 @@ mp_init(void)
int int
mp_bcpu(void) mp_bcpu(void)
{ {
return bcpu-cpus; if (ismp) return bcpu-cpus;
else return 0;
} }
extern void mpmain(void); extern void mpmain(void);