diff options
author | rsc <rsc> | 2007-09-27 20:32:45 +0000 |
---|---|---|
committer | rsc <rsc> | 2007-09-27 20:32:45 +0000 |
commit | 4f74de0edc243ffdae0233eb5c84d09c44677ccf (patch) | |
tree | a06bec65e5b6ad8db480963ffc6646a176baa8da /proc.c | |
parent | ce2e7515552adca3a60e349de2931112736d17bf (diff) | |
download | xv6-labs-4f74de0edc243ffdae0233eb5c84d09c44677ccf.tar.gz xv6-labs-4f74de0edc243ffdae0233eb5c84d09c44677ccf.tar.bz2 xv6-labs-4f74de0edc243ffdae0233eb5c84d09c44677ccf.zip |
okay, that was long enough - revert
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -75,7 +75,7 @@ setupsegs(struct proc *p) c = &cpus[cpu()]; c->ts.ss0 = SEG_PROCSTACK << 3; if(p) - c->ts.esp0 = (uint)(p->kstack + KSTACKTOP); + c->ts.esp0 = (uint)(p->kstack + KSTACKSIZE); else c->ts.esp0 = 0xffffffff; @@ -118,8 +118,7 @@ copyproc(struct proc *p) np->state = UNUSED; return 0; } - *(void**)(np->kstack + KSTACKTOP) = np; - np->tf = (struct trapframe*)(np->kstack + KSTACKTOP) - 1; + np->tf = (struct trapframe*)(np->kstack + KSTACKSIZE) - 1; if(p){ // Copy process state from p. np->parent = p; @@ -188,10 +187,12 @@ userinit(void) struct proc* curproc(void) { - uint esp; + struct proc *p; - asm volatile("movl %%esp, %0" : "=a" (esp)); - return *(struct proc**)((esp & ~(KSTACKSIZE-1)) + KSTACKTOP); + pushcli(); + p = cpus[cpu()].curproc; + popcli(); + return p; } //PAGEBREAK: 42 @@ -222,12 +223,14 @@ scheduler(void) // Switch to chosen process. It is the process's job // to release proc_table_lock and then reacquire it // before jumping back to us. + c->curproc = p; setupsegs(p); p->state = RUNNING; swtch(&c->context, &p->context); // Process is done running for now. // It should have changed its p->state before coming back. + c->curproc = 0; setupsegs(0); } @@ -236,7 +239,7 @@ scheduler(void) } // Enter scheduler. Must already hold proc_table_lock -// and have changed cp->state. +// and have changed curproc[cpu()]->state. void sched(void) { |