summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorrsc <rsc>2007-09-27 20:38:53 +0000
committerrsc <rsc>2007-09-27 20:38:53 +0000
commitc95bde8163eca7a19c95f3b05156e0ad33312589 (patch)
treea884f62568fff045687c5047c7ff640a2adbf4ca /proc.c
parent4f74de0edc243ffdae0233eb5c84d09c44677ccf (diff)
downloadxv6-labs-c95bde8163eca7a19c95f3b05156e0ad33312589.tar.gz
xv6-labs-c95bde8163eca7a19c95f3b05156e0ad33312589.tar.bz2
xv6-labs-c95bde8163eca7a19c95f3b05156e0ad33312589.zip
yank out stack overflow checking ugliness
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/proc.c b/proc.c
index e139c39..b009892 100644
--- a/proc.c
+++ b/proc.c
@@ -73,7 +73,7 @@ setupsegs(struct proc *p)
pushcli();
c = &cpus[cpu()];
- c->ts.ss0 = SEG_PROCSTACK << 3;
+ c->ts.ss0 = SEG_KDATA << 3;
if(p)
c->ts.esp0 = (uint)(p->kstack + KSTACKSIZE);
else
@@ -84,15 +84,12 @@ setupsegs(struct proc *p)
c->gdt[SEG_KDATA] = SEG(STA_W, 0, 0xffffffff, 0);
c->gdt[SEG_TSS] = SEG16(STS_T32A, (uint)&c->ts, sizeof(c->ts)-1, 0);
c->gdt[SEG_TSS].s = 0;
- c->gdt[SEG_CPUSTACK] = SEG(STA_W|STA_E, 0, (uint)c->stack, 0);
if(p){
c->gdt[SEG_UCODE] = SEG(STA_X|STA_R, (uint)p->mem, p->sz-1, DPL_USER);
c->gdt[SEG_UDATA] = SEG(STA_W, (uint)p->mem, p->sz-1, DPL_USER);
- c->gdt[SEG_PROCSTACK] = SEG(STA_W|STA_E, 0, (uint)p->kstack, 0);
} else {
c->gdt[SEG_UCODE] = SEG_NULL;
c->gdt[SEG_UDATA] = SEG_NULL;
- c->gdt[SEG_PROCSTACK] = SEG_NULL;
}
lgdt(c->gdt, sizeof(c->gdt));
@@ -143,7 +140,6 @@ copyproc(struct proc *p)
memset(&np->context, 0, sizeof(np->context));
np->context.eip = (uint)forkret;
np->context.esp = (uint)np->tf;
- np->context.ss = SEG_PROCSTACK<<3;
// Clear %eax so that fork system call returns 0 in child.
np->tf->eax = 0;