Auto detect if arm7 block validation is needed

Author: Grarak

src/core/cycle_manager.rs

@@ -4,7 +4,7 @@ use crate::core::emu::Emu;
 use crate::core::CpuType;
 use crate::core::CpuType::{ARM7, ARM9};
 use std::cmp::max;
-use std::intrinsics::likely;
+use std::intrinsics::{likely, unlikely};
 use std::mem;
 
 #[repr(u8)]
@@ -130,7 +130,11 @@ impl CycleManager {
     }
 
     pub fn schedule(&mut self, in_cycles: u32, event_type: EventType) {
-        let event_cycle = self.cycle_count + max(in_cycles, 1);
+        let mut in_cycles = max(in_cycles, 1);
+        if unlikely(u32::MAX - in_cycles < self.cycle_count) {
+            in_cycles = u32::MAX - self.cycle_count;
+        }
+        let event_cycle = self.cycle_count + in_cycles;
         self.events[event_type as usize] = event_cycle;
         self.active_events |= 1 << (31 - event_type as u8);
         if event_cycle < self.next_event_cycle {

src/core/emu.rs

@@ -31,6 +31,18 @@ pub struct NitroSdkVersion {
     major: u8,
 }
 
+impl NitroSdkVersion {
+    pub fn is_valid(self) -> bool {
+        u32::from(self) != u32::MAX
+    }
+}
+
+impl Default for NitroSdkVersion {
+    fn default() -> Self {
+        NitroSdkVersion::from(u32::MAX)
+    }
+}
+
 pub struct Emu {
     pub ipc: Ipc,
     pub cartridge: Cartridge,
@@ -76,7 +88,7 @@ impl Emu {
             wifi: Wifi::new(),
             jit,
             settings: DEFAULT_SETTINGS.clone(),
-            nitro_sdk_version: NitroSdkVersion::from(u32::MAX),
+            nitro_sdk_version: NitroSdkVersion::default(),
             breakout_imm: false,
             initialized: true,
         }
@@ -102,7 +114,7 @@ impl Emu {
             self.timers = [Timers::new(), Timers::new()];
             self.wifi = Wifi::new();
         }
-        self.nitro_sdk_version = NitroSdkVersion::from(u32::MAX);
+        self.nitro_sdk_version = NitroSdkVersion::default();
         self.initialized = false;
     }
 }

src/jit/jit_asm.rs

@@ -470,7 +470,7 @@ fn emit_code_block_internal(asm: &mut JitAsm, guest_pc: u32, thumb: bool) {
         let mut block_asm = BlockAsm::new(asm.cpu, thumb);
         block_asm.prologue(asm.analyzer.basic_blocks.len());
 
-        if asm.cpu == ARM7 && guest_pc & 0xFF000000 != regions::VRAM_OFFSET && asm.emu.settings.arm7_block_validation() {
+        if asm.cpu == ARM7 && guest_pc & 0xFF000000 != regions::VRAM_OFFSET && !asm.emu.nitro_sdk_version.is_valid() {
             let guest_ptr = ARM7.mmu_tcm_addr() + (guest_pc as usize & 0xFFFFFFF);
             let size = (guest_pc_end - guest_pc + pc_step) as usize;
             let hash = xxh32(unsafe { slice::from_raw_parts(guest_ptr as _, size) }, 0);

src/presenter/linux.rs

@@ -72,13 +72,12 @@ impl Presenter {
             .arg(arg!(framelimit: -f "Enable framelimit").required(false).action(ArgAction::SetTrue))
             .arg(arg!(audio: -a "Enable audio").required(false).action(ArgAction::SetTrue))
             .arg(
-                arg!(-e <arm7_emu> "0: Accurate, 1: Partial, 2: Partial with Sound, 3: Hle")
+                arg!(-e <arm7_emu> "0: Accurate, 1: SoundHle, 2: Hle")
                     .num_args(1)
                     .required(false)
                     .default_value("0")
                     .value_parser(value_parser!(u8)),
             )
-            .arg(arg!(enable_arm7_block_validation: -b "Enable arm7 block validation").required(false).action(ArgAction::SetTrue))
             .arg(arg!(ui: --ui "Use UI").required(false).action(ArgAction::SetTrue))
             .arg(arg!([nds_rom] "NDS rom to run").num_args(1).required(true).value_parser(value_parser!(String)))
             .get_matches();
@@ -164,7 +163,6 @@ impl Presenter {
             settings.set_framelimit(self.arg_matches.get_flag("framelimit"));
             settings.set_audio(self.arg_matches.get_flag("audio"));
             settings.set_arm7_emu(Arm7Emu::from(*self.arg_matches.get_one::<u8>("arm7_emu").unwrap_or(&0)));
-            settings.set_arm7_block_validation(self.arg_matches.get_flag("enable_arm7_block_validation"));
 
             let file_name = file_path.file_name().unwrap().to_str().unwrap();
             let save_path = file_path.parent().unwrap().join(format!("{file_name}.sav"));

src/settings.rs

@@ -173,18 +173,12 @@ lazy_static! {
             Setting::new("Bottom screen scale", "Press PS + Circle to cycle screen sizes", ScreenLayout::scale_settings_value(), true),
             Setting::new("Language", "Some ROMs only come with one language. Make sure yours is multilingual.", Language::iter().into(), false),
             Setting::new("Joystick as D-Pad", "", SettingValue::Bool(true), true),
-            Setting::new(
-                "Arm7 jit block validation",
-                "Only needed for nds homebrew. Commercial games usually don't need to have this enabled.",
-                SettingValue::Bool(false),
-                false,
-            ),
         ],
     );
 }
 
 #[derive(Clone)]
-pub struct Settings([Setting; 11]);
+pub struct Settings([Setting; 10]);
 
 #[repr(u8)]
 enum SettingIndices {
@@ -198,7 +192,6 @@ enum SettingIndices {
     BottomScreenScale,
     Language,
     JoystickAsDpad,
-    Arm7BlockValidation,
 }
 
 impl Settings {
@@ -229,10 +222,6 @@ impl Settings {
         unsafe { Arm7Emu::from(self.0[SettingIndices::Arm7Emu as usize].value.as_list().unwrap_unchecked().0 as u8) }
     }
 
-    pub fn arm7_block_validation(&self) -> bool {
-        unsafe { self.0[SettingIndices::Arm7BlockValidation as usize].value.as_bool().unwrap_unchecked() }
-    }
-
     pub fn audio_stretching(&self) -> bool {
         unsafe { self.0[SettingIndices::AudioStretching as usize].value.as_bool().unwrap_unchecked() }
     }
@@ -258,11 +247,7 @@ impl Settings {
         *self.0[SettingIndices::Arm7Emu as usize].value.as_list_mut().unwrap().0 = value as usize
     }
 
-    pub fn set_arm7_block_validation(&mut self, value: bool) {
-        *self.0[SettingIndices::Arm7BlockValidation as usize].value.as_bool_mut().unwrap() = value;
-    }
-
-    pub fn get_all_mut(&mut self) -> &mut [Setting; 11] {
+    pub fn get_all_mut(&mut self) -> &mut [Setting; 10] {
         &mut self.0
     }
 }