diff options
| author | skidau <skidau@gmail.com> | 2014-10-23 13:30:04 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-23 13:30:04 +1100 |
| commit | 9836ce23e65bea4859a249b6febcafbf4b6a6b30 (patch) | |
| tree | 8ced1310cfb42ac5400c9a301706ed5bc6063827 /Source/Core | |
| parent | ce3a039eed7223775683f266af05bdb5833d06a6 (diff) | |
| parent | 85605389d796c8ff7195994a1671c7f0f3b09209 (diff) | |
Merge pull request #1353 from Sonicadvance1/block-debugging
Don't enable stepping on ARMv7 JIT core if just in the debugger.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/PowerPC/JitArm32/Jit.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp index c018aad515..1601117f54 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.cpp @@ -307,8 +307,12 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) { // Comment out the following to disable breakpoints (speed-up) - blockSize = 1; - Trace(); + if (!Profiler::g_ProfileBlocks) + { + if (PowerPC::GetState() == PowerPC::CPU_STEPPING) + blockSize = 1; + Trace(); + } } 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); } - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) + if (Profiler::g_ProfileBlocks) { // Add run count static const u64 One = 1; |