Skip to content

X
xv6-public
提交 4c274cef 创建 作者: Austin Clements's avatar Austin Clements
浏览文件
操作

Simplify boot loader by removing some JOS'isms

上级 faad047a
显示空白字符变更
内嵌 并排
正在显示 包含 2 行增加 和 2 行删除
bootmain.c
浏览文件 @ 4c274cef
...@@ -34,7 +34,7 @@ bootmain(void) ...@@ -34,7 +34,7 @@ bootmain(void)
ph = (struct proghdr*)((uchar*)elf + elf->phoff); ph = (struct proghdr*)((uchar*)elf + elf->phoff);
eph = ph + elf->phnum; eph = ph + elf->phnum;
for(; ph < eph; ph++) { for(; ph < eph; ph++) {
va = (uchar*)(ph->va & 0xFFFFFF); va = (uchar*)ph->va;
readseg(va, ph->filesz, ph->offset); readseg(va, ph->filesz, ph->offset);
if(ph->memsz > ph->filesz) if(ph->memsz > ph->filesz)
stosb(va + ph->filesz, 0, ph->memsz - ph->filesz); stosb(va + ph->filesz, 0, ph->memsz - ph->filesz);
...@@ -42,7 +42,7 @@ bootmain(void) ...@@ -42,7 +42,7 @@ bootmain(void)
// Call the entry point from the ELF header. // Call the entry point from the ELF header.
// Does not return! // Does not return!
entry = (void(*)(void))(elf->entry & 0xFFFFFF); entry = (void(*)(void))(elf->entry);
entry(); entry();
} }
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论