Changeset 36 for trunk/Forms/UMainForm.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/Forms/UMainForm.pas (modified) (14 diffs)

trunk/Forms/UMainForm.pas

@@ -120 +120 @@
     procedure AProgramPauseExecute(Sender: TObject);
     procedure AProgramRunToCursorExecute(Sender: TObject);
+    procedure AProgramRunExecute(Sender: TObject);
     procedure AProgramShowExecutionPointExecute(Sender: TObject);
     procedure AProgramStepIntoExecute(Sender: TObject);
@@ -130 +131 @@
     procedure AProjectSaveAsExecute(Sender: TObject);
     procedure AProjectSaveExecute(Sender: TObject);
-    procedure AProgramRunExecute(Sender: TObject);
     procedure AShowSourcePositionExecute(Sender: TObject);
     procedure AShowTargetPositionExecute(Sender: TObject);
@@ -155 +155 @@
     procedure ProjectOpen(FileName: string);
     procedure SetCurrentTarget(AValue: TTarget);
+    procedure UpdateToolBarHints;
   public
     Modified: Boolean;
     ProjectFileName: string;
-    BreakPoints: TListInteger;
     Targets: TTargetList;
     LastOpenedList: TLastOpenedList;
@@ -195 +195 @@
     else AProjectNew.Execute;
   UpdateInterface;
+  UpdateToolBarHints;
+  UpdateTargetList;
 end;
 
@@ -266 +268 @@
   FCurrentTarget.OnChangeState := TargetStateChanged;
   UpdateInterface;
+end;
+
+procedure TMainForm.UpdateToolBarHints;
+var
+  I: Integer;
+begin
+  for I := 0 to ToolBar1.ControlCount - 1 do
+    ToolBar1.Controls[I].Hint := ToolBar1.Controls[I].Caption;
 end;
 
@@ -327 +337 @@
   AProgramCompile.Enabled := (tcCompile in CurrentTarget.Capabilities);
   AProgramStepInto.Enabled := (tcStepInto in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+    (ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
   AProgramStepOut.Enabled := (tcStepOut in CurrentTarget.Capabilities) and
     (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
   AProgramRunToCursor.Enabled := (tcRunToCursor in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+    (ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
   AProgramStepOver.Enabled := (tcStepOver in CurrentTarget.Capabilities) and
-    (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
+    (ProjectFileName <> '') and ((CurrentTarget.State = rsPaused) or (CurrentTarget.State = rsStopped));
   AProgramShowExecutionPoint.Enabled := (tcPause in CurrentTarget.Capabilities) and
     (ProjectFileName <> '') and (CurrentTarget.State = rsPaused);
@@ -339 +349 @@
   AShowTargetPosition.Enabled := CurrentTarget.Compiled;
   UpdateStatusBar;
-  UpdateTargetList;
 end;
 
@@ -364 +373 @@
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
-  BreakPoints := TListInteger.Create;
   Targets := TTargetList.Create;
   Targets.Add(TTargetInterpretter.Create);
@@ -382 +390 @@
   LastOpenedList.Free;
   Targets.Free;
-  BreakPoints.Free;
 end;
 
@@ -391 +398 @@
   if CurrentTarget is TTargetInterpretter then
     TTargetInterpretter(CurrentTarget).Input := InterpreterForm.MemoInput.Lines.Text;
-  CurrentTarget.SourceCode := MemoSource.Text;
   if not CurrentTarget.Compiled then AProgramCompile.Execute;
   CurrentTarget.Run;
@@ -521 +527 @@
 
 procedure TMainForm.ABreakpointToggleExecute(Sender: TObject);
-begin
-  //BreakPoints.Add();
+var
+  DebugStep: TDebugStep;
+  BreakPoint: TBreakPoint;
+begin
+  DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
+  if Assigned(DebugStep) then begin
+    BreakPoint := CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.TargetPosition);
+    if Assigned(BreakPoint) then
+      CurrentTarget.BreakPoints.Delete(CurrentTarget.BreakPoints.IndexOf(BreakPoint))
+      else CurrentTarget.BreakPoints.AddItem(DebugStep.TargetPosition);
+  end;
 end;
 
 procedure TMainForm.AProgramPauseExecute(Sender: TObject);
 begin
-  CurrentTarget.Pause
+  CurrentTarget.Pause;
 end;
 
@@ -535 +550 @@
 begin
   DebugStep := CurrentTarget.DebugSteps.SearchBySourcePos(MemoSource.SelStart);
-  CurrentTarget.RunToCursor(DebugStep.TargetPosition);
+  if CurrentTarget.State = rsStopped then begin
+    if not CurrentTarget.Compiled then AProgramCompile.Execute;
+    CurrentTarget.BreakPoints.SetSystem(DebugStep.TargetPosition);
+    AProgramRun.Execute;
+  end else CurrentTarget.RunToCursor(DebugStep.TargetPosition);
 end;
 
@@ -545 +564 @@
   MemoSource.SelStart := DebugStep.SourcePosition;
   MemoTarget.SelStart := DebugStep.TargetPosition;
+  if PageControl1.TabIndex = 0 then MemoSource.SetFocus;
+  if PageControl1.TabIndex = 1 then MemoTarget.SetFocus;
 end;
 
 procedure TMainForm.AProgramStepIntoExecute(Sender: TObject);
 begin
-  CurrentTarget.StepInto;
+  if CurrentTarget.State = rsStopped then begin
+    if not CurrentTarget.Compiled then AProgramCompile.Execute;
+    CurrentTarget.BreakPoints.SetSystem(TDebugStep(CurrentTarget.DebugSteps.First).TargetPosition);
+    AProgramRun.Execute;
+  end else CurrentTarget.StepInto;
 end;
 
@@ -559 +584 @@
 procedure TMainForm.AProgramStepOverExecute(Sender: TObject);
 begin
-  CurrentTarget.StepOver;
+  if CurrentTarget.State = rsStopped then begin
+    if not CurrentTarget.Compiled then AProgramCompile.Execute;
+    CurrentTarget.BreakPoints.SetSystem(TDebugStep(CurrentTarget.DebugSteps.First).TargetPosition);
+    AProgramRun.Execute;
+  end else CurrentTarget.StepOver;
 end;