summaryrefslogtreecommitdiff
path: root/exec.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2011-08-17 20:23:36 -0400
committerFrans Kaashoek <[email protected]>2011-08-17 20:23:36 -0400
commitfa81545f1c15630573dc1d312fa75f261f82b9f1 (patch)
tree0c70c6825e7b165329e84e790d127bfccbc80c8a /exec.c
parent5f069dcf2f9d833a6c4f58ed87269d61c6abb687 (diff)
downloadxv6-labs-fa81545f1c15630573dc1d312fa75f261f82b9f1.tar.gz
xv6-labs-fa81545f1c15630573dc1d312fa75f261f82b9f1.tar.bz2
xv6-labs-fa81545f1c15630573dc1d312fa75f261f82b9f1.zip
Make elf proghdr fields match what objdump prints
Diffstat (limited to 'exec.c')
-rw-r--r--exec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/exec.c b/exec.c
index 2ec1c51..dfff3e6 100644
--- a/exec.c
+++ b/exec.c
@@ -41,9 +41,9 @@ exec(char *path, char **argv)
continue;
if(ph.memsz < ph.filesz)
goto bad;
- if((sz = allocuvm(pgdir, sz, ph.va + ph.memsz)) == 0)
+ if((sz = allocuvm(pgdir, sz, ph.vaddr + ph.memsz)) == 0)
goto bad;
- if(loaduvm(pgdir, (char*)ph.va, ip, ph.offset, ph.filesz) < 0)
+ if(loaduvm(pgdir, (char*)ph.vaddr, ip, ph.off, ph.filesz) < 0)
goto bad;
}
iunlockput(ip);