diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 80ee9f7348..1809f0729e 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -77,7 +77,6 @@ private: bool bFPRF; bool bAccurateNaNs; bool bMMU; - bool bDCBZOFF; bool bLowDCBZHack; bool m_EnableJIT; bool bSyncGPU; @@ -108,7 +107,6 @@ void ConfigCache::SaveConfig(const SConfig& config) bFPRF = config.bFPRF; bAccurateNaNs = config.bAccurateNaNs; bMMU = config.bMMU; - bDCBZOFF = config.bDCBZOFF; m_EnableJIT = config.m_DSPEnableJIT; bSyncGPU = config.bSyncGPU; bFastDiscSpeed = config.bFastDiscSpeed; @@ -148,7 +146,6 @@ void ConfigCache::RestoreConfig(SConfig* config) config->bFPRF = bFPRF; config->bAccurateNaNs = bAccurateNaNs; config->bMMU = bMMU; - config->bDCBZOFF = bDCBZOFF; config->bLowDCBZHack = bLowDCBZHack; config->m_DSPEnableJIT = m_EnableJIT; config->bSyncGPU = bSyncGPU; @@ -248,7 +245,6 @@ bool BootCore(std::unique_ptr boot) core_section->Get("FPRF", &StartUp.bFPRF, StartUp.bFPRF); core_section->Get("AccurateNaNs", &StartUp.bAccurateNaNs, StartUp.bAccurateNaNs); core_section->Get("MMU", &StartUp.bMMU, StartUp.bMMU); - core_section->Get("DCBZ", &StartUp.bDCBZOFF, StartUp.bDCBZOFF); core_section->Get("LowDCBZHack", &StartUp.bLowDCBZHack, StartUp.bLowDCBZHack); core_section->Get("SyncGPU", &StartUp.bSyncGPU, StartUp.bSyncGPU); core_section->Get("FastDiscSpeed", &StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed); diff --git a/Source/Core/Core/Config/MainSettings.cpp b/Source/Core/Core/Config/MainSettings.cpp index 027c4916a2..f43680a223 100644 --- a/Source/Core/Core/Config/MainSettings.cpp +++ b/Source/Core/Core/Config/MainSettings.cpp @@ -85,7 +85,6 @@ const ConfigInfo MAIN_SYNC_GPU_MIN_DISTANCE{{System::Main, "Core", "SyncGpu -200000}; const ConfigInfo MAIN_SYNC_GPU_OVERCLOCK{{System::Main, "Core", "SyncGpuOverclock"}, 1.0f}; const ConfigInfo MAIN_FAST_DISC_SPEED{{System::Main, "Core", "FastDiscSpeed"}, false}; -const ConfigInfo MAIN_DCBZ{{System::Main, "Core", "DCBZ"}, false}; const ConfigInfo MAIN_LOW_DCBZ_HACK{{System::Main, "Core", "LowDCBZHack"}, false}; const ConfigInfo MAIN_FPRF{{System::Main, "Core", "FPRF"}, false}; const ConfigInfo MAIN_ACCURATE_NANS{{System::Main, "Core", "AccurateNaNs"}, false}; diff --git a/Source/Core/Core/Config/MainSettings.h b/Source/Core/Core/Config/MainSettings.h index 260c16a1bc..51bcaabc9e 100644 --- a/Source/Core/Core/Config/MainSettings.h +++ b/Source/Core/Core/Config/MainSettings.h @@ -61,7 +61,6 @@ extern const ConfigInfo MAIN_SYNC_GPU_MAX_DISTANCE; extern const ConfigInfo MAIN_SYNC_GPU_MIN_DISTANCE; extern const ConfigInfo MAIN_SYNC_GPU_OVERCLOCK; extern const ConfigInfo MAIN_FAST_DISC_SPEED; -extern const ConfigInfo MAIN_DCBZ; extern const ConfigInfo MAIN_LOW_DCBZ_HACK; extern const ConfigInfo MAIN_FPRF; extern const ConfigInfo MAIN_ACCURATE_NANS; diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 3eba2b6f6e..17a79a409a 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -529,7 +529,6 @@ void SConfig::LoadCoreSettings(IniFile& ini) core->Get("SyncGpuMinDistance", &iSyncGpuMinDistance, -200000); core->Get("SyncGpuOverclock", &fSyncGpuOverclock, 1.0f); core->Get("FastDiscSpeed", &bFastDiscSpeed, false); - core->Get("DCBZ", &bDCBZOFF, false); core->Get("LowDCBZHack", &bLowDCBZHack, false); core->Get("FPRF", &bFPRF, false); core->Get("AccurateNaNs", &bAccurateNaNs, false); @@ -754,7 +753,6 @@ void SConfig::LoadDefaults() #else bMMU = false; #endif - bDCBZOFF = false; bLowDCBZHack = false; iBBDumpPort = -1; bSyncGPU = false; diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index f461f8698d..9ad7271baa 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -122,7 +122,6 @@ struct SConfig bool bRunCompareClient = false; bool bMMU = false; - bool bDCBZOFF = false; bool bLowDCBZHack = false; int iBBDumpPort = 0; bool bFastDiscSpeed = false; diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp index ecdf2ca5fc..51ad508250 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -502,11 +502,6 @@ void Interpreter::dcbtst(UGeckoInstruction inst) void Interpreter::dcbz(UGeckoInstruction inst) { - // DCBZOFF is a hack to fix certain games which would otherwise require - // accurate L2 emulation. - if (SConfig::GetInstance().bDCBZOFF) - return; - const u32 dcbz_addr = Helper_Get_EA_X(inst); if (!HID0.DCE) diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp index 67069b5433..203775de2f 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp @@ -330,8 +330,6 @@ void Jit64::dcbz(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITLoadStoreOff); - if (SConfig::GetInstance().bDCBZOFF) - return; FALLBACK_IF(SConfig::GetInstance().bLowDCBZHack); int a = inst.RA; diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp index 827fadd07f..f0e5397f1c 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp @@ -630,8 +630,6 @@ void JitArm64::dcbz(UGeckoInstruction inst) { INSTRUCTION_START JITDISABLE(bJITLoadStoreOff); - if (SConfig::GetInstance().bDCBZOFF) - return; FALLBACK_IF(jo.memcheck); FALLBACK_IF(SConfig::GetInstance().bLowDCBZHack);