1 files changed, 11 insertions, 7 deletions

diff --git a/rsdos/src/main.rs b/rsdos/src/main.rs
index 42f95e5..e40098d 100644
--- a/rsdos/src/main.rs
+++ b/rsdos/src/main.rs
@@ -185,7 +185,7 @@ pub unsafe extern "efiapi" fn efi_main(image_handle: Handle, system_table: *mut
     } else {
         rsnix::serial_println!("gop: not found (0x{:x})", gop_result);
     }
-    rsnix::gop::boot_marker("rsnix v0.5.5 booting..");
+    rsnix::gop::boot_marker("rsnix v0.5.9 booting..");
     rsnix::vt::init();
     let (rows, cols) = rsnix::vt::size();
     rsnix::serial_println!("vt: terminal ready ({}x{})", rows, cols);
@@ -207,7 +207,15 @@ pub unsafe extern "efiapi" fn efi_main(image_handle: Handle, system_table: *mut
     }
 
     // ExitBootServices — we now own the machine
-    if unsafe { (bs.exit_boot_services)(image_handle, map_key) } != EFI_SUCCESS {
+    // DEBUG (OptiPlex sim): corrupt the first key so EBS fails once and
+    // the retry path (capture_memory_map -> init_heap rebuild) runs — the
+    // exact condition that wiped the pre-EBS shadow on real hardware.
+    let ebs_first_key = if rsnix::memory::simulate_ebs_failure() {
+        map_key ^ 1
+    } else {
+        map_key
+    };
+    if unsafe { (bs.exit_boot_services)(image_handle, ebs_first_key) } != EFI_SUCCESS {
         rsnix::serial_println!("WARN: ExitBootServices failed, retrying...");
         match unsafe { rsnix::memory::refresh_and_exit(bs, image_handle) } {
             Ok(_) => {}
@@ -351,14 +359,10 @@ pub unsafe extern "efiapi" fn efi_main(image_handle: Handle, system_table: *mut
     // whether the corruption is already present at shell entry or lands
     // later, and prints the exact field values when it is.
     rsnix::vt::debug_verify();
+
     shell::run();
 }
 
-/// Write the OptiPlex's 0x00AAAAAA scrub pattern over the stack region
-/// the shell's frames will reuse, leaving only 256 B of live frame
-/// headroom.  128 KiB covers the whole shell frame chain on QEMU and
-/// the OptiPlex.  Best-effort: the region is below rsp inside the boot
-/// stack mapping; the call into `shell::run` overwrites the top word.
 // ---------------------------------------------------------------------------
 // Print a memory summary from the stashed memory map
 // ---------------------------------------------------------------------------