Commit 2774d820 authored by 某某某's avatar 某某某
Browse files

Merge branch 'ldelf-fix' into signal

parents 235f2841 75e14f6b
No related merge requests found
Showing with 1 addition and 1 deletion
+1 -1
......@@ -12,7 +12,7 @@ xlen_t ld::loadElf(const uint8_t *buff,vm::VMAR &vmar){
for(int i=0;i<elfHeader->e_phnum;i++){
const Elf64_Phdr &entry=phdrTable[i];
if(entry.p_type!=PT_LOAD)continue;
int pages=vm::bytes2pages(entry.p_memsz);
int pages=vm::bytes2pages(entry.p_vaddr+entry.p_memsz)-vm::bytes2pages(entry.p_vaddr)+1;
vm::PageNum ppn=(kGlobObjs->pageMgr->alloc(pages));
Log(debug,"%x<=%x[%d pages@%x]",vm::addr2pn(entry.p_vaddr),ppn,pages,ld::elf::flags2perm(entry.p_flags));
vmar.map(vm::PageMapping{vm::addr2pn(entry.p_vaddr),vm::VMO{ppn,pages},ld::elf::flags2perm(entry.p_flags),vm::PageMapping::MappingType::file});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment