diff options
author | Robert Morris <[email protected]> | 2010-09-19 13:48:22 -0400 |
---|---|---|
committer | Robert Morris <[email protected]> | 2010-09-19 13:48:22 -0400 |
commit | 26d11ee8dc60fed78c8b34d15670eb6640d92129 (patch) | |
tree | 5c9add41da3324b34c86945646fe5274505640c2 | |
parent | 05d66b06294df89ba3d5b8f6cf535f7edf00bd1f (diff) | |
parent | 4c274cef7425614e328eb2127362d36b203543a8 (diff) | |
download | xv6-labs-26d11ee8dc60fed78c8b34d15670eb6640d92129.tar.gz xv6-labs-26d11ee8dc60fed78c8b34d15670eb6640d92129.tar.bz2 xv6-labs-26d11ee8dc60fed78c8b34d15670eb6640d92129.zip |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
-rw-r--r-- | bootmain.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -34,7 +34,7 @@ bootmain(void) ph = (struct proghdr*)((uchar*)elf + elf->phoff); eph = ph + elf->phnum; for(; ph < eph; ph++) { - va = (uchar*)(ph->va & 0xFFFFFF); + va = (uchar*)ph->va; readseg(va, ph->filesz, ph->offset); if(ph->memsz > ph->filesz) stosb(va + ph->filesz, 0, ph->memsz - ph->filesz); @@ -42,7 +42,7 @@ bootmain(void) // Call the entry point from the ELF header. // Does not return! - entry = (void(*)(void))(elf->entry & 0xFFFFFF); + entry = (void(*)(void))(elf->entry); entry(); } |