Changeset 114 for trunk/Target

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/Target/UTargetInterpretter.pas (modified) (6 diffs)

trunk/Target/UTargetInterpretter.pas

@@ -76 +76 @@
   end;
 
-const
-  BrainFuckCommandText: array[TMachineCommand] of Char = (
-    ' ', '+', '-', '>', '<', '.', ',', '[', ']', '@', '=', '*');
-
 
 implementation
@@ -321 +317 @@
   Result := '';
   for I := 0 to Length(FProgram) - 1 do begin
-    Result := Result + BrainFuckCommandText[FProgram[I].Command];
-    if FProgram[I].Command in [cmInc, cmDec, cmPointerInc, cmPointerDec,
-      cmSet, cmMultipy] then begin
-      if FProgram[I].Parameter <> 1 then
-        Result := Result + IntToStr(FProgram[I].Parameter);
-    end;
-    if FProgram[I].RelIndex <> 0 then
-      Result := Result + 'R' + IntToStr(FProgram[I].RelIndex);
+    Result := Result + GetOperationText(FProgram[I]);
   end;
 end;
@@ -369 +358 @@
 begin
   if State = rsPaused then begin
-    Step := DebugSteps.SearchByTargetPos(FProgramIndex);
+    Step := DebugSteps.SearchByProgramPos(FProgramIndex);
     if Step.Operation = soStepOut then begin
-      BreakPoints.SetSystem(Step.TargetPosition + 1);
-      Step := DebugSteps.SearchByTargetPos(FProgram[Step.TargetPosition].Parameter);
-      BreakPoints.AddSystem(Step.TargetPosition);
+      BreakPoints.SetSystem(Step.ProgramPosition + 1);
+      Step := DebugSteps.SearchByProgramPos(FProgram[Step.ProgramPosition].Parameter);
+      BreakPoints.AddSystem(Step.ProgramPosition);
     end else
     if Step.Operation = soStepIn then begin
-      BreakPoints.SetSystem(Step.TargetPosition + 1);
-      Step := DebugSteps.SearchByTargetPos(FProgram[Step.TargetPosition].Parameter);
-      BreakPoints.AddSystem(Step.TargetPosition);
-    end else BreakPoints.SetSystem(Step.TargetPosition + 1);
+      BreakPoints.SetSystem(Step.ProgramPosition + 1);
+      Step := DebugSteps.SearchByProgramPos(FProgram[Step.ProgramPosition].Parameter);
+      BreakPoints.AddSystem(Step.ProgramPosition);
+    end else BreakPoints.SetSystem(Step.ProgramPosition + 1);
     Run;
   end else raise Exception.Create(SProgramNotRunning);
@@ -389 +378 @@
 begin
   if State = rsPaused then begin
-    Step := DebugSteps.SearchByTargetPos(FProgramIndex);
+    Step := DebugSteps.SearchByProgramPos(FProgramIndex);
     if Step.Operation = soStepOut then begin
-      BreakPoints.SetSystem(Step.TargetPosition + 1);
-      Step := DebugSteps.SearchByTargetPos(FProgram[Step.TargetPosition].Parameter);
-      BreakPoints.AddSystem(Step.TargetPosition);
+      BreakPoints.SetSystem(Step.ProgramPosition + 1);
+      Step := DebugSteps.SearchByProgramPos(FProgram[Step.ProgramPosition].Parameter);
+      BreakPoints.AddSystem(Step.ProgramPosition);
     end else
     if Step.Operation = soStepIn then begin
-      Step := DebugSteps.SearchByTargetPos(FProgram[Step.TargetPosition].Parameter);
-      BreakPoints.SetSystem(Step.TargetPosition + 1);
-    end else BreakPoints.SetSystem(Step.TargetPosition + 1);
+      Step := DebugSteps.SearchByProgramPos(FProgram[Step.ProgramPosition].Parameter);
+      BreakPoints.SetSystem(Step.ProgramPosition + 1);
+    end else BreakPoints.SetSystem(Step.ProgramPosition + 1);
     Run;
   end else raise Exception.Create(SProgramNotRunning);
@@ -410 +399 @@
 begin
   if State = rsPaused then begin
-    Step := DebugSteps.SearchByTargetPos(FProgramIndex);
+    Step := DebugSteps.SearchByProgramPos(FProgramIndex);
     StepIndex := DebugSteps.IndexOf(Step);
     Nesting := 1;
@@ -419 +408 @@
     end;
     if StepIndex < DebugSteps.Count then begin
-      Breakpoints.SetSystem(TDebugStep(DebugSteps[StepIndex]).TargetPosition);
+      Breakpoints.SetSystem(TDebugStep(DebugSteps[StepIndex]).ProgramPosition);
     end;
     Run;