paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 10:57:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: fix asm-stepping bring source-edit to front (work around) Issue #40415

Browse Source 
(cherry picked from commit 478b6dcf4b)
This commit is contained in:
Martin 2023-08-06 08:58:58 +02:00
parent 52aafa7090
commit f051d0bd65
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ide/debugmanager.pas
View File

@ -143,7 +143,7 @@ type
FDialogs: array[TDebugDialogType] of TDebuggerDlg; FDialogs: array[TDebugDialogType] of TDebuggerDlg;
FInStateChange: Boolean; FInStateChange: Boolean;
FPrevShownWindow: HWND; FPrevShownWindow: HWND;
FStepping: Boolean; FStepping, FAsmStepping: Boolean;
// keep track of the last reported location // keep track of the last reported location
FCurrentLocation: TDBGLocationRec; FCurrentLocation: TDBGLocationRec;
// last hit breakpoint // last hit breakpoint
@ -1700,6 +1700,7 @@ begin
a := FAsmWindowShouldAutoClose or (FDialogs[ddtAssembler] = nil) or (not FDialogs[ddtAssembler].Visible); a := FAsmWindowShouldAutoClose or (FDialogs[ddtAssembler] = nil) or (not FDialogs[ddtAssembler].Visible);
ViewDebugDialog(ddtAssembler); ViewDebugDialog(ddtAssembler);
FAsmWindowShouldAutoClose := a and EnvironmentDebugOpts.DebuggerAutoCloseAsm; FAsmWindowShouldAutoClose := a and EnvironmentDebugOpts.DebuggerAutoCloseAsm;
FAsmStepping := False;
exit; exit;
end; end;
if (FDialogs[ddtAssembler] <> nil) and FAsmWindowShouldAutoClose then if (FDialogs[ddtAssembler] <> nil) and FAsmWindowShouldAutoClose then
@ -1716,8 +1717,12 @@ begin
i := SrcLine; i := SrcLine;
if (Editor <> nil) then if (Editor <> nil) then
i := Editor.DebugToSourceLine(i); i := Editor.DebugToSourceLine(i);
if MainIDE.DoJumpToCodePosition(nil,nil,NewSource,1,i,-1,-1,-1,Flags)<>mrOk if not (FAsmStepping and (FDialogs[ddtAssembler] <> nil) and
then exit; FDialogs[ddtAssembler].IsVisible and FDialogs[ddtAssembler].Active )
then
if MainIDE.DoJumpToCodePosition(nil,nil,NewSource,1,i,-1,-1,-1,Flags)<>mrOk
then exit;
FAsmStepping := False;
// mark execution line // mark execution line
if (Editor = nil) and (SourceEditorManager <> nil) then if (Editor = nil) and (SourceEditorManager <> nil) then
@ -2811,6 +2816,7 @@ begin
end; end;
FStepping:=True; FStepping:=True;
FAsmStepping := False;
FDebugger.StepInto; FDebugger.StepInto;
Result := mrOk; Result := mrOk;
end; end;
@ -2826,6 +2832,7 @@ begin
end; end;
FStepping:=True; FStepping:=True;
FAsmStepping := False;
FDebugger.StepOver; FDebugger.StepOver;
Result := mrOk; Result := mrOk;
end; end;
@ -2841,6 +2848,7 @@ begin
end; end;
FStepping:=True; FStepping:=True;
FAsmStepping := True;
FDebugger.StepIntoInstr; FDebugger.StepIntoInstr;
Result := mrOk; Result := mrOk;
// Todo: move to DebuggerChangeState (requires the last run-command-type to be avail) // Todo: move to DebuggerChangeState (requires the last run-command-type to be avail)
@ -2858,6 +2866,7 @@ begin
end; end;
FStepping:=True; FStepping:=True;
FAsmStepping := True;
FDebugger.StepOverInstr; FDebugger.StepOverInstr;
Result := mrOk; Result := mrOk;
// Todo: move to DebuggerChangeState (requires the last run-command-type to be avail) // Todo: move to DebuggerChangeState (requires the last run-command-type to be avail)
@ -2881,6 +2890,7 @@ begin
end; end;
FStepping:=True; FStepping:=True;
FAsmStepping := False;
FDebugger.StepOut; FDebugger.StepOut;
Result := mrOk; Result := mrOk;
end; end;
@ -2892,6 +2902,7 @@ begin
FRunTimer.Enabled:=false; FRunTimer.Enabled:=false;
Exclude(FManagerStates,dmsWaitForRun); Exclude(FManagerStates,dmsWaitForRun);
Exclude(FManagerStates,dmsWaitForAttach); Exclude(FManagerStates,dmsWaitForAttach);
FAsmStepping := False;
SourceEditorManager.ClearExecutionLines; SourceEditorManager.ClearExecutionLines;
if (MainIDE.ToolStatus=itDebugger) and (FDebugger<>nil) and (not Destroying) if (MainIDE.ToolStatus=itDebugger) and (FDebugger<>nil) and (not Destroying)
@ -3043,6 +3054,7 @@ begin
end; end;
Include(FManagerStates,dmsRunning); Include(FManagerStates,dmsRunning);
FStepping:=False; FStepping:=False;
FAsmStepping := False;
try try
FDebugger.Run; FDebugger.Run;
finally finally
@ -3305,6 +3317,7 @@ begin
else UnitFilename:=BuildBoss.GetTestUnitFilename(ActiveUnitInfo); else UnitFilename:=BuildBoss.GetTestUnitFilename(ActiveUnitInfo);
FStepping:=True; FStepping:=True;
FAsmStepping := False;
FDebugger.RunTo(ExtractFilename(UnitFilename), FDebugger.RunTo(ExtractFilename(UnitFilename),
TSourceEditor(ActiveSrcEdit).EditorComponent.CaretY); TSourceEditor(ActiveSrcEdit).EditorComponent.CaretY);
@ -3370,6 +3383,7 @@ begin
end; end;
Include(FManagerStates,dmsRunning); Include(FManagerStates,dmsRunning);
FStepping:=False; FStepping:=False;
FAsmStepping := False;
try try
FDebugger.Attach(FAttachToID); FDebugger.Attach(FAttachToID);
finally finally