karlos/fernlader
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug in page table heap alloc

Browse source
This commit is contained in:
Thomas Oltmann 2025-07-08 14:15:51 +02:00
parent c13946c7dd
commit 1ba17d852b
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lboot.S
View file

@ -184,9 +184,11 @@ _gmdone: add $24, %di
// paging: Set up initial page tables for long mode // paging: Set up initial page tables for long mode
paging: paging:
mov heap_ptr, %eax mov heap_ptr, %eax
add $6*4096, %eax mov %eax, %ecx
cmp heap_end, %eax add $6*4096, %ecx
cmp heap_end, %ecx
ja out_of_mem ja out_of_mem
mov %ecx, heap_ptr
mov %eax, pd_ptr mov %eax, pd_ptr
add $4*4096, %eax add $4*4096, %eax

3
loader.c
View file

@ -172,6 +172,7 @@ load_elf(file_t file, uintptr_t *entry)
if (file.size < phdr->p_offset + phdr->p_filesz) { if (file.size < phdr->p_offset + phdr->p_filesz) {
return -1; return -1;
} }
panic("Loading segment");
memcpy((void *)ADDR_LOAD, file.ptr + phdr->p_offset, phdr->p_filesz); memcpy((void *)ADDR_LOAD, file.ptr + phdr->p_offset, phdr->p_filesz);
if (phdr->p_filesz < phdr->p_memsz) { if (phdr->p_filesz < phdr->p_memsz) {
memset((void *)(ADDR_LOAD + phdr->p_filesz), 0, phdr->p_memsz - phdr->p_filesz); memset((void *)(ADDR_LOAD + phdr->p_filesz), 0, phdr->p_memsz - phdr->p_filesz);
@ -188,7 +189,7 @@ void
loader_main(void *initrd) loader_main(void *initrd)
{ {
uint64_t entry = 0; uint64_t entry = 0;
file_t elf = { initrd, 1024 }; file_t elf = { initrd, MEG(2) };
if (load_elf(elf, &entry) < 0) { if (load_elf(elf, &entry) < 0) {
panic("panic: Malformed ELF64 executable"); panic("panic: Malformed ELF64 executable");
} }