Merge pull request #14 from HonokaNo/bug-of-print

fixed bug
uchan-nos · Apr 11, 2021 · a68d282 · a68d282
2 parents d51271d + d36c6ee
commit a68d282
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/MikanLoaderPkg/Main.c b/MikanLoaderPkg/Main.c
@@ -401,22 +401,6 @@ EFI_STATUS EFIAPI UefiMain(
     }
   }
 
-  status = gBS->ExitBootServices(image_handle, memmap.map_key);
-  if (EFI_ERROR(status)) {
-    status = GetMemoryMap(&memmap);
-    if (EFI_ERROR(status)) {
-      Print(L"failed to get memory map: %r\n", status);
-      Halt();
-    }
-    status = gBS->ExitBootServices(image_handle, memmap.map_key);
-    if (EFI_ERROR(status)) {
-      Print(L"Could not exit boot service: %r\n", status);
-      Halt();
-    }
-  }
-
-  UINT64 entry_addr = *(UINT64*)(kernel_first_addr + 24);
-
   struct FrameBufferConfig config = {
     (UINT8*)gop->Mode->FrameBufferBase,
     gop->Mode->Info->PixelsPerScanLine,
@@ -436,6 +420,22 @@ EFI_STATUS EFIAPI UefiMain(
       Halt();
   }
 
+  status = gBS->ExitBootServices(image_handle, memmap.map_key);
+  if (EFI_ERROR(status)) {
+    status = GetMemoryMap(&memmap);
+    if (EFI_ERROR(status)) {
+      Print(L"failed to get memory map: %r\n", status);
+      Halt();
+    }
+    status = gBS->ExitBootServices(image_handle, memmap.map_key);
+    if (EFI_ERROR(status)) {
+      Print(L"Could not exit boot service: %r\n", status);
+      Halt();
+    }
+  }
+
+  UINT64 entry_addr = *(UINT64*)(kernel_first_addr + 24);
+
   VOID* acpi_table = NULL;
   for (UINTN i = 0; i < system_table->NumberOfTableEntries; ++i) {
     if (CompareGuid(&gEfiAcpiTableGuid,