summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorrsc <rsc>2006-07-17 01:52:13 +0000
committerrsc <rsc>2006-07-17 01:52:13 +0000
commitb5ee516575b4d2f1fd7de014230fee7cf8b6b538 (patch)
tree158b9cf0466e66ac80c96d948a12ae67afcb1d9a /proc.c
parent857d60cb0c56df19a5125584c677aa56c4488e98 (diff)
downloadxv6-labs-b5ee516575b4d2f1fd7de014230fee7cf8b6b538.tar.gz
xv6-labs-b5ee516575b4d2f1fd7de014230fee7cf8b6b538.tar.bz2
xv6-labs-b5ee516575b4d2f1fd7de014230fee7cf8b6b538.zip
add uint and standardize on typedefs instead of unsigned
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/proc.c b/proc.c
index e916761..ba6905b 100644
--- a/proc.c
+++ b/proc.c
@@ -26,18 +26,18 @@ setupsegs(struct proc *p)
{
memset(&p->ts, 0, sizeof(struct Taskstate));
p->ts.ss0 = SEG_KDATA << 3;
- p->ts.esp0 = (unsigned)(p->kstack + KSTACKSIZE);
+ p->ts.esp0 = (uint)(p->kstack + KSTACKSIZE);
// XXX it may be wrong to modify the current segment table!
p->gdt[0] = SEG_NULL;
p->gdt[SEG_KCODE] = SEG(STA_X|STA_R, 0, 0xffffffff, 0);
p->gdt[SEG_KDATA] = SEG(STA_W, 0, 0xffffffff, 0);
- p->gdt[SEG_TSS] = SEG16(STS_T32A, (unsigned) &p->ts,
+ p->gdt[SEG_TSS] = SEG16(STS_T32A, (uint) &p->ts,
sizeof(p->ts), 0);
p->gdt[SEG_TSS].s = 0;
- p->gdt[SEG_UCODE] = SEG(STA_X|STA_R, (unsigned)p->mem, p->sz, 3);
- p->gdt[SEG_UDATA] = SEG(STA_W, (unsigned)p->mem, p->sz, 3);
+ p->gdt[SEG_UCODE] = SEG(STA_X|STA_R, (uint)p->mem, p->sz, 3);
+ p->gdt[SEG_UDATA] = SEG(STA_W, (uint)p->mem, p->sz, 3);
}
// Look in the process table for an UNUSED proc.
@@ -108,8 +108,8 @@ copyproc(struct proc* p)
// Set up new jmpbuf to start executing at forkret (see below).
memset(&np->jmpbuf, 0, sizeof np->jmpbuf);
- np->jmpbuf.eip = (unsigned)forkret;
- np->jmpbuf.esp = (unsigned)np->tf;
+ np->jmpbuf.eip = (uint)forkret;
+ np->jmpbuf.esp = (uint)np->tf;
// Copy file descriptors
for(i = 0; i < NOFILE; i++){