drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[Zion] Allow loading from an offset program segment.

This commit is contained in:
Drew Galbraith 2024-08-17 20:18:54 -07:00
parent f551cc88cd
commit 0aa4a1f5f1
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zion/loader/init_loader.cpp
View File

@ -13,7 +13,7 @@
#include "scheduler/process_manager.h" #include "scheduler/process_manager.h"
#include "scheduler/scheduler.h" #include "scheduler/scheduler.h"
#define K_INIT_DEBUG 0 #define K_INIT_DEBUG 1
namespace { namespace {
@ -67,6 +67,9 @@ uint64_t LoadElfProgram(Process& dest_proc, uint64_t base, uint64_t offset) {
reinterpret_cast<Elf64ProgramHeader*>(base + header->phoff); reinterpret_cast<Elf64ProgramHeader*>(base + header->phoff);
for (uint64_t i = 0; i < header->phnum; i++) { for (uint64_t i = 0; i < header->phnum; i++) {
Elf64ProgramHeader& program = programs[i]; Elf64ProgramHeader& program = programs[i];
if (program.type != 1) {
continue;
}
#if K_INIT_DEBUG #if K_INIT_DEBUG
dbgln( dbgln(
"prog: type: {}, flags: {}, offset: {}\n vaddr: {x}, paddr: {x}\n " "prog: type: {}, flags: {}, offset: {}\n vaddr: {x}, paddr: {x}\n "
@ -74,12 +77,19 @@ uint64_t LoadElfProgram(Process& dest_proc, uint64_t base, uint64_t offset) {
program.type, program.flags, program.offset, program.vaddr, program.type, program.flags, program.offset, program.vaddr,
program.paddr, program.filesz, program.memsz, program.align); program.paddr, program.filesz, program.memsz, program.align);
#endif #endif
auto mem_obj = glcr::MakeRefCounted<VariableMemoryObject>(program.memsz); uint64_t page_offset = program.vaddr & 0xFFF;
mem_obj->CopyBytesToObject(base + program.offset, program.filesz); auto mem_obj =
PANIC_ON_ERR( glcr::MakeRefCounted<VariableMemoryObject>(program.memsz + page_offset);
dest_proc.vmas()->MapInMemoryObject(
program.vaddr, glcr::StaticCastRefPtr<MemoryObject>(mem_obj)), // Super hacky but if we adjust the offsets to handle a non-aligned page.
"Couldn't map in init program."); mem_obj->CopyBytesToObject(base + program.offset - page_offset,
program.filesz + page_offset);
auto map_res = dest_proc.vmas()->MapInMemoryObject(
program.vaddr - page_offset,
glcr::StaticCastRefPtr<MemoryObject>(mem_obj));
if (map_res != glcr::OK) {
panic("Couldn't map in init program {}", map_res);
}
} }
return header->entry; return header->entry;
} }