Changeset 114 for trunk/Forms/UFormMain.pas

Timestamp:

May 18, 2019, 12:13:44 AM (6 years ago)

Author:

chronos

Message:

• Modified: Improved stepping through source and target code. Each step has source, program and target index.

File:

• trunk/Forms/UFormMain.pas (modified) (7 diffs)

trunk/Forms/UFormMain.pas

@@ -226 +226 @@
     AProgramShowExecutionPoint.Execute;
   if Core.CurrentTarget.State = rsStopped then
-  Core.CurrentTarget.Messages.AddMessage(SProgramStopped);
+    Core.CurrentTarget.Messages.AddMessage(SProgramStopped);
 end;
 
@@ -487 +487 @@
       Core.ThemeManager.UseTheme(Self);
       FormSourceCode.UpdateTheme;
+      Core.SaveToRegistry(Core.ApplicationInfo.GetRegistryContext);
+      SaveToRegistry(Core.ApplicationInfo.GetRegistryContext);
     end;
   finally
@@ -523 +525 @@
   DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
   if Assigned(DebugStep) then begin
-    BreakPoint := Core.CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.TargetPosition);
+    BreakPoint := Core.CurrentTarget.BreakPoints.SearchByTargetPos(DebugStep.ProgramPosition);
     if Assigned(BreakPoint) then
       Core.CurrentTarget.BreakPoints.Delete(Core.CurrentTarget.BreakPoints.IndexOf(BreakPoint))
-      else Core.CurrentTarget.BreakPoints.AddItem(DebugStep.TargetPosition);
+      else Core.CurrentTarget.BreakPoints.AddItem(DebugStep.ProgramPosition);
   end;
 end;
@@ -555 +557 @@
     if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
     DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
-    Core.CurrentTarget.BreakPoints.SetSystem(DebugStep.TargetPosition);
+    Core.CurrentTarget.BreakPoints.SetSystem(DebugStep.ProgramPosition);
     AProgramRun.Execute;
   end else begin
     DebugStep := Core.CurrentTarget.DebugSteps.SearchBySourcePos(FormSourceCode.SynEditSource.SelStart - 1);
-    Core.CurrentTarget.RunToCursor(DebugStep.TargetPosition);
+    Core.CurrentTarget.RunToCursor(DebugStep.ProgramPosition);
   end;
 end;
@@ -567 +569 @@
   DebugStep: TDebugStep;
 begin
-  DebugStep := Core.CurrentTarget.DebugSteps.SearchByTargetPos(Core.CurrentTarget.ExecutionPosition);
+  DebugStep := Core.CurrentTarget.DebugSteps.SearchByProgramPos(Core.CurrentTarget.ExecutionPosition);
   FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition + 1;
   FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition + 1;
@@ -578 +580 @@
   if Core.CurrentTarget.State = rsStopped then begin
     if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    Core.CurrentTarget.BreakPoints.SetSystem(TDebugStep(Core.CurrentTarget.DebugSteps.First).TargetPosition);
+    Core.CurrentTarget.BreakPoints.SetSystem(TDebugStep(Core.CurrentTarget.DebugSteps.First).ProgramPosition);
     AProgramRun.Execute;
   end else Core.CurrentTarget.StepInto;
@@ -592 +594 @@
   if Core.CurrentTarget.State = rsStopped then begin
     if not Core.CurrentTarget.Compiled then AProgramCompile.Execute;
-    Core.CurrentTarget.BreakPoints.SetSystem(TDebugStep(Core.CurrentTarget.DebugSteps.First).TargetPosition);
+    Core.CurrentTarget.BreakPoints.SetSystem(TDebugStep(Core.CurrentTarget.DebugSteps.First).ProgramPosition);
     AProgramRun.Execute;
   end else Core.CurrentTarget.StepOver;