1 files changed, 14 insertions, 2 deletions

diff --git a/rsdos/src/main.rs b/rsdos/src/main.rs
index b6393ee..aa116e4 100644
--- a/rsdos/src/main.rs
+++ b/rsdos/src/main.rs
@@ -5,6 +5,8 @@
 use core::panic::PanicInfo;
 use rsnix::uefi::*;
 
+extern crate alloc;
+
 // ---------------------------------------------------------------------------
 // Panic handler
 // ---------------------------------------------------------------------------
@@ -47,9 +49,11 @@ fn panic(info: &PanicInfo) -> ! {
     }
     // Real hardware has no serial console — put the panic on the screen
     // too (white-on-red band), so a pre-shell panic is not a silent
-    // blank screen.
+    // blank screen.  The last boot stage is appended so the user can
+    // see how far boot got before the crash.
     let mut loc_buf = [0u8; 96];
     let mut msg_buf = [0u8; 128];
+    let mut stage_buf = [0u8; 96];
     let loc_n = {
         let mut w = rsnix::strbuf::FmtBuf::new(&mut loc_buf);
         if let Some(loc) = info.location() {
@@ -64,10 +68,17 @@ fn panic(info: &PanicInfo) -> ! {
         let _ = write!(&mut w, "{}", info.message());
         w.len()
     };
+    let stage_n = {
+        let s = rsnix::gop::last_boot_stage();
+        let n = s.len().min(stage_buf.len());
+        stage_buf[..n].copy_from_slice(&s.as_bytes()[..n]);
+        n
+    };
     let lines = [
         "*** PANIC ***",
         core::str::from_utf8(&msg_buf[..msg_n]).unwrap_or("?"),
         core::str::from_utf8(&loc_buf[..loc_n]).unwrap_or("?"),
+        core::str::from_utf8(&stage_buf[..stage_n]).unwrap_or(""),
     ];
     rsnix::gop::dump_lines(&lines);
     loop {
@@ -150,7 +161,8 @@ pub unsafe extern "efiapi" fn efi_main(image_handle: Handle, system_table: *mut
     rsnix::vt::init();
     let (rows, cols) = rsnix::vt::size();
     rsnix::serial_println!("vt: terminal ready ({}x{})", rows, cols);
-    rsnix::gop::boot_marker("rsnix: gop+vt ok");
+    let (fw, fh) = rsnix::gop::pixel_dims();
+    rsnix::gop::boot_marker(&alloc::format!("rsnix: gop {}x{} vt {}x{} ok", fw, fh, cols, rows));
 
     // ExitBootServices — we now own the machine
     if unsafe { (bs.exit_boot_services)(image_handle, map_key) } != EFI_SUCCESS {