cmpsb/aurix
1
0
Fork 0
forked from Piraterna/aurix
Code Pull requests Activity

Fixed ELF loading again, memory management needs to be redone properly

Browse source
This commit is contained in:
Jozef Nagy 2025-04-16 23:11:21 +02:00
parent 67f719c73f
commit 819a24ab8d
Signed by untrusted user who does not match committer: crz
GPG key ID: 459A4811CEAC7068
9 changed files with 68 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
boot/common/loader/elf.c
View file

@ -65,21 +65,21 @@ uintptr_t elf64_load(char *data, pagetable *pagemap)
flags |= VMM_WRITABLE;
if (!(ph[i].p_flags & PF_X))
flags |= VMM_NX;
debug("elf64_load(): phys=0x%llx, virt=0x%llx, size=%lu\n", ph[i].p_paddr, ph[i].p_vaddr, ph[i].p_filesz);
uint64_t phys = (uint64_t)mem_alloc(ph[i].p_memsz);
if (!phys) {
debug("elf64_load(): Out of memory\n");
return 0;
}
debug("elf64_load(): phys=0x%llx, virt=0x%llx, size=%lu\n", phys, ph[i].p_vaddr, ph[i].p_filesz);
map_page(pagemap, ph[i].p_vaddr, phys, flags);
memcpy((void*)ph[i].p_vaddr - lowest, data + ph[i].p_offset, ph[i].p_filesz);
}
debug("elf64_load(): ELF loaded successfully, entry: 0x%llx\n", header->e_entry);
return (uintptr_t)((uint8_t *)data + (header->e_entry - lowest));
return (uintptr_t)((uint8_t *)data + header->e_entry);
}
uintptr_t elf_load(char *data, pagetable *pagemap)