From 7d9d54aaa8734ba2e2ad5b1408199811ccbb840b Mon Sep 17 00:00:00 2001 From: zilmar Date: Tue, 16 Jan 2018 08:28:54 +1100 Subject: [PATCH] [Debugger] re-add some code accidentally commented out --- Source/Project64/UserInterface/Debugger/Debugger.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Project64/UserInterface/Debugger/Debugger.cpp b/Source/Project64/UserInterface/Debugger/Debugger.cpp index efff737b0..cee1db08e 100644 --- a/Source/Project64/UserInterface/Debugger/Debugger.cpp +++ b/Source/Project64/UserInterface/Debugger/Debugger.cpp @@ -388,11 +388,11 @@ bool CDebuggerUI::CPUStepStarted() uint32_t PROGRAM_COUNTER = g_Reg->m_PROGRAM_COUNTER; uint32_t JumpToLocation = R4300iOp::m_JumpToLocation; - //m_ScriptSystem->HookCPUExec()->InvokeByParamInRange(PROGRAM_COUNTER); + m_ScriptSystem->HookCPUExec()->InvokeByParamInRange(PROGRAM_COUNTER); // PC breakpoints - if (m_Breakpoints->ExecutionBPExists(PROGRAM_COUNTER, true)) + if (isDebugging() && m_Breakpoints->ExecutionBPExists(PROGRAM_COUNTER, true)) { goto breakpoint_hit; } @@ -404,7 +404,7 @@ bool CDebuggerUI::CPUStepStarted() if (op >= R4300i_LDL && op <= R4300i_SD && op != R4300i_CACHE) // Read and write instructions { - /*uint32_t memoryAddress = g_Reg->m_GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset; + uint32_t memoryAddress = g_Reg->m_GPR[Opcode.base].UW[0] + (int16_t)Opcode.offset; if ((op <= R4300i_LWU || (op >= R4300i_LL && op <= R4300i_LD))) // Read instructions { @@ -444,7 +444,7 @@ bool CDebuggerUI::CPUStepStarted() } } } - }*/ + } } if (!isStepping())