Changeset 35 for trunk/Target

Timestamp:

Feb 19, 2012, 12:03:21 AM (13 years ago)

Author:

chronos

Message:

• Added: Function to show execution point in code if program is paused.
• Added: Some partial stepping implementation.

Location:

trunk/Target

Files:

• UTarget.pas (modified) (8 diffs)
• UTargetC.pas (modified) (1 diff)
• UTargetDelphi.pas (modified) (1 diff)
• UTargetInterpretter.pas (modified) (8 diffs)
• UTargetPHP.pas (modified) (1 diff)

trunk/Target/UTarget.pas

@@ -49 +49 @@
     procedure AddLine(Text: string);
     function LongFileName(FileName: string): string;
+    function GetExecutionPosition: Integer; virtual;
   public
     Name: string;
@@ -58 +59 @@
     ProjectFileName: string;
     Capabilities: TTargetCapabilities;
-    BreakPointers: TListInteger;
+    BreakPoints: TListInteger;
     DebugSteps: TDebugStepList;
     constructor Create; virtual;
@@ -71 +72 @@
     procedure StepInto; virtual;
     procedure StepOut; virtual;
-    procedure RunToCursor; virtual;
+    procedure RunToCursor(Pos: Integer); virtual;
     procedure LoadFromRegistry(Root: HKEY; Key: string); virtual;
     procedure SaveToRegistry(Root: HKEY; Key: string); virtual;
@@ -79 +80 @@
     property TargetCode: string read GetTargetCode;
     property Compiled: Boolean read FCompiled write FCompiled;
+    property ExecutionPosition: Integer read GetExecutionPosition;
   end;
 
@@ -184 +186 @@
 begin
   Result := FTargetCode;
+end;
+
+function TTarget.GetExecutionPosition: Integer;
+begin
+
 end;
 
@@ -211 +218 @@
   inherited;
   Optimization := coNormal;
-  BreakPointers := TListInteger.Create;
+  BreakPoints := TListInteger.Create;
   DebugSteps := TDebugStepList.Create;
 end;
@@ -218 +225 @@
 begin
   DebugSteps.Free;;
-  BreakPointers.Free;
+  BreakPoints.Free;
   inherited Destroy;
 end;
@@ -303 +310 @@
 end;
 
-procedure TTarget.RunToCursor;
+procedure TTarget.RunToCursor(Pos: Integer);
 begin
 

trunk/Target/UTargetC.pas

@@ -57 +57 @@
 
 begin
+  inherited;
   Indent := 0;
   FTargetCode := '';

trunk/Target/UTargetDelphi.pas

@@ -52 +52 @@
 
 begin
+  inherited;
   Indent := 0;
   FTargetCode := '';

trunk/Target/UTargetInterpretter.pas

@@ -45 +45 @@
     procedure CommandLoopStart;
     procedure CommandLoopEnd;
-    procedure SingleStep;
     procedure Reset;
+    procedure PrepareBreakPoints;
   protected
     function GetTargetCode: string; override;
+    function GetExecutionPosition: Integer; override;
   public
     FProgram: array of TBrainFuckCommand;
+    FProgramBreakpoints: array of Boolean;
     SourceJump: array of Integer;
     SourcePosition: Integer;
@@ -64 +66 @@
     procedure Pause; override;
     procedure Stop; override;
+    procedure StepInto; override;
+    procedure StepOver; override;
+    procedure StepOut; override;
+    procedure RunToCursor(Pos: Integer); override;
     constructor Create; override;
     destructor Destroy; override;
@@ -92 +98 @@
 procedure TTargetInterpretterThread.Execute;
 begin
+  with Parent do
   repeat
-    while (Parent.SourcePosition < Length(Parent.FProgram)) and (Parent.State <> rsStopped) do begin
-      Parent.SingleStep;
-      while Parent.State = rsPaused do begin
-        Sleep(1);
-      end;
+    while (SourcePosition < Length(FProgram)) and (State <> rsStopped) do begin
+      if State = rsRunning then begin
+        if FProgramBreakpoints[SourcePosition] then begin
+          FProgramBreakpoints[SourcePosition] := False;
+          SetState(rsPaused);
+        end else begin
+          FCommandTable[FProgram[SourcePosition]];
+          Inc(SourcePosition);
+          Inc(FStepCount);
+        end;
+      end else
+      if State = rsPaused then Sleep(1);
     end;
-    Parent.SetState(rsStopped);
-  until Terminated or (Parent.State = rsStopped);
+    SetState(rsStopped);
+  until Terminated or (State = rsStopped);
 end;
 
@@ -127 +141 @@
   Pos: Integer;
 begin
+  inherited;
   DebugSteps.Clear;
   SetLength(FProgram, Length(FSourceCode));
@@ -282 +297 @@
 end;
 
+procedure TTargetInterpretter.PrepareBreakPoints;
+var
+  I: Integer;
+begin
+  SetLength(FProgramBreakpoints, Length(FProgram));
+  for I := 0 to High(FProgramBreakpoints) do
+    FProgramBreakpoints[I] := False;
+  for I := 0 to BreakPoints.Count - 1 do
+    FProgramBreakpoints[BreakPoints[I]] := True;
+end;
+
 function TTargetInterpretter.GetTargetCode: string;
 var
@@ -291 +317 @@
 end;
 
-procedure TTargetInterpretter.SingleStep;
-begin
-  FCommandTable[FProgram[SourcePosition]];
-  Inc(SourcePosition);
-  Inc(FStepCount);
+function TTargetInterpretter.GetExecutionPosition: Integer;
+begin
+  Result := SourcePosition;
 end;
 
@@ -302 +326 @@
   SetState(rsRunning);
   Reset;
+  PrepareBreakPoints;
   SetThread(False);
   SetThread(True);
@@ -314 +339 @@
 begin
   SetState(rsStopped);
+end;
+
+procedure TTargetInterpretter.StepInto;
+var
+  Step: TDebugStep;
+begin
+  Step := DebugSteps.SearchByTargetPos(SourcePosition);
+  FProgramBreakpoints[Step.TargetPosition + 1] := True;
+end;
+
+procedure TTargetInterpretter.StepOver;
+var
+  Step: TDebugStep;
+begin
+end;
+
+procedure TTargetInterpretter.StepOut;
+begin
+  inherited StepOut;
+end;
+
+procedure TTargetInterpretter.RunToCursor(Pos: Integer);
+begin
+  FProgramBreakpoints[Pos] := True;
 end;
 

trunk/Target/UTargetPHP.pas

@@ -55 +55 @@
 
 begin
+  inherited;
   Indent := 0;
   FTargetCode := '';