diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-11-01 11:53:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-01 11:53:56 +0100 |
| commit | 166d8a1aa3b615fc7e30fd07dd0b943eff95e77d (patch) | |
| tree | 6a3d6bb3971572a0381fedf30fff79dc5306332a /Source/Android | |
| parent | b32ac9353ee760e13b7e62a4b633e33a39f51972 (diff) | |
| parent | d04e67be3d26b7017f2bb061618181fd71611f9a (diff) | |
Merge pull request #12211 from JosJuice/toggle-dcache
PowerPC: Allow toggling write-back cache during emulation
Diffstat (limited to 'Source/Android')
3 files changed, 11 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt index 298f2ebe24..2d2a0065b4 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt @@ -14,6 +14,7 @@ enum class BooleanSetting( MAIN_SKIP_IPL(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SkipIPL", true), MAIN_DSP_HLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DSPHLE", true), MAIN_FASTMEM(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "Fastmem", true), + MAIN_FASTMEM_ARENA(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "FastmemArena", true), MAIN_CPU_THREAD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUThread", true), MAIN_SYNC_ON_SKIP_IDLE( Settings.FILE_DOLPHIN, @@ -897,12 +898,12 @@ enum class BooleanSetting( companion object { private val NOT_RUNTIME_EDITABLE_ARRAY = arrayOf( MAIN_DSP_HLE, + MAIN_FASTMEM_ARENA, MAIN_CPU_THREAD, MAIN_ENABLE_CHEATS, MAIN_OVERRIDE_REGION_SETTINGS, MAIN_MMU, MAIN_PAUSE_ON_PANIC, - MAIN_ACCURATE_CPU_CACHE, MAIN_RAM_OVERRIDE_ENABLE, MAIN_CUSTOM_RTC_ENABLE, MAIN_DSP_JIT, diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt index 099ae980e6..b85a3999cc 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt @@ -1941,6 +1941,14 @@ class SettingsFragmentPresenter( 0 ) ) + sl.add( + InvertedSwitchSetting( + context, + BooleanSetting.MAIN_FASTMEM_ARENA, + R.string.debug_fastmem_arena, + 0 + ) + ) sl.add(HeaderSetting(context, R.string.debug_jit_header, 0)) sl.add( diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index a81cb58a59..044c1ad65d 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -399,6 +399,7 @@ <string name="debug_submenu">Debug</string> <string name="debug_warning">Warning: Debug settings will slow emulation</string> <string name="debug_fastmem">Disable Fastmem</string> + <string name="debug_fastmem_arena">Disable Fastmem Arena</string> <string name="debug_jit_header">Jit</string> <string name="debug_jitoff">Jit Disabled</string> <string name="debug_jitloadstoreoff">Jit Load Store Disabled</string> |