DBG: Fix inserting breakpoints (do not silently enter pause state), introduced in r 32414

git-svn-id: trunk@32432 -
This commit is contained in:
martin 2011-09-19 23:28:15 +00:00
parent ce6ac1c77c
commit 7666c75dd1

View File

@ -4930,13 +4930,13 @@ begin
FTheDebugger.QueueExecuteUnlock; FTheDebugger.QueueExecuteUnlock;
end; end;
if (StoppedParams <> '') and (not ContinueExecution) and (DebuggerState = dsRun) and (TargetInfo^.TargetPID <> 0) then begin
debugln(['ERROR: Got stop params, but did not change FTheDebugger.state: ', StoppedParams]); if (not ContinueExecution) and (DebuggerState = dsRun) and
//SetDebuggerState(dsError); // we cannot be running anymore (TargetInfo^.TargetPID <> 0) and (FTheDebugger.PauseWaitState <> pwsInternal)
SetDebuggerState(dsPause); then begin
end; if (StoppedParams <> '')
if (StoppedParams = '') and (not ContinueExecution) and (DebuggerState = dsRun) and (TargetInfo^.TargetPID <> 0) then begin then debugln(['ERROR: Got stop params, but did not change FTheDebugger.state: ', StoppedParams])
debugln(['ERROR: Got NO stop params at all, but was running']); else debugln(['ERROR: Got NO stop params at all, but was running']);
//SetDebuggerState(dsError); // we cannot be running anymore //SetDebuggerState(dsError); // we cannot be running anymore
SetDebuggerState(dsPause); SetDebuggerState(dsPause);
end; end;
@ -7429,11 +7429,11 @@ end;
procedure TGDBMIBreakPoint.DoLogExpression(const AnExpression: String); procedure TGDBMIBreakPoint.DoLogExpression(const AnExpression: String);
var var
s: String; s: String;
t: TDBGType; t: TGDBType;
begin begin
if TGDBMIDebugger(Debugger).GDBEvaluate(AnExpression, s, t, [defNoTypeInfo]) if TGDBMIDebugger(Debugger).GDBEvaluate(AnExpression, s, t, [defNoTypeInfo])
then begin then begin
Debugger.DoDbgEvent(ecBreakpoint, etBreakpointEvaluation, s); TGDBMIDebugger(Debugger).DoDbgEvent(ecBreakpoint, etBreakpointEvaluation, s);
end; end;
end; end;