xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 26d11ee8dc60fed78c8b34d15670eb6640d92129
parent 05d66b06294df89ba3d5b8f6cf535f7edf00bd1f
Author: Robert Morris <rtm@csail.mit.edu>
Date:   Sun, 19 Sep 2010 13:48:22 -0400

Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6

Diffstat:
Mbootmain.c | 4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootmain.c b/bootmain.c @@ -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(); }