Changeset 185 for branches/virtualcpu4/UDisassembler.pas

Timestamp:

May 1, 2019, 9:48:46 PM (6 years ago)

Author:

chronos

Message:

• Added: Assembler labels reference address calculation.
• Fixed: Displaying address/data hex numbers in opcode and instruction.

File:

• branches/virtualcpu4/UDisassembler.pas (modified) (5 diffs)

branches/virtualcpu4/UDisassembler.pas

@@ -29 +29 @@
 
 implementation
-
-const
-  SignText: array[TValueSign] of string = ('-', '', '+');
-
-function SignedIntToHex(Value: Int64; Digits: Byte): string;
-begin
-  Result := SignText[Sign(Value)] + IntToHex(Abs(Value), Digits);
-end;
 
 { TDisassembler }
@@ -84 +76 @@
           Data := ReadData;
           Line.Opcode := Line.Opcode + ' ' + IntToHex(Data, BitWidthBytes[DataSize] * 2);
-          Line.Instruction := Line.Instruction + ' $' + IntToHex(Data, BitWidthBytes[DataSize] * 2);
+          Line.Instruction := Line.Instruction + ' ' + IntToHexEx(Data, -1, '$');
         end;
         prAddr: begin
           Address := ReadAddress;
           Line.Opcode := Line.Opcode + ' ' + IntToHex(Address, BitWidthBytes[AddrSize] * 2);
-          Line.Instruction := Line.Instruction + ' $' + IntToHex(Address, BitWidthBytes[AddrSize] * 2);
+          Line.Instruction := Line.Instruction + ' ' + IntToHexEx(Address, -1, '$');
         end;
         prAddrRel: begin
           AddressRel := ReadAddressSigned;
-          Line.Opcode := Line.Opcode + ' ' + IntToHex(QWord(AddressRel), BitWidthBytes[AddrSize] * 2);
-          Line.Instruction := Line.Instruction + ' $' + SignedIntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
+          Line.Opcode := Line.Opcode + ' ' + IntToHexEx(QWord(AddressRel), BitWidthBytes[AddrSize] * 2);
+          Line.Instruction := Line.Instruction + ' ' + IntToHexEx(AddressRel, -1, '$');
         end;
       end;
@@ -105 +97 @@
         prData: begin
           Data := ReadData;
-          Line.Opcode := Line.Opcode + ' ' + IntToHex(Data, BitWidthBytes[DataSize] * 2);
-          Line.Instruction := Line.Instruction + ', $' + IntToHex(Data, BitWidthBytes[DataSize] * 2);
+          Line.Opcode := Line.Opcode + ' ' + IntToHexEx(Data, BitWidthBytes[DataSize] * 2);
+          Line.Instruction := Line.Instruction + ', ' + IntToHexEx(Data, -1, '$');
         end;
         prAddr: begin
           Address := ReadAddress;
           Line.Opcode := Line.Opcode + ' ' + IntToHex(Address, BitWidthBytes[AddrSize] * 2);
-          Line.Instruction := Line.Instruction + ', $' + IntToHex(Address, BitWidthBytes[AddrSize] * 2);
+          Line.Instruction := Line.Instruction + ', ' + IntToHexEx(Address, -1, '$');
         end;
         prAddrRel: begin
           AddressRel := ReadAddressSigned;
-          Line.Opcode := Line.Opcode + ' ' + IntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
-          Line.Instruction := Line.Instruction + ', $' + SignedIntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
+          Line.Opcode := Line.Opcode + ' ' + IntToHex(QWord(AddressRel), BitWidthBytes[AddrSize] * 2);
+          Line.Instruction := Line.Instruction + ', ' + IntToHexEx(AddressRel, -1, '$');
         end;
       end;
@@ -128 +120 @@
           Data := ReadData;
           Line.Opcode := Line.Opcode + ' ' + IntToHex(Data, BitWidthBytes[DataSize] * 2);
-          Line.Instruction := Line.Instruction + ', $' + IntToHex(Data, BitWidthBytes[DataSize] * 2);
+          Line.Instruction := Line.Instruction + ', ' + IntToHexEx(Data, -1, '$');
         end;
         prAddr: begin
           Address := ReadAddress;
           Line.Opcode := Line.Opcode + ' ' + IntToHex(Address, BitWidthBytes[AddrSize] * 2);
-          Line.Instruction := Line.Instruction + ', $' + IntToHex(Address, BitWidthBytes[AddrSize] * 2);
+          Line.Instruction := Line.Instruction + ', ' + IntToHexEx(Address, -1, '$');
         end;
         prAddrRel: begin
           AddressRel := ReadAddressSigned;
           Line.Opcode := Line.Opcode + ' ' + IntToHex(QWord(AddressRel), BitWidthBytes[AddrSize] * 2);
-          Line.Instruction := Line.Instruction + ', $' + SignedIntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
+          Line.Instruction := Line.Instruction + ', ' + IntToHexEx(AddressRel, -1, '$');
         end;
       end;
       Output.Add(Line);
+      if not Prefix then begin
+        DataSize := DataSizeBase;
+        AddrSize := AddrSizeBase;
+      end;
     end else begin
       {Line := TDisassemblerLine.Create;
@@ -149 +145 @@
       Output.Add(Line);
       }
-    end;
-    if not Prefix then begin
-      DataSize := DataSizeBase;
-      AddrSize := AddrSizeBase;
     end;
   end;