diff options
author | Austin Clements <[email protected]> | 2010-09-01 00:32:27 -0400 |
---|---|---|
committer | Austin Clements <[email protected]> | 2010-09-01 00:32:27 -0400 |
commit | 5efca9054f1911e206831e16c2ca5ac8c8fc7c12 (patch) | |
tree | bf0b4d61b43dfca860c4c93e01fd1ad7fa7f7dbf /exec.c | |
parent | 5c4dc7395b75d8b41c1104fe59a0d14d81a8a428 (diff) | |
download | xv6-labs-5efca9054f1911e206831e16c2ca5ac8c8fc7c12.tar.gz xv6-labs-5efca9054f1911e206831e16c2ca5ac8c8fc7c12.tar.bz2 xv6-labs-5efca9054f1911e206831e16c2ca5ac8c8fc7c12.zip |
Tab police
Diffstat (limited to 'exec.c')
-rw-r--r-- | exec.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -30,7 +30,7 @@ exec(char *path, char **argv) if(elf.magic != ELF_MAGIC) goto bad; - if (!(pgdir = setupkvm())) + if(!(pgdir = setupkvm())) goto bad; // Load program into memory. @@ -41,11 +41,11 @@ exec(char *path, char **argv) continue; if(ph.memsz < ph.filesz) goto bad; - if (!allocuvm(pgdir, (char *)ph.va, ph.memsz)) + if(!allocuvm(pgdir, (char *)ph.va, ph.memsz)) goto bad; if(ph.va + ph.memsz > sz) 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; } iunlockput(ip); @@ -53,7 +53,7 @@ exec(char *path, char **argv) // Allocate and initialize stack at sz sz = PGROUNDUP(sz); sz += PGSIZE; // leave an invalid page - if (!allocuvm(pgdir, (char *)sz, PGSIZE)) + if(!allocuvm(pgdir, (char *)sz, PGSIZE)) goto bad; mem = uva2ka(pgdir, (char *)sz); spoffset = sz; @@ -105,7 +105,7 @@ exec(char *path, char **argv) return 0; bad: - if (pgdir) freevm(pgdir); + if(pgdir) freevm(pgdir); iunlockput(ip); return -1; } |