Changeset 35 for trunk/Forms

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/Forms

Files:

• UMainForm.lfm (modified) (6 diffs)
• UMainForm.lrt (modified) (1 diff)
• UMainForm.pas (modified) (13 diffs)

trunk/Forms/UMainForm.lfm

@@ -590 +590 @@
         Action = AProgramRunToCursor
       end
+      object MenuItem31: TMenuItem
+        Action = AProgramShowExecutionPoint
+      end
     end
     object MenuItem24: TMenuItem
@@ -821 +824 @@
       Caption = 'Step into'
       ImageIndex = 15
+      OnExecute = AProgramStepIntoExecute
       ShortCut = 118
     end
@@ -827 +831 @@
       Caption = 'Step over'
       ImageIndex = 17
+      OnExecute = AProgramStepOverExecute
       ShortCut = 119
     end
@@ -833 +838 @@
       Caption = 'Run to cursor'
       ImageIndex = 14
+      OnExecute = AProgramRunToCursorExecute
       ShortCut = 115
     end
@@ -839 +845 @@
       Caption = 'Step out'
       ImageIndex = 16
+      OnExecute = AProgramStepOutExecute
       ShortCut = 8311
     end
@@ -876 +883 @@
       Caption = 'Show position in target'
       OnExecute = AShowTargetPositionExecute
+      ShortCut = 16393
     end
     object AShowSourcePosition: TAction
       Caption = 'Show position in source'
       OnExecute = AShowSourcePositionExecute
+      ShortCut = 16393
+    end
+    object AProgramShowExecutionPoint: TAction
+      Category = 'Program'
+      Caption = 'Show execution point'
+      OnExecute = AProgramShowExecutionPointExecute
     end
   end

trunk/Forms/UMainForm.lrt

@@ -36 +36 @@
 TMAINFORM.ASHOWTARGETPOSITION.CAPTION=Show position in target
 TMAINFORM.ASHOWSOURCEPOSITION.CAPTION=Show position in source
+TMAINFORM.APROGRAMSHOWEXECUTIONPOINT.CAPTION=Show execution point

trunk/Forms/UMainForm.pas

@@ -18 +18 @@
 
   TMainForm = class(TForm)
+    AProgramShowExecutionPoint: TAction;
     AShowSourcePosition: TAction;
     AShowTargetPosition: TAction;
@@ -72 +73 @@
     MenuItem29: TMenuItem;
     MenuItem30: TMenuItem;
+    MenuItem31: TMenuItem;
     MenuItem32: TMenuItem;
     MenuItem33: TMenuItem;
@@ -111 +113 @@
     ToolButton9: TToolButton;
     procedure ABreakpointToggleExecute(Sender: TObject);
-    procedure AProgramCompileExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
     procedure AFormatSourceExecute(Sender: TObject);
     procedure AGenerateNumberExecute(Sender: TObject);
     procedure AOptionsExecute(Sender: TObject);
+    procedure AProgramCompileExecute(Sender: TObject);
     procedure AProgramPauseExecute(Sender: TObject);
+    procedure AProgramRunToCursorExecute(Sender: TObject);
+    procedure AProgramShowExecutionPointExecute(Sender: TObject);
+    procedure AProgramStepIntoExecute(Sender: TObject);
+    procedure AProgramStepOutExecute(Sender: TObject);
+    procedure AProgramStepOverExecute(Sender: TObject);
     procedure AProgramStopExecute(Sender: TObject);
     procedure AProjectCloseExecute(Sender: TObject);
@@ -144 +151 @@
     FCurrentTarget: TTarget;
     procedure AProjectOpenRecentExecute(Sender: TObject);
-    procedure BrainFuckInterpreterChangeState(Sender: TObject);
+    procedure TargetStateChanged(Sender: TObject);
     procedure MenuItemTargetClick(Sender: TObject);
     procedure ProjectOpen(FileName: string);
@@ -218 +225 @@
 end;
 
-procedure TMainForm.BrainFuckInterpreterChangeState(Sender: TObject);
-begin
+procedure TMainForm.TargetStateChanged(Sender: TObject);
+var
+  DebugStep: TDebugStep;
+begin
+  if CurrentTarget.State = rsPaused then
+    AProgramShowExecutionPoint.Execute;
   UpdateInterface;
 end;
@@ -253 +264 @@
   for I := 0 to Targets.Count - 1 do
     TTarget(Targets[I]).OnChangeState := nil;
-  FCurrentTarget.OnChangeState := BrainFuckInterpreterChangeState;
+  FCurrentTarget.OnChangeState := TargetStateChanged;
   UpdateInterface;
 end;
@@ -309 +320 @@
   AProjectClose.Enabled := ProjectFileName <> '';
   AProgramRun.Enabled := (tcRun in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and (CurrentTarget.State = rsStopped);
+    (ProjectFileName <> '') and (CurrentTarget.State = rsStopped) or (CurrentTarget.State = rsPaused);
   AProgramPause.Enabled := (tcPause in CurrentTarget.Capabilities) and
     (ProjectFileName <> '') and (CurrentTarget.State = rsRunning);
   AProgramStop.Enabled := (tcStop in CurrentTarget.Capabilities) and
     (ProjectFileName <> '') and (CurrentTarget.State <> rsStopped);
-  AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities) and (ProjectFileName <> '');
-  AProgramStepInto.Enabled := (tcStepInto in CurrentTarget.Capabilities) and (ProjectFileName <> '');
-  AProgramStepOut.Enabled := (tcStepOut in CurrentTarget.Capabilities) and (ProjectFileName <> '');
-  AProgramRunToCursor.Enabled := (tcRunToCursor in CurrentTarget.Capabilities) and (ProjectFileName <> '');
-  AProgramStepOver.Enabled := (tcStepOver in CurrentTarget.Capabilities) and (ProjectFileName <> '');
+  AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities);
+  AProgramStepInto.Enabled := (tcStepInto in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+  AProgramStepOut.Enabled := (tcStepOut in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+  AProgramRunToCursor.Enabled := (tcRunToCursor in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+  AProgramStepOver.Enabled := (tcStepOver in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+  AProgramShowExecutionPoint.Enabled := (tcPause in CurrentTarget.Capabilities) and
+    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+  AShowSourcePosition.Enabled := CurrentTarget.Compiled;
+  AShowTargetPosition.Enabled := CurrentTarget.Compiled;
   UpdateStatusBar;
   UpdateTargetList;
@@ -373 +392 @@
     TTargetInterpretter(CurrentTarget).Input := InterpreterForm.MemoInput.Lines.Text;
   CurrentTarget.SourceCode := MemoSource.Text;
-  if not CurrentTarget.Compiled then CurrentTarget.Compile;
+  if not CurrentTarget.Compiled then AProgramCompile.Execute;
   CurrentTarget.Run;
 end;
@@ -381 +400 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(MemoSource.SelStart);
-  MemoTarget.SelStart := DebugStep.SourcePosition;
-  PageControl1.TabIndex := 0;
+  DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(MemoTarget.SelStart);
+  if Assigned(DebugStep) then begin
+    MemoSource.SelStart := DebugStep.SourcePosition;
+    PageControl1.TabIndex := 0;
+  end;
 end;
 
@@ -391 +412 @@
 begin
   DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
-  MemoTarget.SelStart := DebugStep.TargetPosition;
-  PageControl1.TabIndex := 1;
+  if Assigned(DebugStep) then begin
+    MemoTarget.SelStart := DebugStep.TargetPosition;
+    PageControl1.TabIndex := 1;
+  end;
 end;
 
@@ -487 +510 @@
 begin
   with CurrentTarget do begin
+    Stop;
     Optimization := coNormal;
     SourceCode := MemoSource.Text;
@@ -492 +516 @@
     Compile;
     MemoTarget.Text := TargetCode;
+    UpdateInterface;
   end;
 end;
@@ -503 +528 @@
 begin
   CurrentTarget.Pause
+end;
+
+procedure TMainForm.AProgramRunToCursorExecute(Sender: TObject);
+var
+  DebugStep: TDebugStep;
+begin
+  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
+  CurrentTarget.RunToCursor(DebugStep.TargetPosition);
+end;
+
+procedure TMainForm.AProgramShowExecutionPointExecute(Sender: TObject);
+var
+  DebugStep: TDebugStep;
+begin
+  DebugStep := CurrentTarget.DebugSteps.SearchByTargetPos(CurrentTarget.ExecutionPosition);
+  MemoSource.SelStart := DebugStep.SourcePosition;
+  MemoTarget.SelStart := DebugStep.TargetPosition;
+end;
+
+procedure TMainForm.AProgramStepIntoExecute(Sender: TObject);
+begin
+  CurrentTarget.StepInto;
+end;
+
+procedure TMainForm.AProgramStepOutExecute(Sender: TObject);
+begin
+  CurrentTarget.StepOut;
+end;
+
+procedure TMainForm.AProgramStepOverExecute(Sender: TObject);
+begin
+  CurrentTarget.StepOver;
 end;