Changeset 126 for trunk/Target

Timestamp:

Jan 14, 2022, 7:13:36 PM (2 years ago)

Author:

chronos

Message:

• Modified: SetZero optimization made as separate step.
• Fixed: Error during compilation in CopyMultiply optimization.

Location:

trunk/Target

Files:

• UTargetC.pas (modified) (2 diffs)
• UTargetCSharp.pas (modified) (2 diffs)
• UTargetDelphi.pas (modified) (2 diffs)
• UTargetFPC.pas (modified) (2 diffs)
• UTargetInterpretter.pas (modified) (7 diffs)
• UTargetJava.pas (modified) (2 diffs)
• UTargetJavascript.pas (modified) (2 diffs)
• UTargetPHP.pas (modified) (2 diffs)
• UTargetPython.pas (modified) (2 diffs)

trunk/Target/UTargetC.pas

@@ -74 +74 @@
   AddLine('Pos = 0;');
   FProgramIndex := 0;
-  while (FProgramIndex < Length(FProgram)) do begin
+  while FProgramIndex < FProgram.Count do begin
     case FProgram[FProgramIndex].Command of
       cmPointerInc: AddLine('Pos = Pos + ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
@@ -83 +83 @@
       cmInput: AddLine(GetMemoryCell + ' = getchar();');
       cmSet: AddLine(GetMemoryCell + ' = ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
-      cmMultipy: AddLine(GetMemoryCell + ' = ' + GetMemoryCell + ' + Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmMultiply: AddLine(GetMemoryCell + ' = ' + GetMemoryCell + ' + Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
       cmLoopStart: begin
         AddLine('while(' + GetMemoryCell + ' != 0)');

trunk/Target/UTargetCSharp.pas

@@ -75 +75 @@
   AddLine('Pos = 0;');
   FProgramIndex := 0;
-  while (FProgramIndex < Length(FProgram)) do begin
+  while FProgramIndex < FProgram.Count do begin
     case FProgram[FProgramIndex].Command of
       cmPointerInc: AddLine('Pos += ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
@@ -84 +84 @@
       cmInput: AddLine(GetMemoryCell + ' = (int)Console.ReadKey().KeyChar;');
       cmSet: AddLine(GetMemoryCell + ' = ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
-      cmMultipy: begin
+      cmMultiply: begin
         if FProgram[FProgramIndex].Parameter = 1 then
           AddLine(GetMemoryCell + ' += Memory[Pos];')

trunk/Target/UTargetDelphi.pas

@@ -67 +67 @@
   AddLine('Pos := 0;');
   FProgramIndex := 0;
-  while (FProgramIndex < Length(FProgram)) do begin
+  while FProgramIndex < FProgram.Count do begin
     case FProgram[FProgramIndex].Command of
       cmPointerInc: AddLine('Inc(Pos, ' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
@@ -74 +74 @@
       cmDec: AddLine(GetMemoryCell + ' := ' + GetMemoryCell + ' - ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
       cmSet: AddLine(GetMemoryCell + ' := ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
-      cmMultipy: AddLine(GetMemoryCell + ' := ' + GetMemoryCell + ' + Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmMultiply: AddLine(GetMemoryCell + ' := ' + GetMemoryCell + ' + Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
       cmOutput: AddLine('Write(Chr(' + GetMemoryCell + '));');
       cmInput: AddLine('Read(ReadChar); ' + GetMemoryCell + ' := Ord(ReadChar);');

trunk/Target/UTargetFPC.pas

@@ -69 +69 @@
   AddLine('Pos := 0;');
   FProgramIndex := 0;
-  while (FProgramIndex < Length(FProgram)) do begin
+  while FProgramIndex < FProgram.Count do begin
     case FProgram[FProgramIndex].Command of
       cmPointerInc: AddLine('Inc(Pos, ' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
@@ -76 +76 @@
       cmDec: AddLine(GetMemoryCell + ' := ' + GetMemoryCell + ' - ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
       cmSet: AddLine(GetMemoryCell + ' := ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
-      cmMultipy: AddLine(GetMemoryCell + ' := ' + GetMemoryCell + ' + Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmMultiply: AddLine(GetMemoryCell + ' := ' + GetMemoryCell + ' + Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
       cmOutput: AddLine('Write(Chr(' + GetMemoryCell + '));');
       cmInput: AddLine('Read(ReadChar); ' + GetMemoryCell + ' := Ord(ReadChar);');

trunk/Target/UTargetInterpretter.pas

@@ -83 +83 @@
   SProgramUpperLimit = 'Program run over upper limit';
   SJumpTableInsistent = 'Jump table is inconsistent';
-  SJumpTableColision = 'Jump table colision';
+  SJumpTableCollision = 'Jump table collision';
   SProgramNotRunning = 'Program not running';
   SUnsupportedCommand = 'Unsupported command';
@@ -95 +95 @@
   with Parent do
   repeat
-    while (FProgramIndex < Length(FProgram)) and (State <> rsStopped) do begin
+    while (FProgramIndex < FProgram.Count) and (State <> rsStopped) do begin
       if State = rsRunning then begin
         if FProgramBreakpoints[FProgramIndex] then begin
@@ -154 +154 @@
   I: Integer;
 begin
-  for I := 0 to Length(FProgram) - 1 do begin
+  for I := 0 to FProgram.Count - 1 do begin
     case FProgram[I].Command of
-      cmLoopStart: FProgram[I].Parameter := 0;
-      cmLoopEnd: FProgram[I].Parameter := 0;
+      cmLoopStart: FProgram.Operations[I].Parameter := 0;
+      cmLoopEnd: FProgram.Operations[I].Parameter := 0;
     end;
   end;
 
   SetLength(Loop, 0);
-  for I := 0 to Length(FProgram) - 1 do begin
+  for I := 0 to FProgram.Count - 1 do begin
     case FProgram[I].Command of
       cmLoopStart: begin
@@ -170 +170 @@
       cmLoopEnd: begin
         if FProgram[I].Parameter > 0 then
-          raise Exception.Create(SJumpTableColision);
-        FProgram[I].Parameter := Loop[High(Loop)];
+          raise Exception.Create(SJumpTableCollision);
+        FProgram.Operations[I].Parameter := Loop[High(Loop)];
         if FProgram[Loop[High(Loop)]].Parameter > 0 then
-          raise Exception.Create(SJumpTableColision);
-        FProgram[Loop[High(Loop)]].Parameter := I;
+          raise Exception.Create(SJumpTableCollision);
+        FProgram.Operations[Loop[High(Loop)]].Parameter := I;
         SetLength(Loop, Length(Loop) - 1);
       end;
@@ -303 +303 @@
   I: Integer;
 begin
-  SetLength(FProgramBreakpoints, Length(FProgram));
+  SetLength(FProgramBreakpoints, FProgram.Count);
   for I := 0 to High(FProgramBreakpoints) do
     FProgramBreakpoints[I] := False;
   for I := 0 to BreakPoints.Count - 1 do
-    if TBreakPoint(BreakPoints[I]).TargetAddress < Length(FProgramBreakpoints) then
-      FProgramBreakpoints[TBreakPoint(BreakPoints[I]).TargetAddress] := True;
+    if BreakPoints[I].TargetAddress < Length(FProgramBreakpoints) then
+      FProgramBreakpoints[BreakPoints[I].TargetAddress] := True;
 end;
 
@@ -316 +316 @@
 begin
   Result := '';
-  for I := 0 to Length(FProgram) - 1 do begin
+  for I := 0 to FProgram.Count - 1 do begin
     Result := Result + GetOperationText(FProgram[I]);
   end;
@@ -438 +438 @@
   // Extended commands
   FCommandTable[cmSet] := CommandSet;
-  FCommandTable[cmMultipy] := CommandMultiply;
+  FCommandTable[cmMultiply] := CommandMultiply;
 end;
 

trunk/Target/UTargetJava.pas

@@ -74 +74 @@
   AddLine('Pos = 0;');
   FProgramIndex := 0;
-  while (FProgramIndex < Length(FProgram)) do begin
+  while FProgramIndex < FProgram.Count do begin
     case FProgram[FProgramIndex].Command of
       cmPointerInc: AddLine('Pos = Pos + ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
@@ -83 +83 @@
       cmInput: AddLine(GetMemoryCell + ' = (char)System.in.read();');
       cmSet: AddLine(GetMemoryCell + ' = (char)' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
-      cmMultipy: AddLine(GetMemoryCell + ' = (char)((int)' + GetMemoryCell + ' + (int)Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
+      cmMultiply: AddLine(GetMemoryCell + ' = (char)((int)' + GetMemoryCell + ' + (int)Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
       cmLoopStart: begin
         AddLine('while(' + GetMemoryCell + ' != 0)');

trunk/Target/UTargetJavascript.pas

@@ -61 +61 @@
   AddLine('');
   FProgramIndex := 0;
-  while (FProgramIndex < Length(FProgram)) do begin
+  while FProgramIndex < FProgram.Count do begin
     case FProgram[FProgramIndex].Command of
       cmPointerInc: AddLine('Pos = Pos + ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
@@ -70 +70 @@
       cmInput: ; //AddLine(GetMemoryCell + ' = getchar();');
       cmSet: AddLine(GetMemoryCell + ' = ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
-      cmMultipy: AddLine(GetMemoryCell + ' = ' + GetMemoryCell + ' + Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmMultiply: AddLine(GetMemoryCell + ' = ' + GetMemoryCell + ' + Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
       cmLoopStart: begin
         AddLine('while(' + GetMemoryCell + ' != 0)');

trunk/Target/UTargetPHP.pas

@@ -66 +66 @@
   AddLine('$Position = 0;');
   FProgramIndex := 0;
-  while (FProgramIndex < Length(FProgram)) do begin
+  while FProgramIndex < FProgram.Count do begin
     case FProgram[FProgramIndex].Command of
       cmPointerInc: AddLine('$Position = $Position + ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
@@ -77 +77 @@
       cmInput: AddLine(GetMemoryCell + ' = fgetc(STDIN);');
       cmSet: AddLine(GetMemoryCell + ' = chr(' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
-      cmMultipy: AddLine(GetMemoryCell + ' = chr(ord(' + GetMemoryCell + ') + ord($Memory[$Position]) * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
+      cmMultiply: AddLine(GetMemoryCell + ' = chr(ord(' + GetMemoryCell + ') + ord($Memory[$Position]) * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
       cmLoopStart: begin
         AddLine('while(' + GetMemoryCell + ' != "\0") {');

trunk/Target/UTargetPython.pas

@@ -104 +104 @@
   AddLine('position = 0');
   FProgramIndex := 0;
-  while (FProgramIndex < Length(FProgram)) do begin
+  while FProgramIndex < FProgram.Count do begin
     case FProgram[FProgramIndex].Command of
       cmPointerInc: AddLine('position += ' + IntToStr(FProgram[FProgramIndex].Parameter));
@@ -116 +116 @@
       cmInput: AddLine(GetMemoryCell + ' = ord(getchar())');
       cmSet: AddLine(GetMemoryCell + ' = ' + IntToStr(FProgram[FProgramIndex].Parameter));
-      cmMultipy: AddLine(GetMemoryCell + ' = ' + GetMemoryCell + ' + memory[position] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmMultiply: AddLine(GetMemoryCell + ' = ' + GetMemoryCell + ' + memory[position] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
       cmLoopStart: begin
         AddLine('while(' + GetMemoryCell + ' != 0):');