diff options
| author | comex <comexk@gmail.com> | 2015-04-23 02:47:15 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2015-04-24 22:37:54 -0400 |
| commit | 132e1068ce7b2cc39d52facff9a33d0f3a582ae8 (patch) | |
| tree | 34a659ae9f8546a8c020b9c27a5f6574af240196 /Source/Core | |
| parent | 2264e7b087ae796695979d2d5c75cd5eef1e03b7 (diff) | |
Remove checks that disable fastmem if debugging and ENABLE_MEM_CHECK are enabled.
They weren't sufficient and are made redundant by previous commits; they
also (on master) caused breakage due to Jit64::psq_stXX assuming writes
would be fastmem and not clobber a register under certain conditions.
That really needs to be refactored, but for now, this works.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp index 0ed3ddbb3a..a0a86faf50 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp @@ -278,11 +278,7 @@ void EmuCodeBlock::SafeLoadToReg(X64Reg reg_value, const Gen::OpArg & opAddress, registersInUse[reg_value] = false; if (jit->jo.fastmem && !opAddress.IsImm() && - !(flags & (SAFE_LOADSTORE_NO_SWAP | SAFE_LOADSTORE_NO_FASTMEM)) -#ifdef ENABLE_MEM_CHECK - && !SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging -#endif - ) + !(flags & (SAFE_LOADSTORE_NO_SWAP | SAFE_LOADSTORE_NO_FASTMEM))) { u8 *mov = UnsafeLoadToReg(reg_value, opAddress, accessSize, offset, signExtend); @@ -529,11 +525,7 @@ void EmuCodeBlock::SafeWriteRegToReg(OpArg reg_value, X64Reg reg_addr, int acces // TODO: support byte-swapped non-immediate fastmem stores if (jit->jo.fastmem && !(flags & SAFE_LOADSTORE_NO_FASTMEM) && - (reg_value.IsImm() || !(flags & SAFE_LOADSTORE_NO_SWAP)) -#ifdef ENABLE_MEM_CHECK - && !SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging -#endif - ) + (reg_value.IsImm() || !(flags & SAFE_LOADSTORE_NO_SWAP))) { const u8* backpatchStart = GetCodePtr(); u8* mov = UnsafeWriteRegToReg(reg_value, reg_addr, accessSize, offset, !(flags & SAFE_LOADSTORE_NO_SWAP)); |