Updated instruction handlers to use Type and StructuredOperands instead of Mnemonic and Operands

X86Disassembler/X86/Handlers/Xchg/XchgEaxRegHandler.cs

@@ -1,5 +1,7 @@
 namespace X86Disassembler.X86.Handlers.Xchg;
 
+using X86Disassembler.X86.Operands;
+
 /// <summary>
 /// Handler for XCHG EAX, r32 instruction (0x90-0x97)
 /// </summary>
@@ -8,11 +10,9 @@ public class XchgEaxRegHandler : InstructionHandler
     /// <summary>
     /// Initializes a new instance of the XchgEaxRegHandler class
     /// </summary>
-    /// <param name="codeBuffer">The buffer containing the code to decode</param>
     /// <param name="decoder">The instruction decoder that owns this handler</param>
-    /// <param name="length">The length of the buffer</param>
-    public XchgEaxRegHandler(byte[] codeBuffer, InstructionDecoder decoder, int length)
-        : base(codeBuffer, decoder, length)
+    public XchgEaxRegHandler(InstructionDecoder decoder)
+        : base(decoder)
     {
     }
 
@@ -34,15 +34,22 @@ public class XchgEaxRegHandler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        // Set the mnemonic
-        instruction.Mnemonic = "xchg";
+        // Set the instruction type
+        instruction.Type = InstructionType.Xchg;
 
         // Register is encoded in the low 3 bits of the opcode
         RegisterIndex reg = (RegisterIndex) (opcode & 0x07);
-        string regName = ModRMDecoder.GetRegisterName(reg, 32);
-
-        // Set the operands
-        instruction.Operands = $"eax, {regName}";
+        
+        // Create the register operands
+        var eaxOperand = OperandFactory.CreateRegisterOperand(RegisterIndex.A);
+        var regOperand = OperandFactory.CreateRegisterOperand(reg);
+        
+        // Set the structured operands
+        instruction.StructuredOperands = 
+        [
+            eaxOperand,
+            regOperand
+        ];
 
         return true;
     }