Changeset 114 for trunk/UBFTarget.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/UBFTarget.pas (modified) (14 diffs)

trunk/UBFTarget.pas

@@ -44 +44 @@
     FProgram: array of TMachineOperation;
     FProgramIndex: Integer;
+    function GetOperationText(Operation: TMachineOperation): string; virtual;
     procedure LoadProgram; override;
   public
@@ -55 +56 @@
   end;
 
+const
+  BrainFuckCommandText: array[TMachineCommand] of Char = (
+    ' ', '+', '-', '>', '<', '.', ',', '[', ']', '@', '=', '*');
+
 
 implementation
@@ -98 +103 @@
   NewProgram: array of TMachineOperation;
   NewProgramIndex: Integer;
+  NewTargetPos: Integer;
+  FirstIndex: Integer;
 begin
   NewProgramIndex := 0;
+  NewTargetPos := 0;
   SetLength(NewProgram, Length(FProgram));
 
   FProgramIndex := 0;
   while (FProgramIndex < Length(FProgram)) do begin
+    FirstIndex := FProgramIndex;
     case FProgram[FProgramIndex].Command of
       cmPointerInc: begin
@@ -123 +132 @@
       else NewProgram[NewProgramIndex] := FProgram[FProgramIndex];
     end;
-    DebugSteps.UpdateTargetPos(FProgramIndex, NewProgramIndex);
+    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTargetPos);
+    Inc(NewTargetPos, Length(GetOperationText(NewProgram[NewProgramIndex])));
     Inc(FProgramIndex);
     Inc(NewProgramIndex);
@@ -139 +149 @@
   NewProgramIndex: Integer;
   PreviousCommand: TMachineCommand;
+  FirstIndex: Integer;
+  NewTextIndex: Integer;
 begin
   // Merge together cmInc, cmDec, cmSet
@@ -147 +159 @@
 
   FProgramIndex := 0;
+  NewTextIndex := 0;
   while (FProgramIndex < Length(FProgram)) do begin
+    FirstIndex := FProgramIndex;
     case FProgram[FProgramIndex].Command of
       cmPointerInc: begin
@@ -258 +272 @@
     end;
     PreviousCommand := FProgram[FProgramIndex].Command;
-    DebugSteps.UpdateTargetPos(FProgramIndex, NewProgramIndex);
+    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTextIndex);
+    Inc(NewTextIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
     Inc(FProgramIndex);
     Inc(NewProgramIndex);
@@ -281 +296 @@
   NewProgramIndex: Integer;
   RelIndex: Integer;
+  FirstIndex: Integer;
+  NewTextIndex: Integer;
 begin
   NewProgramIndex := 0;
@@ -287 +304 @@
   RelIndex := 0;
   FProgramIndex := 0;
+  NewTextIndex := 0;
   while (FProgramIndex < Length(FProgram)) do begin
+    FirstIndex := FProgramIndex;
     case FProgram[FProgramIndex].Command of
       cmPointerInc: begin
@@ -319 +338 @@
       else raise Exception.Create(Format('Unsupported command %d', [FProgram[FProgramIndex].Command]));
     end;
-    DebugSteps.UpdateTargetPos(FProgramIndex, NewProgramIndex);
+    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTextIndex);
+    Inc(NewTextIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
     Inc(FProgramIndex);
     Inc(NewProgramIndex);
@@ -340 +360 @@
   LoopStartIndex: Integer;
   LoopStartIndexNew: Integer;
+  FirstIndex: Integer;
+  NewTextIndex: Integer;
 begin
   NewProgramIndex := 0;
@@ -347 +369 @@
   ProcessLoop := False;
   FProgramIndex := 0;
+  NewTextIndex := 0;
   PointerChange := 0;
   while (FProgramIndex < Length(FProgram)) do begin
+    FirstIndex := FProgramIndex;
     case FProgram[FProgramIndex].Command of
       cmPointerInc: begin
@@ -418 +442 @@
       else raise Exception.Create(Format('Unsupported command %d', [FProgram[FProgramIndex].Command]));
     end;
-    DebugSteps.UpdateTargetPos(FProgramIndex, NewProgramIndex);
+    DebugSteps.UpdateTargetPos(FirstIndex, FProgramIndex, NewProgramIndex, NewTextIndex);
+    Inc(NewTextIndex, Length(GetOperationText(NewProgram[NewProgramIndex])));
     Inc(FProgramIndex);
     Inc(NewProgramIndex);
@@ -428 +453 @@
   Move(Pointer(NewProgram)^, Pointer(FProgram)^, SizeOf(TMachineOperation) *
     Length(NewProgram));
+end;
+
+function TBFTarget.GetOperationText(Operation: TMachineOperation): string;
+begin
+  Result := BrainFuckCommandText[Operation.Command];
+  if Operation.Command in [cmInc, cmDec, cmPointerInc, cmPointerDec,
+    cmSet, cmMultipy] then begin
+  if Operation.Parameter <> 1 then
+    Result := Result + IntToStr(Operation.Parameter);
+  end;
+  if Operation.RelIndex <> 0 then
+    Result := Result + 'R' + IntToStr(Operation.RelIndex);
 end;