Skip to content

X
xv6-public
提交 fa81545f 创建 作者: Frans Kaashoek's avatar Frans Kaashoek
浏览文件
操作

Make elf proghdr fields match what objdump prints

上级 5f069dcf
隐藏空白字符变更
内嵌 并排
正在显示 包含 7 行增加 和 7 行删除
bootmain.c
浏览文件 @ fa81545f
...@@ -35,8 +35,8 @@ bootmain(void) ...@@ -35,8 +35,8 @@ 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++){
pa = (uchar*)ph->pa; pa = (uchar*)ph->paddr;
readseg(pa, ph->filesz, ph->offset); readseg(pa, ph->filesz, ph->off);
if(ph->memsz > ph->filesz) if(ph->memsz > ph->filesz)
stosb(pa + ph->filesz, 0, ph->memsz - ph->filesz); stosb(pa + ph->filesz, 0, ph->memsz - ph->filesz);
} }
......
elf.h
浏览文件 @ fa81545f
...@@ -24,9 +24,9 @@ struct elfhdr { ...@@ -24,9 +24,9 @@ struct elfhdr {
// Program section header // Program section header
struct proghdr { struct proghdr {
uint type; uint type;
uint offset; uint off;
uint va; uint vaddr;
uint pa; uint paddr;
uint filesz; uint filesz;
uint memsz; uint memsz;
uint flags; uint flags;
......
exec.c
浏览文件 @ fa81545f
...@@ -41,9 +41,9 @@ exec(char *path, char **argv) ...@@ -41,9 +41,9 @@ exec(char *path, char **argv)
continue; continue;
if(ph.memsz < ph.filesz) if(ph.memsz < ph.filesz)
goto bad; goto bad;
if((sz = allocuvm(pgdir, sz, ph.va + ph.memsz)) == 0) if((sz = allocuvm(pgdir, sz, ph.vaddr + ph.memsz)) == 0)
goto bad; 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; goto bad;
} }
iunlockput(ip); iunlockput(ip);
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论