paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-04 15:30:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: stepping, avoid double step out.

Browse Source 
git-svn-id: trunk@63062 -
This commit is contained in:
martin 2020-04-24 20:08:13 +00:00
parent 074fc3b2f0
commit 11ad3881e8
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/fpdebug/fpdbgcontroller.pas
View File

@ -545,13 +545,13 @@ begin
if not FController.NextOnlyStopOnStartLine then
exit;
if IsAtLastHiddenBreakAddr then begin
FStepInfoUnavailAfterStepOut := not IsAtLastHiddenBreakAddr;
if not FStepInfoUnavailAfterStepOut then begin
{$PUSH}{$Q-}{$R-}
FThread.StoreStepInfo(FThread.GetInstructionPointerRegisterValue +
FThread.GetInstructionPointerRegisterValue - 1);
{$POP}
end;
FStepInfoUnavailAfterStepOut := not IsAtLastHiddenBreakAddr;
FStepInfoUpdatedForStepOut := True;
end;
@ -559,14 +559,21 @@ function TDbgControllerLineStepBaseCmd.HasSteppedAwayFromOriginLine: boolean;
var
CompRes: TFPDCompareStepInfo;
begin
Result := IsSteppedOut and (not FController.NextOnlyStopOnStartLine);
if Result then
exit;
Result := IsSteppedOut;
if Result then begin
Result := (not FController.NextOnlyStopOnStartLine);
if Result then
exit;
// LIMIT steps ? // avoid further stepping out ? // stop at leave/ret ?
if IsSteppedOut and FStepInfoUnavailAfterStepOut then begin
Result := FController.FCurrentThread.IsAtStartOfLine;
exit;
// If stepped out, do not step out again
Result := NextInstruction.IsLeaveStackFrame or NextInstruction.IsReturnInstruction;
if Result then
exit;
if FStepInfoUnavailAfterStepOut then begin
Result := FController.FCurrentThread.IsAtStartOfLine;
exit;
end;
end;
CompRes := FThread.CompareStepInfo;