From e2aad55a8a8bfa61dd8d5566ada95a8be0124432 Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Tue, 6 Jun 2023 15:04:34 -0700 Subject: [PATCH] Only dump bootloader modules once. --- zion/loader/init_loader.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/zion/loader/init_loader.cpp b/zion/loader/init_loader.cpp index 6df19a5..8f4bd8f 100644 --- a/zion/loader/init_loader.cpp +++ b/zion/loader/init_loader.cpp @@ -23,12 +23,19 @@ bool streq(const char* a, const char* b) { } } -const limine_file& GetInitProgram(const char* path) { +void DumpModules() { + const limine_module_response& resp = boot::GetModules(); + dbgln("[boot] Dumping bootloader modules."); + for (uint64_t i = 0; i < resp.module_count; i++) { + const limine_file& file = *resp.modules[i]; + dbgln(" %s,%m,%x", file.path, file.address, file.size); + } +} + +const limine_file& GetInitProgram(const char* path) { const limine_module_response& resp = boot::GetModules(); - dbgln("Dumping modules"); for (uint64_t i = 0; i < resp.module_count; i++) { const limine_file& file = *resp.modules[i]; - dbgln("%s,%m,%x", file.path, file.address, file.size); if (streq(file.path, path)) return file; } panic("Program not found: %s", path); @@ -37,6 +44,7 @@ const limine_file& GetInitProgram(const char* path) { } // namespace void LoadInitProgram() { + DumpModules(); const limine_file& init_prog = GetInitProgram("/sys/test"); const limine_file& prog2 = GetInitProgram("/sys/test2");