Merge branch 'boot' into new_intr

Signed-off-by: Zone.N <[email protected]>
MRNIU · Aug 30, 2024 · 1a2bda2 · 1a2bda2
2 parents c264454 + a3652c1
commit 1a2bda2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/boot/boot.cpp b/src/boot/boot.cpp
@@ -68,7 +68,6 @@ efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table) {
 
   // 初始化 Memory
   auto memory = Memory();
-  memory.PrintInfo();
   // 加载内核
   auto elf = Elf(KERNEL_NAME);
   auto [kernel_addr, elf_info] = elf.Load();
@@ -77,6 +76,9 @@ efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table) {
     return EFI_LOAD_ERROR;
   }
 
+  // 输出内存映射 Memory
+  memory.PrintInfo();
+
   debug << L"Set Kernel Entry Point to: [" << OutStream::hex_X << kernel_addr
         << L"]." << OutStream::endl;
   debug << L"Elf addr: [" << OutStream::hex_X << elf_info.first << L"]."