From 690943ceef8be315a6732a29cf876f5aa848316d Mon Sep 17 00:00:00 2001
From: MechaCat02 <fabian@diekaulbachs.de>
Date: Thu, 7 May 2026 21:45:54 +0200
Subject: [PATCH] gate dump-section reads on is_mapped; trim doc comments

Without the page-state guard, read_bulk faulted on PROT_NONE pages of
the 4 GiB host reservation. Per-page is_mapped check skips uncommitted
pages, leaving the buffer's leading zero bytes in place. Total LOC
budget after trim: 70.
---
 crates/xenia-app/src/main.rs     | 27 +++++++++++++++------------
 crates/xenia-kernel/src/state.rs | 22 +---------------------
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/crates/xenia-app/src/main.rs b/crates/xenia-app/src/main.rs
index 49e928a..50cecbb 100644
--- a/crates/xenia-app/src/main.rs
+++ b/crates/xenia-app/src/main.rs
@@ -221,11 +221,7 @@ enum Commands {
         /// `XENIA_MEM_WATCH`. Example: `--mem-watch=0x828F40B4`.
         #[arg(long)]
         mem_watch: Option<String>,
-        /// Diagnostic. Dump a contiguous guest memory range to a file at
-        /// end-of-run. Format: `BASE:LEN:PATH` (BASE/LEN hex or decimal).
-        /// Example: `--dump-section=0x80000000:0x10000000:v80.bin`.
-        /// Read via `GuestMemory::read_bulk`; uncommitted pages read as
-        /// zero. Read-only; lockstep digest unaffected.
+        /// `--dump-section=BASE:LEN:PATH` end-of-run guest memory snapshot.
         #[arg(long)]
         dump_section: Option<String>,
     },
@@ -3265,17 +3261,24 @@ fn dump_thread_diagnostic(
 ) {
     if let Some((base, len, ref path)) = kernel.dump_section {
         let mut buf = vec![0u8; len as usize];
-        const CHUNK: usize = 4096;
-        let mut off = 0usize;
-        while off < buf.len() {
-            let take = CHUNK.min(buf.len() - off);
-            mem.read_bulk(base.wrapping_add(off as u32), &mut buf[off..off + take]);
+        const CHUNK: u32 = 4096;
+        let mut off: u32 = 0;
+        let mut committed_pages = 0u32;
+        while off < len {
+            let take = CHUNK.min(len - off);
+            let addr = base.wrapping_add(off);
+            if mem.is_mapped(addr) {
+                let s = off as usize;
+                let e = s + take as usize;
+                mem.read_bulk(addr, &mut buf[s..e]);
+                committed_pages += 1;
+            }
             off += take;
         }
         match std::fs::write(path, &buf) {
             Ok(()) => eprintln!(
-                "dump-section: wrote {} bytes from {:#010x} to {}",
-                buf.len(), base, path.display(),
+                "dump-section: wrote {} bytes from {:#010x} ({} committed pages) to {}",
+                buf.len(), base, committed_pages, path.display(),
             ),
             Err(e) => eprintln!(
                 "dump-section: failed to write {}: {e}",
diff --git a/crates/xenia-kernel/src/state.rs b/crates/xenia-kernel/src/state.rs
index 6fa1d77..65732fa 100644
--- a/crates/xenia-kernel/src/state.rs
+++ b/crates/xenia-kernel/src/state.rs
@@ -237,10 +237,7 @@ pub struct KernelState {
     /// dump is performed by `dump_thread_diagnostic`, never during
     /// the hot interpreter loop, so lockstep determinism is unaffected.
     pub dump_addrs: Vec<u32>,
-    /// Diagnostic. Optional contiguous memory range to dump verbatim to a
-    /// file at end-of-run: `(base, length, path)`. Populated from
-    /// `--dump-section=BASE:LEN:PATH`. Bulk read via `GuestMemory::read_bulk`;
-    /// host pages that were never committed read as zero (mmap-reserved).
+    /// `--dump-section=BASE:LEN:PATH` end-of-run snapshot, page-gated by `is_mapped`.
     pub dump_section: Option<(u32, u32, std::path::PathBuf)>,
 }
 
@@ -1418,23 +1415,6 @@ mod tests {
         assert!(state.ctor_probe_pcs.contains(&0x8217_C850));
     }
 
-    #[test]
-    fn dump_section_field_round_trip_via_read_bulk() {
-        use xenia_memory::page_table::MemoryProtect;
-        let mem = GuestMemory::new().expect("memory init");
-        mem.alloc(0x4000_0000, 0x1000, MemoryProtect::READ | MemoryProtect::WRITE)
-            .expect("page");
-        let probe = [0xDEu8, 0xAD, 0xBE, 0xEF, 0x12, 0x34, 0x56, 0x78];
-        mem.write_bulk(0x4000_0040, &probe);
-        let mut state = KernelState::new();
-        let tmp = std::env::temp_dir().join("xenia_dump_section_round_trip.bin");
-        state.dump_section = Some((0x4000_0040, 8, tmp.clone()));
-        let (base, len, ref _path) = state.dump_section.as_ref().expect("set").clone();
-        let mut out = vec![0u8; len as usize];
-        mem.read_bulk(base, &mut out);
-        assert_eq!(out, probe);
-    }
-
     #[test]
     fn read_ascii_cstring_handles_termination_and_garbage() {
         use xenia_memory::page_table::MemoryProtect;