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

MWE: * Reworked breakpoint handling

Browse Source 
git-svn-id: trunk@4203 -
This commit is contained in:
marc 2003-05-28 00:58:50 +00:00
parent 4e73760765
commit 6b796de096
3 changed files with 290 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
debugger/debugger.pp
View File

@ -163,12 +163,7 @@ type
FActions: TDBGBreakPointActions;
FDisableGroupList: TList;
FEnableGroupList: TList;
function GetDebugger: TDebugger;
procedure SetActions(const AValue: TDBGBreakPointActions);
procedure SetEnabled(const AValue: Boolean);
procedure SetExpression(const AValue: String);
procedure SetGroup(const AValue: TDBGBreakPointGroup);
procedure SetInitialEnabled(const AValue: Boolean);
function GetDebugger: TDebugger;
protected
procedure AssignTo(Dest: TPersistent); override;
procedure DisableGroups;
@ -189,6 +184,21 @@ type
procedure CopyAllGroupLists(SrcBreakPoint: TDBGBreakPoint;
DestGroups: TDBGBreakPointGroups);
procedure ClearAllGroupLists;
// virtual properties
function GetActions: TDBGBreakPointActions; virtual;
function GetEnabled: Boolean; virtual;
function GetExpression: String; virtual;
function GetGroup: TDBGBreakPointGroup; virtual;
function GetHitCount: Integer; virtual;
function GetInitialEnabled: Boolean; virtual;
function GetLine: Integer; virtual;
function GetSource: String; virtual;
function GetValid: TValidState; virtual;
procedure SetActions(const AValue: TDBGBreakPointActions); virtual;
procedure SetEnabled(const AValue: Boolean); virtual;
procedure SetExpression(const AValue: String); virtual;
procedure SetGroup(const AValue: TDBGBreakPointGroup); virtual;
procedure SetInitialEnabled(const AValue: Boolean); virtual;
public
constructor Create(ACollection: TCollection); override;
destructor Destroy; override;
@ -202,15 +212,15 @@ type
procedure SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
const OnSaveFilename: TOnSaveFilenameToConfig); virtual;
public
property Actions: TDBGBreakPointActions read FActions write SetActions;
property Enabled: Boolean read FEnabled write SetEnabled;
property Expression: String read FExpression write SetExpression;
property Group: TDBGBreakPointGroup read FGroup write SetGroup;
property HitCount: Integer read FHitCount;
property InitialEnabled: Boolean read FInitialEnabled write SetInitialEnabled;
property Line: Integer read FLine;
property Source: String read FSource;
property Valid: TValidState read FValid;
property Actions: TDBGBreakPointActions read GetActions write SetActions;
property Enabled: Boolean read GetEnabled write SetEnabled;
property Expression: String read GetExpression write SetExpression;
property Group: TDBGBreakPointGroup read GetGroup write SetGroup;
property HitCount: Integer read GetHitCount;
property InitialEnabled: Boolean read GetInitialEnabled write SetInitialEnabled;
property Line: Integer read GetLine;
property Source: String read GetSource;
property Valid: TValidState read GetValid;
property Loading: Boolean read FLoading;
end;
TDBGBreakPointClass = class of TDBGBreakPoint;
@ -1047,11 +1057,56 @@ begin
TDBGBreakPointGroup(FDisableGroupList[n]).Enabled := True;
end;
function TDBGBreakPoint.GetActions: TDBGBreakPointActions;
begin
Result := FActions;
end;
function TDBGBreakPoint.GetDebugger: TDebugger;
begin
Result := TDBGBreakPoints(Collection).FDebugger;
end;
function TDBGBreakPoint.GetEnabled: Boolean;
begin
Result := FEnabled;
end;
function TDBGBreakPoint.GetExpression: String;
begin
Result := FExpression;
end;
function TDBGBreakPoint.GetGroup: TDBGBreakPointGroup;
begin
Result := FGroup;
end;
function TDBGBreakPoint.GetHitCount: Integer;
begin
Result := FHitCount;
end;
function TDBGBreakPoint.GetInitialEnabled: Boolean;
begin
Result := FInitialEnabled;
end;
function TDBGBreakPoint.GetLine: Integer;
begin
Result := FLine;
end;
function TDBGBreakPoint.GetSource: String;
begin
Result := FSource;
end;
function TDBGBreakPoint.GetValid: TValidState;
begin
Result := FValid;
end;
procedure TDBGBreakPoint.RemoveDisableGroup(const AGroup: TDBGBreakPointGroup);
begin
RemoveFromGroupList(AGroup,FDisableGroupList);
@ -2169,6 +2224,9 @@ end;
end.
{ =============================================================================
$Log$
Revision 1.30 2003/05/28 00:58:50 marc
MWE: * Reworked breakpoint handling
Revision 1.29 2003/05/27 20:58:12 mattias
implemented enable and deleting breakpoint in breakpoint dlg

4
ide/basedebugmanager.pas
View File

@ -44,7 +44,9 @@ uses
type
TBaseDebugManager = class(TComponent)
private
protected
FBreakPoints: TDBGBreakPoints;
function GetState: TDBGState; virtual; abstract;
function GetCommands: TDBGCommands; virtual; abstract;
public
@ -73,7 +75,7 @@ type
property Commands: TDBGCommands read GetCommands; // All current available commands of the debugger
property State: TDBGState read GetState; // The current state of the debugger
property BreakPoints: TDBGBreakPoints read FBreakpoints;
end;
var

245
ide/debugmanager.pas
View File

@ -75,10 +75,11 @@ type
private
FDebugger: TDebugger;
FDebuggerUpdateLock: integer;
FBreakpointsNotification: TDBGBreakPointsNotification; // Notification for our BreakPoints
// When no debugger is created the IDE stores all debugger settings in its
// own variables. When the debugger object is created these items point
// to the corresponding items in the FDebugger object.
FBreakPoints: TDBGBreakPoints;
FBreakPointGroups: TDBGBreakPointGroups;
FWatches: TDBGWatches;
FDialogs: array[TDebugDialogType] of TDebuggerDlg;
@ -87,6 +88,11 @@ type
// Here are all choises stored
FUserSourceFiles: TStringList;
// Breakpoint routines
procedure BreakpointAdded(const ASender: TDBGBreakPoints; const ABreakpoint: TDBGBreakPoint);
procedure BreakpointRemoved(const ASender: TDBGBreakPoints; const ABreakpoint: TDBGBreakPoint);
// Dialog routines
procedure DebugDialogDestroy(Sender: TObject);
procedure ViewDebugDialog(const ADialogType: TDebugDialogType);
procedure DestroyDebugDialog(const ADialogType: TDebugDialogType);
@ -135,6 +141,155 @@ const
DebugDlgIDEWindow: array[TDebugDialogType] of TNonModalIDEWindow = (
nmiwDbgOutput, nmiwBreakPoints, nmiwWatches, nmiwLocals, nmiwCallStack
);
type
TManagedBreakPoint = class(TDBGBreakPoint)
private
FMaster: TDBGBreakPoint;
protected
procedure AssignTo(Dest: TPersistent); override;
function GetHitCount: Integer; override;
function GetValid: TValidState; override;
procedure SetActions(const AValue: TDBGBreakPointActions); override;
procedure SetEnabled(const AValue: Boolean); override;
procedure SetExpression(const AValue: String); override;
public
constructor Create(ACollection: TCollection); override;
procedure ResetMaster;
end;
TManagedBreakPoints = class(TDBGBreakPoints)
private
FMaster: TDBGBreakPoints;
FMasterNotification: TDBGBreakPointsNotification;
procedure SetMaster(const AValue: TDBGBreakPoints);
procedure MasterUpdate(const ASender: TDBGBreakPoints; const ABreakpoint: TDBGBreakPoint);
public
constructor Create;
destructor Destroy; override;
property Master: TDBGBreakPoints read FMaster write SetMaster;
end;
{ TManagedBreakPoints }
constructor TManagedBreakPoints.Create;
begin
FMaster := nil;
FMasterNotification := TDBGBreakPointsNotification.Create;
FMasterNotification.OnUpdate := @MasterUpdate;
inherited Create(nil, TManagedBreakPoint);
end;
destructor TManagedBreakPoints.Destroy;
begin
FreeAndNil(FMasterNotification);
inherited Destroy;
end;
procedure TManagedBreakPoints.MasterUpdate(const ASender: TDBGBreakPoints; const ABreakpoint: TDBGBreakPoint);
function FindItem: TManagedBreakPoint;
var
n: Integer;
begin
for n := 0 to Count - 1 do
begin
Result := TManagedBreakPoint(Items[n]);
if Result.FMaster = ABreakPoint
then Exit;
end;
Result := nil;
end;
var
bp: TManagedBreakPoint;
begin
if ABreakPoint = nil
then begin
Update(nil);
end
else begin
bp := FindItem;
if bp <> nil
then Update(bp);
end;
end;
procedure TManagedBreakPoints.SetMaster(const AValue: TDBGBreakPoints);
var
n: Integer;
begin
if FMaster = AValue then Exit;
if FMaster <> nil
then FMaster.RemoveNotification(FMasterNotification);
FMaster := AValue;
if FMaster = nil
then begin
for n := 0 to Count - 1 do
TManagedBreakPoint(Items[n]).ResetMaster;
end
else begin
FMaster.AddNotification(FMasterNotification);
FMaster.Assign(Self);
end;
end;
{ TManagedBreakPoint }
procedure TManagedBreakPoint.AssignTo(Dest: TPersistent);
begin
inherited AssignTo(Dest);
if TManagedBreakPoints(GetOwner).FMaster <> nil
then FMaster := TDBGBreakpoint(Dest);
end;
constructor TManagedBreakPoint.Create (ACollection: TCollection );
begin
inherited Create(ACollection);
FMaster := nil;
end;
function TManagedBreakPoint.GetHitCount: Integer;
begin
if FMaster = nil
then Result := 0
else Result := FMaster.HitCount;
end;
function TManagedBreakPoint.GetValid: TValidState;
begin
if FMaster = nil
then Result := vsUnknown
else Result := FMaster.Valid;
end;
procedure TManagedBreakPoint.ResetMaster;
begin
FMaster := nil;
Changed(False);
end;
procedure TManagedBreakPoint.SetActions(const AValue: TDBGBreakPointActions);
begin
inherited SetActions(AValue);
if FMaster <> nil then FMaster.Actions := AValue;
end;
procedure TManagedBreakPoint.SetEnabled(const AValue: Boolean);
begin
inherited SetEnabled(AValue);
if FMaster <> nil then FMaster.Enabled := AValue;
end;
procedure TManagedBreakPoint.SetExpression(const AValue: String);
begin
inherited SetExpression(AValue);
if FMaster <> nil then FMaster.Expression := AValue;
end;
//-----------------------------------------------------------------------------
// Menu events
@ -440,7 +595,11 @@ begin
FDialogs[DialogType] := nil;
FDebugger := nil;
FBreakPoints := TDBGBreakPoints.Create(nil, TDBGBreakPoint);
FBreakPoints := TManagedBreakPoints.Create;
FBreakpointsNotification := TDBGBreakPointsNotification.Create;
FBreakpointsNotification.OnAdd := @BreakpointAdded;
FBreakpointsNotification.OnRemove := @BreakpointRemoved;
FBreakPointGroups := TDBGBreakPointGroups.Create;
FWatches := TDBGWatches.Create(nil, TDBGWatch);
@ -456,10 +615,12 @@ begin
for DialogType := Low(TDebugDialogType) to High(TDebugDialogType) do
DestroyDebugDialog(DialogType);
TManagedBreakpoints(FBreakpoints).Master := nil;
if FDebugger <> nil
then begin
if FDebugger.BreakPoints = FBreakPoints
then FBreakPoints := nil;
//@@ if FDebugger.BreakPoints = FBreakPoints
//@@ then FBreakPoints := nil;
if FDebugger.BreakPointGroups = FBreakPointGroups
then FBreakPointGroups := nil;
if FDebugger.Watches = FWatches
@ -468,11 +629,13 @@ begin
FreeThenNil(FDebugger);
end
else begin
FreeThenNil(FBreakPoints);
//@@ FreeThenNil(FBreakPoints);
FreeThenNil(FBreakPointGroups);
FreeThenNil(FWatches);
end;
FreeAndNil(FBreakPoints);
FreeAndNil(FBreakpointsNotification);
FreeAndNil(FUserSourceFiles);
inherited Destroy;
@ -602,6 +765,18 @@ begin
end;
end;
procedure TDebugManager.BreakpointAdded(const ASender: TDBGBreakPoints; const ABreakpoint: TDBGBreakPoint );
begin
ABreakpoint.InitialEnabled := True;
ABreakpoint.Enabled := True;
Project1.Modified := True;
end;
procedure TDebugManager.BreakpointRemoved (const ASender: TDBGBreakPoints; const ABreakpoint: TDBGBreakPoint );
begin
Project1.Modified := True;
end;
procedure TDebugManager.EndUpdateDialogs;
var
DialogType: TDebugDialogType;
@ -619,8 +794,8 @@ end;
function TDebugManager.DoInitDebugger: TModalResult;
var
OldBreakpoints: TDBGBreakpoints;
OldBreakPointGroups: TDBGBreakPointGroups;
//@@ OldBreakpoints: TDBGBreakpoints;
//@@ OldBreakPointGroups: TDBGBreakPointGroups;
OldWatches: TDBGWatches;
procedure ResetDialogs;
@ -637,36 +812,36 @@ var
procedure SaveDebuggerItems;
begin
// copy the break point list without the group references
OldBreakpoints := TDBGBreakpoints.Create(nil, TDBGBreakpoint);
OldBreakpoints.Assign(FBreakPoints);
//@@ OldBreakpoints := TDBGBreakpoints.Create(nil, TDBGBreakpoint);
//@@ OldBreakpoints.Assign(FBreakPoints);
// copy the groups and all group references
OldBreakPointGroups := TDBGBreakPointGroups.Create;
OldBreakPointGroups.Regroup(FBreakPointGroups,FBreakPoints,OldBreakPoints);
//@@ OldBreakPointGroups := TDBGBreakPointGroups.Create;
//@@ OldBreakPointGroups.Regroup(FBreakPointGroups,FBreakPoints,OldBreakPoints);
// copy the watches
OldWatches := TDBGWatches.Create(nil, TDBGWatch);
OldWatches.Assign(FWatches);
FBreakPointGroups := nil;
FBreakPoints := nil;
//@@ FBreakPointGroups := nil;
//@@ FBreakPoints := nil;
FWatches := nil;
end;
procedure RestoreDebuggerItems;
begin
// restore the break point list without the group references
if (OldBreakpoints<>nil) then
FBreakPoints.Assign(OldBreakpoints);
//@@ if (OldBreakpoints<>nil) then
//@@ FBreakPoints.Assign(OldBreakpoints);
// restore the groups and all group references
if (OldBreakPointGroups<>nil) then begin
if (OldBreakpoints<>nil) then
FBreakPointGroups.Regroup(OldBreakPointGroups,OldBreakpoints,
FBreakPoints)
else
FBreakPointGroups.Assign(OldBreakPointGroups);
end;
//@@ if (OldBreakPointGroups<>nil) then begin
//@@ if (OldBreakpoints<>nil) then
//@@ FBreakPointGroups.Regroup(OldBreakPointGroups,OldBreakpoints,
//@@ FBreakPoints)
//@@ else
//@@ FBreakPointGroups.Assign(OldBreakPointGroups);
//@@ end;
// restore the watches
if OldWatches<>nil then
@ -676,6 +851,7 @@ var
procedure FreeDebugger;
begin
SaveDebuggerItems;
TManagedBreakPoints(FBreakPoints).Master := nil;
FDebugger.Free;
FDebugger := nil;
ResetDialogs;
@ -693,8 +869,8 @@ begin
SplitCmdLine(LaunchingCmdLine,LaunchingApplication,LaunchingParams);
if (not FileExists(LaunchingApplication)) then exit;
OldBreakpoints := nil;
OldBreakPointGroups := nil;
//@@ OldBreakpoints := nil;
//@@ OldBreakPointGroups := nil;
OldWatches := nil;
BeginUpdateDialogs;
@ -716,8 +892,11 @@ begin
then begin
SaveDebuggerItems;
FDebugger := TGDBMIDebugger.Create(EnvironmentOptions.DebuggerFilename);
FBreakPointGroups := FDebugger.BreakPointGroups;
FBreakPoints := FDebugger.BreakPoints;
//@@ FBreakPointGroups := FDebugger.BreakPointGroups;
//@@ FBreakPoints := FDebugger.BreakPoints;
TManagedBreakPoints(FBreakPoints).Master := FDebugger.BreakPoints; //!!
FWatches := FDebugger.Watches;
ResetDialogs;
end;
@ -730,8 +909,8 @@ begin
exit;
end;
finally
OldBreakpoints.Free;
OldBreakPointGroups.Free;
//@@ OldBreakpoints.Free;
//@@ OldBreakPointGroups.Free;
OldWatches.Free;
end;
FDebugger.OnState := @OnDebuggerChangeState;
@ -883,9 +1062,10 @@ begin
Result:=DoBeginChangeDebugger;
if Result<>mrOk then exit;
NewBreak := FBreakPoints.Add(AFilename, ALine);
NewBreak.InitialEnabled := True;
NewBreak.Enabled := True;
Project1.Modified:=true;
// Set by notification
// NewBreak.InitialEnabled := True;
// NewBreak.Enabled := True;
// Project1.Modified:=true;
Result:=DoEndChangeDebugger;
end;
@ -967,6 +1147,9 @@ end.
{ =============================================================================
$Log$
Revision 1.31 2003/05/28 00:58:50 marc
MWE: * Reworked breakpoint handling
Revision 1.30 2003/05/27 20:58:12 mattias
implemented enable and deleting breakpoint in breakpoint dlg