sanchayanmaity/xv6-cs450
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tab police

Browse source
This commit is contained in:
Austin Clements 2010-09-01 00:32:27 -04:00
parent 5c4dc7395b
commit 5efca9054f
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
exec.c
View file

@ -30,7 +30,7 @@ exec(char *path, char **argv)
if(elf.magic != ELF_MAGIC) if(elf.magic != ELF_MAGIC)
goto bad; goto bad;
if (!(pgdir = setupkvm())) if(!(pgdir = setupkvm()))
goto bad; goto bad;
// Load program into memory. // Load program into memory.
@ -41,11 +41,11 @@ exec(char *path, char **argv)
continue; continue;
if(ph.memsz < ph.filesz) if(ph.memsz < ph.filesz)
goto bad; goto bad;
if (!allocuvm(pgdir, (char *)ph.va, ph.memsz)) if(!allocuvm(pgdir, (char *)ph.va, ph.memsz))
goto bad; goto bad;
if(ph.va + ph.memsz > sz) if(ph.va + ph.memsz > sz)
sz = ph.va + ph.memsz; sz = ph.va + ph.memsz;
if (!loaduvm(pgdir, (char *)ph.va, ip, ph.offset, ph.filesz)) if(!loaduvm(pgdir, (char *)ph.va, ip, ph.offset, ph.filesz))
goto bad; goto bad;
} }
iunlockput(ip); iunlockput(ip);
@ -53,7 +53,7 @@ exec(char *path, char **argv)
// Allocate and initialize stack at sz // Allocate and initialize stack at sz
sz = PGROUNDUP(sz); sz = PGROUNDUP(sz);
sz += PGSIZE; // leave an invalid page sz += PGSIZE; // leave an invalid page
if (!allocuvm(pgdir, (char *)sz, PGSIZE)) if(!allocuvm(pgdir, (char *)sz, PGSIZE))
goto bad; goto bad;
mem = uva2ka(pgdir, (char *)sz); mem = uva2ka(pgdir, (char *)sz);
spoffset = sz; spoffset = sz;
@ -105,7 +105,7 @@ exec(char *path, char **argv)
return 0; return 0;
bad: bad:
if (pgdir) freevm(pgdir); if(pgdir) freevm(pgdir);
iunlockput(ip); iunlockput(ip);
return -1; return -1;
} }