Merge pull request #1353 from Sonicadvance1/block-debugging

Don't enable stepping on ARMv7 JIT core if just in the debugger.
This commit is contained in:
skidau 2014-10-23 13:30:04 +11:00
commit 9836ce23e6
1 changed files with 7 additions and 3 deletions

View File

@ -307,8 +307,12 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
{ {
// Comment out the following to disable breakpoints (speed-up) // Comment out the following to disable breakpoints (speed-up)
blockSize = 1; if (!Profiler::g_ProfileBlocks)
Trace(); {
if (PowerPC::GetState() == PowerPC::CPU_STEPPING)
blockSize = 1;
Trace();
}
} }
if (em_address == 0) if (em_address == 0)
@ -444,7 +448,7 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo
POP(4, R0, R1, R2, R3); POP(4, R0, R1, R2, R3);
} }
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) if (Profiler::g_ProfileBlocks)
{ {
// Add run count // Add run count
static const u64 One = 1; static const u64 One = 1;