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

[Zion] Fix init program loader debugging.

This commit is contained in:
Drew Galbraith 2024-01-11 19:02:15 -08:00
parent 7b8528ea99
commit 8a711266ef
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zion/loader/init_loader.cpp
View File

@ -90,7 +90,8 @@ void DumpModules() {
dbgln("[boot] Dumping bootloader modules."); dbgln("[boot] Dumping bootloader modules.");
for (uint64_t i = 0; i < resp.module_count; i++) { for (uint64_t i = 0; i < resp.module_count; i++) {
const limine_file& file = *resp.modules[i]; const limine_file& file = *resp.modules[i];
dbgln(" {},{x},{}", file.path, file.address, file.size); dbgln(" {},{x},{x}", glcr::String(file.path), (uint64_t)file.address,
file.size);
} }
#endif #endif
} }
@ -111,6 +112,8 @@ void WriteInitProgram(glcr::RefPtr<Port> port, glcr::String name, uint64_t id) {
const limine_file& prog = GetInitProgram(name); const limine_file& prog = GetInitProgram(name);
glcr::RefPtr<VariableMemoryObject> prog_vmmo = glcr::RefPtr<VariableMemoryObject> prog_vmmo =
glcr::MakeRefCounted<VariableMemoryObject>(prog.size); glcr::MakeRefCounted<VariableMemoryObject>(prog.size);
// TODO: These seem to be page aligned we should just construct an object
// around them.
prog_vmmo->CopyBytesToObject(reinterpret_cast<uint64_t>(prog.address), prog_vmmo->CopyBytesToObject(reinterpret_cast<uint64_t>(prog.address),
prog.size); prog.size);
port->WriteKernel(id, MakeRefCounted<Capability>(prog_vmmo)); port->WriteKernel(id, MakeRefCounted<Capability>(prog_vmmo));
@ -121,6 +124,10 @@ glcr::ErrorCode WritePciVmmo(glcr::RefPtr<Port> port, uint64_t id) {
auto vmmo = auto vmmo =
glcr::MakeRefCounted<ViewMemoryObject>(config.base, config.offset); glcr::MakeRefCounted<ViewMemoryObject>(config.base, config.offset);
#if K_INIT_DEBUG
dbgln("PCI Configuration found at: {x}:{x}", config.base, config.offset);
#endif
port->WriteKernel(id, MakeRefCounted<Capability>(vmmo)); port->WriteKernel(id, MakeRefCounted<Capability>(vmmo));
return glcr::OK; return glcr::OK;