Changeset 39 for trunk/Target

Timestamp:

Feb 19, 2012, 12:41:25 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Step into, step over, step out, run to cursor debbuging actions.
• Fixed: Updating interface from interpretter thread using synchronization.

Location:

trunk/Target

Files:

• UTarget.pas (modified) (2 diffs)
• UTargetInterpretter.pas (modified) (9 diffs)

trunk/Target/UTarget.pas

@@ -44 +44 @@
     procedure AddItem(TargetAddress: Integer);
     procedure SetSystem(TargetAddress: Integer);
+    procedure AddSystem(TargetAddress: Integer);
     procedure ClearSystem;
     function SearchByTargetPos(Pos: Integer): TBreakPoint;
@@ -126 +127 @@
 
 procedure TBreakPointList.SetSystem(TargetAddress: Integer);
+begin
+  ClearSystem;
+  AddSystem(TargetAddress);
+end;
+
+procedure TBreakPointList.AddSystem(TargetAddress: Integer);
 var
   NewItem: TBreakPoint;
 begin
-  ClearSystem;
   NewItem := TBreakPoint.Create;
   NewItem.TargetAddress := TargetAddress;

trunk/Target/UTargetInterpretter.pas

@@ -14 +14 @@
 
   TTargetInterpretterThread = class(TThread)
+  private
+    FNewState: TRunState;
+    procedure DoSetState;
+    procedure SetStateSafe(State: TRunState);
+  public
     Parent: TTargetInterpretter;
     procedure Execute; override;
@@ -98 +103 @@
 
 procedure TTargetInterpretterThread.Execute;
+var
+  BreakPoint: TBreakPoint;
 begin
   with Parent do
@@ -104 +111 @@
       if State = rsRunning then begin
         if FProgramBreakpoints[SourcePosition] then begin
-          FProgramBreakpoints[SourcePosition] := False;
-          State := rsPaused;
+          BreakPoint := BreakPoints.SearchByTargetPos(SourcePosition);
+          if BreakPoint.System then BreakPoints.Delete(BreakPoints.IndexOf(BreakPoint));
+          SetStateSafe(rsPaused);
         end else begin
           FCommandTable[FProgram[SourcePosition]];
@@ -114 +122 @@
       if State = rsPaused then Sleep(1);
     end;
-    State := rsStopped;
+    if State <> rsStopped then SetStateSafe(rsStopped);
   until Terminated or (State = rsStopped);
+end;
+
+procedure TTargetInterpretterThread.DoSetState;
+begin
+  Parent.State := FNewState;
+end;
+
+procedure TTargetInterpretterThread.SetStateSafe(State: TRunState);
+begin
+  FNewState := State;
+  Synchronize(DoSetState);
 end;
 
@@ -307 +326 @@
     FProgramBreakpoints[I] := False;
   for I := 0 to BreakPoints.Count - 1 do
-    FProgramBreakpoints[TBreakPoint(BreakPoints[I]).TargetAddress] := True;
+    if TBreakPoint(BreakPoints[I]).TargetAddress < Length(FProgramBreakpoints) then
+      FProgramBreakpoints[TBreakPoint(BreakPoints[I]).TargetAddress] := True;
 end;
 
@@ -326 +346 @@
 procedure TTargetInterpretter.Run;
 begin
+  PrepareBreakPoints;
   if FState = rsStopped then begin
     Reset;
@@ -347 +368 @@
 var
   Step: TDebugStep;
+  StepIndex: Integer;
+  Nesting: Integer;
 begin
   if State = rsPaused then begin
     Step := DebugSteps.SearchByTargetPos(SourcePosition);
-    BreakPoints.SetSystem(Step.TargetPosition + 1);
+    if Step.Operation = soStepOut then begin
+      BreakPoints.SetSystem(Step.TargetPosition + 1);
+      Step := DebugSteps.SearchByTargetPos(SourceJump[Step.TargetPosition]);
+      BreakPoints.AddSystem(Step.TargetPosition);
+    end else
+    if Step.Operation = soStepIn then begin
+      BreakPoints.SetSystem(Step.TargetPosition + 1);
+      Step := DebugSteps.SearchByTargetPos(SourceJump[Step.TargetPosition]);
+      BreakPoints.AddSystem(Step.TargetPosition);
+    end else BreakPoints.SetSystem(Step.TargetPosition + 1);
     Run;
   end else raise Exception.Create(SProgramNotRunning);
@@ -363 +395 @@
   if State = rsPaused then begin
     Step := DebugSteps.SearchByTargetPos(SourcePosition);
+    if Step.Operation = soStepOut then begin
+      BreakPoints.SetSystem(Step.TargetPosition + 1);
+      Step := DebugSteps.SearchByTargetPos(SourceJump[Step.TargetPosition]);
+      BreakPoints.AddSystem(Step.TargetPosition);
+    end else
     if Step.Operation = soStepIn then begin
-      StepIndex := DebugSteps.IndexOf(Step);
-      Inc(StepIndex);
-      Nesting := 1;
-      while (StepIndex < DebugSteps.Count) and (Nesting > 0) do begin
-        if TDebugStep(DebugSteps[StepIndex]).Operation <> soStepOut then Dec(Nesting);
-        if TDebugStep(DebugSteps[StepIndex]).Operation <> soStepIn then Inc(Nesting);
-        Inc(StepIndex);
-      end;
-      BreakPoints.SetSystem(TDebugStep(DebugSteps[StepIndex]).TargetPosition);
+      Step := DebugSteps.SearchByTargetPos(SourceJump[Step.TargetPosition]);
+      BreakPoints.SetSystem(Step.TargetPosition + 1);
     end else BreakPoints.SetSystem(Step.TargetPosition + 1);
     Run;
@@ -382 +412 @@
   Step: TDebugStep;
   StepIndex: Integer;
+  Nesting: Integer;
 begin
   if State = rsPaused then begin
     Step := DebugSteps.SearchByTargetPos(SourcePosition);
     StepIndex := DebugSteps.IndexOf(Step);
-    while (StepIndex < DebugSteps.Count) and (TDebugStep(DebugSteps[StepIndex]).Operation <> soStepOut) do Inc(StepIndex);
+    Nesting := 1;
+    while (StepIndex < DebugSteps.Count) and (Nesting > 0) do begin
+      if TDebugStep(DebugSteps[StepIndex]).Operation = soStepIn then Inc(Nesting);
+      if TDebugStep(DebugSteps[StepIndex]).Operation = soStepOut then Dec(Nesting);
+      Inc(StepIndex);
+    end;
     if StepIndex < DebugSteps.Count then begin
       Breakpoints.SetSystem(TDebugStep(DebugSteps[StepIndex]).TargetPosition);
-      Run;
     end;
+    Run;
   end else raise Exception.Create(SProgramNotRunning);
 end;