1 files changed, 18 insertions, 10 deletions

diff --git a/rsdos/src/main.rs b/rsdos/src/main.rs
index 13923ea..6dbad5f 100644
--- a/rsdos/src/main.rs
+++ b/rsdos/src/main.rs
@@ -87,16 +87,10 @@ pub unsafe extern "efiapi" fn efi_main(image_handle: Handle, system_table: *mut
     rsnix::serial::init();
     rsnix::serial_println!("=== rsnix boot ===");
 
-    // Stash the memory map
-    let map_key = match rsnix::memory::capture_memory_map(bs) {
-        Ok(k) => k,
-        Err(e) => {
-            rsnix::serial_println!("mem: capture_memory_map failed 0x{:x}", e);
-            0
-        }
-    };
-
-    // Locate GOP (Graphics Output Protocol)
+    // Locate GOP (Graphics Output Protocol) *before* the memory map is
+    // captured: the heap/page allocators need to know the framebuffer
+    // region so they never hand out its pages (some real firmware lists
+    // it as conventional memory).
     let mut gop_interface: *mut core::ffi::c_void = core::ptr::null_mut();
     let gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
     let gop_result = unsafe {
@@ -108,6 +102,20 @@ pub unsafe extern "efiapi" fn efi_main(image_handle: Handle, system_table: *mut
     };
     if gop_result == EFI_SUCCESS {
         let gop = unsafe { &mut *(gop_interface as *mut GraphicsOutputProtocol) };
+        rsnix::gop::peek_fb_region(gop);
+    }
+
+    // Stash the memory map
+    let map_key = match rsnix::memory::capture_memory_map(bs) {
+        Ok(k) => k,
+        Err(e) => {
+            rsnix::serial_println!("mem: capture_memory_map failed 0x{:x}", e);
+            0
+        }
+    };
+
+    if gop_result == EFI_SUCCESS {
+        let gop = unsafe { &mut *(gop_interface as *mut GraphicsOutputProtocol) };
         rsnix::serial_println!("gop: framebuffer found");
         rsnix::gop::init(gop);
     } else {