Changeset 182 for branches/virtualcpu4/UDisassembler.pas

Timestamp:

Apr 13, 2019, 1:32:32 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Allow to use multiple prefix instructions in row.

File:

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

branches/virtualcpu4/UDisassembler.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UMemory, fgl, UCpu, UInstructionReader;
+  Classes, SysUtils, UMemory, fgl, UCpu, UInstructionReader, Math;
 
 type
@@ -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 }
 
@@ -46 +54 @@
   MemorySize := MemSize(Cpu.Memory);
   while IP < MemorySize do begin
-    if DataSizePrefix <> bwNone then begin
-      DataSizeLast := DataSize;
-      DataSize := DataSizePrefix;
-      DataSizePrefix := bwNone;
-    end;
-    if AddrSizePrefix <> bwNone then begin
-      AddrSizeLast := AddrSize;
-      AddrSize := AddrSizePrefix;
-      AddrSizePrefix := bwNone;
-    end;
+    Prefix := False;
     Opcode := Read8;
     if Opcode < Integer(High(TOpcode)) then begin
+      Prefix := OpcodeDef[TOpcode(Opcode)].Prefix;
       case TOpcode(Opcode) of
-        opDataPrefix8: DataSizePrefix := bw8;
-        opDataPrefix16: DataSizePrefix := bw16;
-        opDataPrefix32: DataSizePrefix := bw32;
-        opDataPrefix64: DataSizePrefix := bw64;
-        opAddrPrefix8: AddrSizePrefix := bw8;
-        opAddrPrefix16: AddrSizePrefix := bw16;
-        opAddrPrefix32: AddrSizePrefix := bw32;
-        opAddrPrefix64: AddrSizePrefix := bw64;
+        opDataPrefix8: DataSize := bw8;
+        opDataPrefix16: DataSize := bw16;
+        opDataPrefix32: DataSize := bw32;
+        opDataPrefix64: DataSize := bw64;
+        opAddrPrefix8: AddrSize := bw8;
+        opAddrPrefix16: AddrSize := bw16;
+        opAddrPrefix32: AddrSize := bw32;
+        opAddrPrefix64: AddrSize := bw64;
       end;
       Line := TDisassemblerLine.Create;
@@ -90 +90 @@
         prAddrRel: begin
           AddressRel := ReadAddressSigned;
-          Line.Opcode := Line.Opcode + ' ' + IntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
-          Line.Instruction := Line.Instruction + ' $' + IntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
+          Line.Opcode := Line.Opcode + ' ' + IntToHex(QWord(AddressRel), BitWidthBytes[AddrSize] * 2);
+          Line.Instruction := Line.Instruction + ' $' + SignedIntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
         end;
       end;
@@ -113 +113 @@
           AddressRel := ReadAddressSigned;
           Line.Opcode := Line.Opcode + ' ' + IntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
-          Line.Instruction := Line.Instruction + ', $' + IntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
+          Line.Instruction := Line.Instruction + ', $' + SignedIntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
         end;
       end;
@@ -134 +134 @@
         prAddrRel: begin
           AddressRel := ReadAddressSigned;
-          Line.Opcode := Line.Opcode + ' ' + IntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
-          Line.Instruction := Line.Instruction + ', $' + IntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
+          Line.Opcode := Line.Opcode + ' ' + IntToHex(QWord(AddressRel), BitWidthBytes[AddrSize] * 2);
+          Line.Instruction := Line.Instruction + ', $' + SignedIntToHex(AddressRel, BitWidthBytes[AddrSize] * 2);
         end;
       end;
@@ -147 +147 @@
       }
     end;
-    if DataSizeLast <> bwNone then begin
-      DataSize := DataSizeLast;
-      DataSizeLast := bwNone;
-    end;
-    if AddrSizeLast <> bwNone then begin
-      AddrSize := AddrSizeLast;
-      AddrSizeLast := bwNone;
+    if not Prefix then begin
+      DataSize := DataSizeBase;
+      AddrSize := AddrSizeBase;
     end;
   end;