Changeset 36 for trunk/Target/UTarget.pas

Timestamp:

Feb 19, 2012, 9:44:58 AM (12 years ago)

Author:

chronos

Message:

• Modified: Redone brakepoint system for system stepping breakpoints. Now system breakpoint are managed using BreakPoints filed in TTarget.
• Added: Program can be started using Step in, Step over and Run to cursor actions.

File:

• trunk/Target/UTarget.pas (modified) (7 diffs)

trunk/Target/UTarget.pas

@@ -32 +32 @@
     function SearchByTargetPos(Pos: Integer): TDebugStep;
     procedure AddStep(SourcePos, TargetPos: Integer; Operation: TStepOperation);
+  end;
+
+  TBreakPoint = class
+    TargetAddress: Integer;
+    System: Boolean;
+  end;
+
+  { TBreakPointList }
+
+  TBreakPointList = class(TListObject)
+    procedure AddItem(TargetAddress: Integer);
+    procedure SetSystem(TargetAddress: Integer);
+    procedure ClearSystem;
+    function SearchByTargetPos(Pos: Integer): TBreakPoint;
   end;
 
@@ -50 +64 @@
     function LongFileName(FileName: string): string;
     function GetExecutionPosition: Integer; virtual;
+    procedure SetState(AValue: TRunState); virtual;
   public
     Name: string;
@@ -59 +74 @@
     ProjectFileName: string;
     Capabilities: TTargetCapabilities;
-    BreakPoints: TListInteger;
+    BreakPoints: TBreakPointList;
     DebugSteps: TDebugStepList;
     constructor Create; virtual;
@@ -75 +90 @@
     procedure LoadFromRegistry(Root: HKEY; Key: string); virtual;
     procedure SaveToRegistry(Root: HKEY; Key: string); virtual;
-    property State: TRunState read FState;
+    property State: TRunState read FState write SetState;
     property OnChangeState: TNotifyEvent read FOnChangeState write FOnChangeState;
     property SourceCode: string write SetSourceCode;
@@ -98 +113 @@
 
 implementation
+
+{ TBreakPointList }
+
+procedure TBreakPointList.AddItem(TargetAddress: Integer);
+var
+  NewItem: TBreakPoint;
+begin
+  NewItem := TBreakPoint.Create;
+  NewItem.TargetAddress := TargetAddress;
+  Add(NewItem);
+end;
+
+procedure TBreakPointList.SetSystem(TargetAddress: Integer);
+var
+  NewItem: TBreakPoint;
+begin
+  ClearSystem;
+  NewItem := TBreakPoint.Create;
+  NewItem.TargetAddress := TargetAddress;
+  NewItem.System := True;
+  Add(NewItem);
+end;
+
+procedure TBreakPointList.ClearSystem;
+var
+  I: Integer;
+begin
+  for I := Count - 1 downto 0 do
+    if TBreakPoint(Items[I]).System then Delete(I);
+end;
+
+function TBreakPointList.SearchByTargetPos(Pos: Integer): TBreakPoint;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TBreakPoint(Items[I]).TargetAddress < Pos) do Inc(I);
+  if I < Count then Result := TBreakPoint(Items[I])
+    else Result := nil;
+end;
 
 { TDebugStepList }
@@ -191 +246 @@
 begin
 
+end;
+
+procedure TTarget.SetState(AValue: TRunState);
+begin
+  if FState = AValue then Exit;
+  FState := AValue;
 end;
 
@@ -218 +279 @@
   inherited;
   Optimization := coNormal;
-  BreakPoints := TListInteger.Create;
+  BreakPoints := TBreakPointList.Create;
   DebugSteps := TDebugStepList.Create;
 end;