Changeset 114 for trunk/UTarget.pas

Timestamp:

May 18, 2019, 12:13:44 AM (5 years ago)

Author:

chronos

Message:

• Modified: Improved stepping through source and target code. Each step has source, program and target index.

File:

• trunk/UTarget.pas (modified) (6 diffs)

trunk/UTarget.pas

@@ -22 +22 @@
   TDebugStep = class
     SourcePosition: Integer;
+    ProgramPosition: Integer;
     TargetPosition: Integer;
     Operation: TStepOperation;
@@ -30 +31 @@
   TDebugStepList = class(TFPGObjectList<TDebugStep>)
     function SearchBySourcePos(Pos: Integer): TDebugStep;
+    function SearchByProgramPos(Pos: Integer): TDebugStep;
     function SearchByTargetPos(Pos: Integer): TDebugStep;
+    function SearchIndexByProgramPos(Pos: Integer): Integer;
     procedure AddStep(SourcePos, TargetPos: Integer; Operation: TStepOperation);
-    procedure UpdateTargetPos(Old, New: Integer);
+    procedure UpdateTargetPos(OldProgramFrom, OldProgramTo, NewProgram, NewTarget: Integer);
   end;
 
@@ -233 +236 @@
 end;
 
+function TDebugStepList.SearchByProgramPos(Pos: Integer): TDebugStep;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TDebugStep(Items[I]).ProgramPosition < Pos) do Inc(I);
+  if I < Count then Result := TDebugStep(Items[I])
+    else Result := nil;
+end;
+
 function TDebugStepList.SearchByTargetPos(Pos: Integer
   ): TDebugStep;
@@ -244 +257 @@
 end;
 
+function TDebugStepList.SearchIndexByProgramPos(Pos: Integer): Integer;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TDebugStep(Items[I]).ProgramPosition < Pos) do Inc(I);
+  if I < Count then Result := I
+    else Result := -1;
+end;
+
 procedure TDebugStepList.AddStep(SourcePos, TargetPos: Integer;
   Operation: TStepOperation);
@@ -251 +274 @@
   NewItem := TDebugStep.Create;
   NewItem.SourcePosition := SourcePos;
+  NewItem.ProgramPosition := TargetPos;
   NewItem.TargetPosition := TargetPos;
   NewItem.Operation := Operation;
@@ -256 +280 @@
 end;
 
-procedure TDebugStepList.UpdateTargetPos(Old, New: Integer);
-var
-  I: Integer;
-begin
-  I := 0;
-  while (I < Count) do begin
-    if TDebugStep(Items[I]).TargetPosition = Old then
-      TDebugStep(Items[I]).TargetPosition := New;
-    Inc(I);
-  end;
+procedure TDebugStepList.UpdateTargetPos(OldProgramFrom, OldProgramTo, NewProgram, NewTarget: Integer);
+var
+  I: Integer;
+  First: Integer;
+  Last: Integer;
+begin
+  First := SearchIndexByProgramPos(OldProgramFrom);
+  Last := SearchIndexByProgramPos(OldProgramTo);
+  for I := Last downto First + 1 do Delete(I);
+  TDebugStep(Items[First]).ProgramPosition := NewProgram;
+  TDebugStep(Items[First]).TargetPosition := NewTarget;
 end;