From 8a711266ef8ab00ee20d59784ce13954abdacb6e Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Thu, 11 Jan 2024 19:02:15 -0800 Subject: [PATCH] [Zion] Fix init program loader debugging. --- zion/loader/init_loader.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zion/loader/init_loader.cpp b/zion/loader/init_loader.cpp index 7e1f16a..285fc37 100644 --- a/zion/loader/init_loader.cpp +++ b/zion/loader/init_loader.cpp @@ -90,7 +90,8 @@ void DumpModules() { dbgln("[boot] Dumping bootloader modules."); for (uint64_t i = 0; i < resp.module_count; 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 } @@ -111,6 +112,8 @@ void WriteInitProgram(glcr::RefPtr port, glcr::String name, uint64_t id) { const limine_file& prog = GetInitProgram(name); glcr::RefPtr prog_vmmo = glcr::MakeRefCounted(prog.size); + // TODO: These seem to be page aligned we should just construct an object + // around them. prog_vmmo->CopyBytesToObject(reinterpret_cast(prog.address), prog.size); port->WriteKernel(id, MakeRefCounted(prog_vmmo)); @@ -121,6 +124,10 @@ glcr::ErrorCode WritePciVmmo(glcr::RefPtr port, uint64_t id) { auto vmmo = glcr::MakeRefCounted(config.base, config.offset); +#if K_INIT_DEBUG + dbgln("PCI Configuration found at: {x}:{x}", config.base, config.offset); +#endif + port->WriteKernel(id, MakeRefCounted(vmmo)); return glcr::OK;