Changeset 188

Timestamp:

May 7, 2019, 6:12:15 PM (6 years ago)

Author:

chronos

Message:

• Modified: Simplified generated computed goto.

File:

• branches/virtualcpu4/UCompilerPascal.pas (modified) (9 diffs)

branches/virtualcpu4/UCompilerPascal.pas

@@ -71 +71 @@
     function GetRegister(Index: Byte; BitWidth: TBitWidth): string;
     function GetMemory(Offset: string; BitWidth: TBitWidth): string;
+    function GetJump(LabelName: string): string;
   public
     Reader: TInstructionReader;
@@ -124 +125 @@
 procedure TCompilerPascal.InstJump;
 begin
-  AddLine('GotoAddr(@L' + IntToStr(Reader.ReadAddress) + ');');
+  AddLine(GetJump('L' + IntToStr(Reader.ReadAddress)));
 end;
 
 procedure TCompilerPascal.InstJumpZero;
 begin
-  AddLine('if Zero then GotoAddr(@L' + IntToStr(Reader.ReadAddress) + ');');
+  AddLine('if Zero then ' + GetJump('L' + IntToStr(Reader.ReadAddress)));
 end;
 
 procedure TCompilerPascal.InstJumpNotZero;
 begin
-  AddLine('if not Zero then GotoAddr(@L' + IntToStr(Reader.ReadAddress) + ');');
+  AddLine('if not Zero then ' + GetJump('L' + IntToStr(Reader.ReadAddress)));
 end;
 
@@ -142 +143 @@
 begin
   Addr := Reader.ReadAddressSigned;
-  AddLine('GotoAddr(@L' + IntToStr(Reader.IP + Addr) + ');');
+  AddLine(GetJump('L' + IntToStr(Reader.IP + Addr)));
 end;
 
@@ -150 +151 @@
 begin
   Addr := Reader.ReadAddressSigned;
-  AddLine('if Zero then GotoAddr(@L' + IntToStr(Reader.IP + Addr) + ');');
+  AddLine('if Zero then ' + GetJump('L' + IntToStr(Reader.IP + Addr)));
 end;
 
@@ -158 +159 @@
 begin
   Addr := Reader.ReadAddressSigned;
-  AddLine('if not Zero then GotoAddr(@L' + IntToStr(Reader.IP + Addr) + ');');
+  AddLine('if not Zero then ' + GetJump('L' + IntToStr(Reader.IP + Addr)));
 end;
 
@@ -240 +241 @@
   Addr := Reader.ReadAddress;
   AddLine('Dec(SP, ' + IntToStr(BitWidthBytes[Reader.AddrSize]) + ');');
-  AddLine(GetMemory('SP', Reader.AddrSize) + ' := ' + IntToStr(Reader.IP) + ';');
-  AddLine('GotoAddr(@L' + IntToStr(Addr) + ');');
+  AddLine(GetMemory('SP', Reader.AddrSize) + ' := LongWord(@L' + IntToStr(Reader.IP) + ');');
+  AddLine(GetJump('L' + IntToStr(Addr)));
 end;
 
@@ -248 +249 @@
   AddLine('TempAddr := Pointer(' + GetMemory('SP', Reader.AddrSize) + ');');
   AddLine('Inc(SP, ' + IntToStr(BitWidthBytes[Reader.AddrSize]) + ');');
-  AddLine('GotoAddr(TempAddr);');
+  AddLine(GetJump('TempAddr'));
 end;
 
@@ -551 +552 @@
 end;
 
+function TCompilerPascal.GetJump(LabelName: string): string;
+begin
+  Result := 'asm jmp ' + LabelName + ' end;';
+end;
+
 procedure TCompilerPascal.Compile;
 var
@@ -607 +613 @@
   AddLine('  TempAddr: Pointer;');
   AddLine('');
-  AddLine('procedure GotoAddr(P: Pointer); inline; assembler;');
-  AddLine('asm');
-  AddLine('  jmp P;');
-  AddLine('end;');
-  AddLine('');
   LabelsText := '';
   for I := 0 to Labels.Count - 1 do begin