Changeset 90

Timestamp:

Aug 29, 2017, 11:13:14 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Infinite loop in Multiply optimization pass.
• Modified: Made produced C# code more clean and nice.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• Target/UTargetCSharp.pas (modified) (1 diff)
• UBFTarget.pas (modified) (1 diff)

trunk/Forms/UFormMain.pas

@@ -480 +480 @@
     ProgramName := ExtractFileNameOnly(Core.Project.FileName);
     Core.CurrentTarget.Messages.AddMessage(SCompileStart);
+    Application.ProcessMessages;
     Compile;
     Core.CurrentTarget.Messages.AppendMessage(SDone);

trunk/Target/UTargetCSharp.pas

@@ -63 +63 @@
   AddLine('using System;');
   AddLine;
-  AddLine('public class ' + ProgramName + ' {');
+  AddLine('public class ' + ProgramName);
+  AddLine('{');
   Inc(Indent);
-  AddLine('public static void Main() {');
+  AddLine('public static void Main()');
+  AddLine('{');
   Inc(Indent);
-  AddLine('char[] Memory;');
+  AddLine('int[] Memory;');
   AddLine('int Pos;');
   AddLine;
-  AddLine('Memory = new char[' + IntToStr(MemorySize) + '];');
+  AddLine('Memory = new int[' + IntToStr(MemorySize) + '];');
   AddLine('Pos = 0;');
   FProgramIndex := 0;
   while (FProgramIndex < Length(FProgram)) do begin
     case FProgram[FProgramIndex].Command of
-      cmPointerInc: AddLine('Pos = Pos + ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
-      cmPointerDec: AddLine('Pos = Pos - ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
-      cmInc: AddLine(GetMemoryCell + ' = (char)((int)' + GetMemoryCell + ' + ' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
-      cmDec: AddLine(GetMemoryCell + ' = (char)((int)' + GetMemoryCell + ' - ' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
-      cmOutput: AddLine('Console.Write(' + GetMemoryCell + ');');
-      cmInput: AddLine(GetMemoryCell + ' = Console.ReadKey().KeyChar;');
-      cmSet: AddLine(GetMemoryCell + ' = (char)' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
-      cmMultipy: AddLine(GetMemoryCell + ' = (char)((int)' + GetMemoryCell + ' + (int)Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ');');
+      cmPointerInc: AddLine('Pos += ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmPointerDec: AddLine('Pos -= ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmInc: AddLine(GetMemoryCell + ' += ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmDec: AddLine(GetMemoryCell + ' -= ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmOutput: AddLine('Console.Write((char)' + GetMemoryCell + ');');
+      cmInput: AddLine(GetMemoryCell + ' = (int)Console.ReadKey().KeyChar;');
+      cmSet: AddLine(GetMemoryCell + ' = ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';');
+      cmMultipy: begin
+        if FProgram[FProgramIndex].Parameter = 1 then
+          AddLine(GetMemoryCell + ' += Memory[Pos];')
+        else
+        if FProgram[FProgramIndex].Parameter > 0 then
+          AddLine(GetMemoryCell + ' += Memory[Pos] * ' + IntToStr(FProgram[FProgramIndex].Parameter) + ';')
+        else
+        if FProgram[FProgramIndex].Parameter < 0 then
+          AddLine(GetMemoryCell + ' -= Memory[Pos] * ' + IntToStr(Abs(FProgram[FProgramIndex].Parameter)) + ';');
+      end;
       cmLoopStart: begin
-        AddLine('while(' + GetMemoryCell + ' != 0)');
+        AddLine('while (' + GetMemoryCell + ' != 0)');
         AddLine('{');
         Inc(Indent);

trunk/UBFTarget.pas

@@ -423 +423 @@
           NewProgram[NewProgramIndex].RelIndex := 0;
           ProcessLoop := False;
+          NumberOfBaseDecrement := 0;
         end;
       end;