paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-05 14:40:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: Stepping commands, set Handled = Finished => so the loop will end if a step is done

Browse Source 
git-svn-id: trunk@61878 -
This commit is contained in:
martin 2019-09-14 14:27:48 +00:00
parent cc1055fbed
commit c5fe550fbe
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/fpdebug/fpdbgcontroller.pas
View File

@ -260,7 +260,7 @@ procedure TDbgControllerContinueCmd.DoResolveEvent(var AnEvent: TFPDEvent;
AnEventThread: TDbgThread; out Handled, Finished: boolean);
begin
Handled := false;
Finished := (AnEvent<>deInternalContinue);
Finished := (AnEvent<>deInternalContinue); // TODO: always False? will be aborted, if another event terminates the ProcessLoop
end;
{ TDbgControllerStepIntoInstructionCmd }
@ -276,8 +276,10 @@ procedure TDbgControllerStepIntoInstructionCmd.DoResolveEvent(
var AnEvent: TFPDEvent; AnEventThread: TDbgThread; out Handled,
Finished: boolean);
begin
Handled := false;
Finished := (AnEvent<>deInternalContinue);
Handled := Finished;
if Finished then
AnEvent := deFinishedStep;
end;
{ TDbgControllerStepOverInstructionCmd }
@ -322,8 +324,8 @@ procedure TDbgControllerStepOverInstructionCmd.DoResolveEvent(
var AnEvent: TFPDEvent; AnEventThread: TDbgThread; out Handled,
Finished: boolean);
begin
Handled := false;
Finished := not (AnEvent in [deInternalContinue, deLoadLibrary]);
Handled := Finished;
if Finished then
begin
AnEvent := deFinishedStep;
@ -430,7 +432,6 @@ begin
AStackPointerValue:=FController.CurrentThread.GetStackPointerRegisterValue;
AStackBasePointerValue:=FController.CurrentThread.GetStackBasePointerRegisterValue;
Handled := false;
Finished := not (AnEvent in [deInternalContinue, deLoadLibrary]);
if (AnEvent=deBreakpoint) and not assigned(FController.FCurrentProcess.CurrentBreakpoint) then
begin
@ -479,6 +480,9 @@ begin
end;
end;
end;
Handled := Finished;
if Finished then
AnEvent := deFinishedStep;
FLastStackPointerValue:=AStackPointerValue;
FLastStackBaseValue:=AStackBasePointerValue;
end;
@ -519,6 +523,7 @@ begin
Finished:=false;
end;
end;
Handled := Finished;
if Finished then
AnEvent := deFinishedStep;
end;
@ -597,7 +602,6 @@ end;
procedure TDbgControllerStepOutCmd.DoResolveEvent(var AnEvent: TFPDEvent;
AnEventThread: TDbgThread; out Handled, Finished: boolean);
begin
Handled := false;
Finished := false;
if FStepOut then
@ -618,6 +622,7 @@ begin
FHiddenBreakpoint.Free;
end;
end;
Handled := Finished;
end;
{ TDbgControllerRunToCmd }
@ -642,13 +647,14 @@ end;
procedure TDbgControllerRunToCmd.DoResolveEvent(var AnEvent: TFPDEvent;
AnEventThread: TDbgThread; out Handled, Finished: boolean);
begin
Handled := false;
Finished := (AnEvent<>deInternalContinue);
Handled := Finished;
if Finished and assigned(FHiddenBreakpoint) then
begin
begin
FProcess.RemoveBreak(FHiddenBreakpoint);
FHiddenBreakpoint.Free;
end;
AnEvent := deFinishedStep;
end;
end;