Add "DS ROM info" debug view

kelpsyberry · Mar 30, 2024 · 43640f0 · 43640f0
1 parent 35012a7
commit 43640f0
Show file tree

Hide file tree

Showing 9 changed files with 517 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/src/ds_slot/rom/header.rs b/core/src/ds_slot/rom/header.rs
@@ -25,11 +25,8 @@ pub enum Region {
 
 impl<'a> Header<'a> {
     #[inline]
-    pub fn new(bytes: &'a [u8]) -> Option<Self> {
-        if bytes.len() < 0x170 {
-            return None;
-        }
-        Some(Header(bytes))
+    pub fn new(bytes: &'a [u8; 0x170]) -> Self {
+        Header(bytes)
     }
 
     #[inline]

diff --git a/core/src/ds_slot/rom/icon_title.rs b/core/src/ds_slot/rom/icon_title.rs
@@ -136,7 +136,12 @@ impl Titles {
                 }
                 let mut bytes = [0; 0x100];
                 rom_contents.read_slice(icon_title_offset + $offset, &mut bytes);
-                String::from_utf16le(&bytes).map_err(|_| Box::new(bytes))
+                let end_index = bytes
+                    .array_chunks::<2>()
+                    .position(|c| *c == [0; 2])
+                    .unwrap_or(bytes.len())
+                    << 1;
+                String::from_utf16le(&bytes[..end_index]).map_err(|_| Box::new(bytes))
             }};
         }
 
@@ -260,8 +265,11 @@ impl IconTitle {
 }
 
 pub fn read_icon_title_offset(rom_contents: &mut (impl Contents + ?Sized)) -> Option<usize> {
+    if 0x170 > rom_contents.len() {
+        return None;
+    }
     let mut header_bytes = Bytes::new([0; 0x170]);
     rom_contents.read_header(&mut header_bytes);
-    let header = Header::new(&*header_bytes)?;
+    let header = Header::new(&header_bytes);
     Some(header.icon_title_offset() as usize)
 }
diff --git a/core/src/emu.rs b/core/src/emu.rs
@@ -376,10 +376,9 @@ impl<E: cpu::Engine> Emu<E> {
         // TODO: More accurate direct boot
 
         let mut header_bytes = Bytes::new([0; 0x170]);
+        // NOTE: The ROM file's size is ensured beforehand, this should never panic.
         self.ds_slot.rom.read_header(&mut header_bytes);
-        let header = ds_slot::rom::header::Header::new(&*header_bytes)
-            // NOTE: The ROM file's size is ensured beforehand, this should never occur.
-            .expect("couldn't read DS slot ROM header");
+        let header = ds_slot::rom::header::Header::new(&header_bytes);
         let chip_id = self.ds_slot.rom.chip_id();
 
         macro_rules! write_main_mem {

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -9,7 +9,8 @@
     portable_simd,
     new_uninit,
     str_from_utf16_endian,
-    array_try_from_fn
+    array_try_from_fn,
+    array_chunks
 )]
 #![warn(clippy::pedantic)]
 #![allow(

diff --git a/frontend/desktop/src/debug_views.rs b/frontend/desktop/src/debug_views.rs
@@ -14,6 +14,8 @@ mod bg_maps_2d;
 use bg_maps_2d::BgMaps2d;
 mod audio_channels;
 use audio_channels::AudioChannels;
+mod ds_rom_info;
+use ds_rom_info::DsRomInfo;
 
 use super::ui::window::Window;
 use ahash::AHashMap as HashMap;
@@ -773,5 +775,7 @@ declare_structs!(
         (bg_maps_2d, BgMaps2d, InitBgMaps2d, DestroyBgMaps2d, BgMaps2dVisibility, BgMaps2dCustom),
         (audio_channels, AudioChannels, InitAudioChannels, DestroyAudioChannels, AudioChannelsVisibility, AudioChannelsCustom)
     ],
-    []
+    [
+        (ds_rom_info, DsRomInfo, FetchDsRomInfo, ReplyDsRomInfo)
+    ]
 );