From 777da89830323d1afb514d16c3bd8a277d29b50c Mon Sep 17 00:00:00 2001 From: Ryan Meredith Date: Sun, 29 Nov 2020 17:41:10 -0500 Subject: [PATCH] Android: Add "Disable Fastmem" debug setting --- .../dolphinemu/features/settings/model/BooleanSetting.java | 1 + .../features/settings/ui/SettingsFragmentPresenter.java | 1 + Source/Android/app/src/main/res/values/strings.xml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java index 86338f9d91..82cee6bdfb 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java @@ -9,6 +9,7 @@ public enum BooleanSetting implements AbstractBooleanSetting // These entries have the same names and order as in C++, just for consistency. MAIN_DSP_HLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DSPHLE", true), + MAIN_FASTMEM(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "Fastmem", true), MAIN_CPU_THREAD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUThread", true), MAIN_OVERRIDE_REGION_SETTINGS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "OverrideRegionSettings", false), diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index f778d3919d..f3fe3aac4f 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -650,6 +650,7 @@ public final class SettingsFragmentPresenter private void addDebugSettings(ArrayList sl) { sl.add(new HeaderSetting(R.string.debug_warning, 0)); + sl.add(new InvertedCheckBoxSetting(BooleanSetting.MAIN_FASTMEM, R.string.debug_fastmem, 0)); sl.add(new HeaderSetting(R.string.debug_jit_header, 0)); sl.add(new CheckBoxSetting(BooleanSetting.MAIN_JIT_OFF, R.string.debug_jitoff, 0)); diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index e940416ca9..c5c587baa1 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -287,7 +287,8 @@ Debug - Warning: These settings will slow emulation + Warning: Debug settings will slow emulation + Disable Fastmem Jit Jit Disabled Jit Load Store Disabled