From 6bc5ce0439b6265a941cfe6bf2b5319e3e08ae92 Mon Sep 17 00:00:00 2001 From: zilmar Date: Fri, 2 Mar 2018 19:02:23 +1100 Subject: [PATCH] [Debugger] Handle breakpoint in delay slot of recompiler --- .../N64System/Recompiler/x86/x86RecompilerOps.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp index bdc70f94e..b1b6cc010 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp +++ b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp @@ -96,7 +96,9 @@ static void x86MemoryBreakpoint() memory_breakpoint_found = 1; if (memory_write_in_delayslot) { - g_Notify->BreakPoint(__FILE__, __LINE__); + g_Reg->m_PROGRAM_COUNTER -= 4; + *g_NextTimer += g_System->CountPerOp(); + CInterpreterCPU::ExecuteOps(g_System->CountPerOp()); } x86_compiler_Break_Point(); }