Changeset 36 for trunk/Target/UTargetInterpretter.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/UTargetInterpretter.pas (modified) (10 diffs)

trunk/Target/UTargetInterpretter.pas

@@ -34 +34 @@
     function GetMemorySize: Integer;
     procedure SetMemorySize(AValue: Integer);
-    procedure SetState(AValue: TRunState);
     procedure SetThread(State: Boolean);
     procedure PrepareJumpTable;
@@ -48 +47 @@
     procedure PrepareBreakPoints;
   protected
+    procedure SetState(AValue: TRunState); override;
     function GetTargetCode: string; override;
     function GetExecutionPosition: Integer; override;
@@ -93 +93 @@
   SJumpTableColision = 'Jump table colision';
   SMemoryCellOutOfRange = 'Memory cell %s value out of range';
+  SProgramNotRunning = 'Program not running';
 
 { TTargetInterpretterThread }
@@ -104 +105 @@
         if FProgramBreakpoints[SourcePosition] then begin
           FProgramBreakpoints[SourcePosition] := False;
-          SetState(rsPaused);
+          State := rsPaused;
         end else begin
           FCommandTable[FProgram[SourcePosition]];
@@ -113 +114 @@
       if State = rsPaused then Sleep(1);
     end;
-    SetState(rsStopped);
+    State := rsStopped;
   until Terminated or (State = rsStopped);
 end;
@@ -295 +296 @@
     Memory[I] := 0;
   FStepCount := 0;
+  PrepareBreakPoints;
 end;
 
@@ -305 +307 @@
     FProgramBreakpoints[I] := False;
   for I := 0 to BreakPoints.Count - 1 do
-    FProgramBreakpoints[BreakPoints[I]] := True;
+    FProgramBreakpoints[TBreakPoint(BreakPoints[I]).TargetAddress] := True;
 end;
 
@@ -324 +326 @@
 procedure TTargetInterpretter.Run;
 begin
-  SetState(rsRunning);
-  Reset;
-  PrepareBreakPoints;
+  if FState = rsStopped then begin
+    Reset;
+    SetThread(True);
+    State := rsRunning;
+  end else State := rsRunning;
+end;
+
+procedure TTargetInterpretter.Pause;
+begin
+  if State = rsRunning then State := rsPaused;
+end;
+
+procedure TTargetInterpretter.Stop;
+begin
+  State := rsStopped;
   SetThread(False);
-  SetThread(True);
-end;
-
-procedure TTargetInterpretter.Pause;
-begin
-  if State = rsRunning then SetState(rsPaused);
-end;
-
-procedure TTargetInterpretter.Stop;
-begin
-  SetState(rsStopped);
 end;
 
@@ -345 +348 @@
   Step: TDebugStep;
 begin
-  Step := DebugSteps.SearchByTargetPos(SourcePosition);
-  FProgramBreakpoints[Step.TargetPosition + 1] := True;
+  if State = rsPaused then begin
+    Step := DebugSteps.SearchByTargetPos(SourcePosition);
+    BreakPoints.SetSystem(Step.TargetPosition + 1);
+    Run;
+  end else raise Exception.Create(SProgramNotRunning);
 end;
 
@@ -352 +358 @@
 var
   Step: TDebugStep;
-begin
+  StepIndex: Integer;
+  Nesting: Integer;
+begin
+  if State = rsPaused then begin
+    Step := DebugSteps.SearchByTargetPos(SourcePosition);
+    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);
+    end else BreakPoints.SetSystem(Step.TargetPosition + 1);
+    Run;
+  end else raise Exception.Create(SProgramNotRunning);
 end;
 
 procedure TTargetInterpretter.StepOut;
-begin
-  inherited StepOut;
+var
+  Step: TDebugStep;
+  StepIndex: 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);
+    if StepIndex < DebugSteps.Count then begin
+      Breakpoints.SetSystem(TDebugStep(DebugSteps[StepIndex]).TargetPosition);
+      Run;
+    end;
+  end else raise Exception.Create(SProgramNotRunning);
 end;
 
 procedure TTargetInterpretter.RunToCursor(Pos: Integer);
 begin
-  FProgramBreakpoints[Pos] := True;
+  Breakpoints.SetSystem(Pos);
+  Run;
 end;