xv6

commit 4c274cef7425614e328eb2127362d36b203543a8
parent faad047ab22cbe989c208bff5ecb42608ecb8d7b
Author: Austin Clements <amdragon@mit.edu>
Date:   Wed, 15 Sep 2010 16:15:07 -0400

Simplify boot loader by removing some JOS'isms

Diffstat:
M
bootmain.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();
 }