Permalink
Browse files

Debugger: Fix resume not skipping breakpoints.

  • Loading branch information...
unknownbrackets committed May 2, 2018
1 parent 65feb5f commit 5b132c904ad044f01917efbc39681919495f930a
Showing with 4 additions and 1 deletion.
  1. +2 −1 Core/Debugger/DisassemblyManager.cpp
  2. +2 −0 Core/Debugger/WebSocket/CPUCoreSubscriber.cpp
@@ -524,7 +524,8 @@ void DisassemblyFunction::generateBranchLines()
if (lane == -1)
{
// error
// Let's just pile on.
lines[i].laneIndex = 15;
continue;
}
@@ -18,6 +18,7 @@
#include "Common/StringUtils.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/Debugger/Breakpoints.h"
#include "Core/Debugger/WebSocket/CPUCoreSubscriber.h"
#include "Core/Debugger/WebSocket/WebSocketUtils.h"
#include "Core/MIPS/MIPS.h"
@@ -71,6 +72,7 @@ void WebSocketCPUResume(DebuggerRequest &req) {
return req.Fail("CPU not stepping");
}
CBreakPoints::SetSkipFirst(currentMIPS->pc);
if (currentMIPS->inDelaySlot) {
Core_DoSingleStep();
}

0 comments on commit 5b132c9

Please sign in to comment.