paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 17:21:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Do not always auto adjust the stackframe when stopping. (temp fix) Issue #0032978

Browse Source 
git-svn-id: trunk@57089 -
This commit is contained in:
martin 2018-01-14 15:20:49 +00:00
parent a67f1cb4a8
commit dee589f02f
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/lazdebuggergdbmi/gdbmidebugger.pp
View File

@ -396,8 +396,8 @@ type
function CheckHasType(TypeName: String; TypeFlag: TGDBMITargetFlag): TGDBMIExecResult;
function PointerTypeCast: string;
function FrameToLocation(const AFrame: String = ''): TDBGLocationRec;
procedure ProcessFrame(const ALocation: TDBGLocationRec); overload;
procedure ProcessFrame(const AFrame: String = ''); overload;
procedure ProcessFrame(ALocation: TDBGLocationRec; ASeachStackForSource: Boolean = True); overload;
procedure ProcessFrame(const AFrame: String = ''; ASeachStackForSource: Boolean = True); overload;
procedure DoDbgEvent(const ACategory: TDBGEventCategory; const AEventType: TDBGEventType; const AText: String);
property LastExecResult: TGDBMIExecResult read FLastExecResult;
property DefaultTimeOut: Integer read FDefaultTimeOut write FDefaultTimeOut;
@ -6037,21 +6037,21 @@ begin
if Reason = 'function-finished'
then begin
SetDebuggerState(dsPause);
ProcessFrame(List.Values['frame']);
ProcessFrame(List.Values['frame'], False);
Exit;
end;
if Reason = 'end-stepping-range'
then begin
SetDebuggerState(dsPause);
ProcessFrame(List.Values['frame']);
ProcessFrame(List.Values['frame'], False);
Exit;
end;
if Reason = 'location-reached'
then begin
SetDebuggerState(dsPause);
ProcessFrame(List.Values['frame']);
ProcessFrame(List.Values['frame'], False);
Exit;
end;
@ -11164,18 +11164,23 @@ begin
Frame.Free;
end;
procedure TGDBMIDebuggerCommand.ProcessFrame(const ALocation: TDBGLocationRec);
procedure TGDBMIDebuggerCommand.ProcessFrame(ALocation: TDBGLocationRec;
ASeachStackForSource: Boolean);
begin
// TODO: process stack in gdbmi debugger // currently: signal IDE
if (not ASeachStackForSource) and (ALocation.SrcLine < 0) then
ALocation.SrcLine := -2;
FTheDebugger.DoCurrent(ALocation); // TODO: only selected callers
FTheDebugger.FCurrentLocation := ALocation;
end;
procedure TGDBMIDebuggerCommand.ProcessFrame(const AFrame: String);
procedure TGDBMIDebuggerCommand.ProcessFrame(const AFrame: String;
ASeachStackForSource: Boolean);
var
Location: TDBGLocationRec;
begin
Location := FrameToLocation(AFrame);
ProcessFrame(Location);
ProcessFrame(Location, ASeachStackForSource);
end;
procedure TGDBMIDebuggerCommand.DoDbgEvent(const ACategory: TDBGEventCategory;

2
ide/debugmanager.pas
View File

@ -1305,7 +1305,7 @@ begin
SrcLine := ALocation.SrcLine;
CurrentSourceUnitInfo := nil;
if SrcLine < 1
if (SrcLine < 1) and (SrcLine <> -2) // TODO: this should move to the debugger
then begin
// jump to the deepest stack frame with debugging info
// TODO: Only below the frame supplied by debugger