Changeset 10 for trunk/Disassembler.pas

Timestamp:

Apr 20, 2026, 9:52:45 PM (6 days ago)

Author:

chronos

Message:

• Added: Decoding area of instructions with two prefixes.
• Modified: Improved parameter handling in disassembler.
• Modified: Improving handling of flags.

File:

• trunk/Disassembler.pas (modified) (2 diffs)

trunk/Disassembler.pas

@@ -103 +103 @@
     Value := Memory.ReadByte;
     DecodedInstruction.AddOpcode(Value);
-    if Value = $cb then begin
+    if Value = $CB then begin
       Value := Memory.ReadByte;
       DecodedInstruction.AddOpcode(Value);
       Value := $100 or Value;
     end else
-    if Value = $dd then begin
-      Value := Memory.ReadByte;
-      DecodedInstruction.AddOpcode(Value);
-      Value := $200 or Value;
+    if Value = $DD then begin
+      Value := Memory.ReadByte;
+      DecodedInstruction.AddOpcode(Value);
+      if Value = $CB then begin
+        Value := Memory.ReadByte;
+        DecodedInstruction.AddOpcode(Value);
+        Value := $500 or Value;
+      end else Value := $200 or Value;
     end else
-    if Value = $ed then begin
+    if Value = $ED then begin
       Value := Memory.ReadByte;
       DecodedInstruction.AddOpcode(Value);
       Value := $300 or Value;
     end else
-    if Value = $fd then begin
-      Value := Memory.ReadByte;
-      DecodedInstruction.AddOpcode(Value);
-      Value := $400 or Value;
+    if Value = $FD then begin
+      Value := Memory.ReadByte;
+      DecodedInstruction.AddOpcode(Value);
+      if Value = $CB then begin
+        Value := Memory.ReadByte;
+        DecodedInstruction.AddOpcode(Value);
+        Value := $600 or Value;
+      end else Value := $400 or Value;
     end;
     if (Value >= 0) and (Value <= Integer(High(TInstruction))) then begin
@@ -153 +161 @@
             DecodedInstruction.Parameters := DecodedInstruction.Parameters + '(' + IntToHex(Value, 4) + ')';
           end else
+          if InstructionInfo.Params[J] = ptDisplacement then begin
+            Value := Memory.ReadByte;
+            DecodedInstruction.AddOpcode(Value);
+            DecodedInstruction.Parameters := DecodedInstruction.Parameters + IntToStr(ShortInt(Value));
+          end else
           if InstructionInfo.Params[J] in [ptRegA, ptRegB, ptRegC, ptRegD,
-            ptRegE, ptRegH, ptRegL, ptRegBC, ptRegDE, ptRegHL, ptRegSP, ptRegIX,
-            ptRegIY,
-            ptFlagZ, ptFlagNZ, ptFlagC, ptFlagNC, ptFlagP, ptFlagPO,
-            ptRegBCIndir, ptRegDEIndir, ptRegHLIndir, ptRegSPIndir,
+            ptRegE, ptRegH, ptRegL, ptRegR, ptRegI,
+            ptRegAF, ptRegBC, ptRegDE, ptRegHL, ptRegSP, ptRegIX, ptRegIY,
+            ptRegAFPair, ptRegBCPair, ptRegDEPair, ptRegHLPair,
+            ptFlagZ, ptFlagNZ, ptFlagC, ptFlagNC, ptFlagP, ptFlagPO, ptFlagPE, ptFlagM,
+            ptRegBCIndir, ptRegDEIndir, ptRegHLIndir, ptRegSPIndir, ptRegCIndir,
             pt00, pt08, pt10, pt18, pt20, pt28, pt30, pt38,
             pt0, pt1, pt2, pt3, pt4, pt5, pt6, pt7] then begin