Added support for CALL r/m32 (0xFF /2) and ADD r32, r/m32 (0x03) instructions with tests

X86Disassembler/X86/Handlers/Add/AddR32Rm32Handler.cs

@@ -0,0 +1,73 @@
+namespace X86Disassembler.X86.Handlers.Add;
+
+/// <summary>
+/// Handler for ADD r32, r/m32 instruction (0x03)
+/// </summary>
+public class AddR32Rm32Handler : InstructionHandler
+{
+    /// <summary>
+    /// Initializes a new instance of the AddR32Rm32Handler 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 AddR32Rm32Handler(byte[] codeBuffer, InstructionDecoder decoder, int length)
+        : base(codeBuffer, decoder, length)
+    {
+    }
+
+    /// <summary>
+    /// Checks if this handler can decode the given opcode
+    /// </summary>
+    /// <param name="opcode">The opcode to check</param>
+    /// <returns>True if this handler can decode the opcode</returns>
+    public override bool CanHandle(byte opcode)
+    {
+        return opcode == 0x03;
+    }
+
+    /// <summary>
+    /// Decodes an ADD r32, r/m32 instruction
+    /// </summary>
+    /// <param name="opcode">The opcode of the instruction</param>
+    /// <param name="instruction">The instruction object to populate</param>
+    /// <returns>True if the instruction was successfully decoded</returns>
+    public override bool Decode(byte opcode, Instruction instruction)
+    {
+        int position = Decoder.GetPosition();
+
+        if (position >= Length)
+        {
+            return false;
+        }
+
+        // Read the ModR/M byte
+        byte modRM = CodeBuffer[position++];
+        Decoder.SetPosition(position);
+
+        // Extract the fields from the ModR/M byte
+        byte mod = (byte)((modRM & 0xC0) >> 6);
+        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte rm = (byte)(modRM & 0x07);
+
+        // Set the mnemonic
+        instruction.Mnemonic = "add";
+
+        // Get the register name
+        string regName = GetRegister32(reg);
+
+        // For memory operands, set the operand
+        if (mod != 3) // Memory operand
+        {
+            string operand = ModRMDecoder.DecodeModRM(mod, rm, false);
+            instruction.Operands = $"{regName}, {operand}";
+        }
+        else // Register operand
+        {
+            string rmName = GetRegister32(rm);
+            instruction.Operands = $"{regName}, {rmName}";
+        }
+
+        return true;
+    }
+}

X86Disassembler/X86/Handlers/Group5/CallRm32Handler.cs

@@ -0,0 +1,76 @@
+namespace X86Disassembler.X86.Handlers.Group5;
+
+/// <summary>
+/// Handler for CALL r/m32 instruction (0xFF /2)
+/// </summary>
+public class CallRm32Handler : InstructionHandler
+{
+    /// <summary>
+    /// Initializes a new instance of the CallRm32Handler 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 CallRm32Handler(byte[] codeBuffer, InstructionDecoder decoder, int length)
+        : base(codeBuffer, decoder, length)
+    {
+    }
+
+    /// <summary>
+    /// Checks if this handler can decode the given opcode
+    /// </summary>
+    /// <param name="opcode">The opcode to check</param>
+    /// <returns>True if this handler can decode the opcode</returns>
+    public override bool CanHandle(byte opcode)
+    {
+        return opcode == 0xFF;
+    }
+
+    /// <summary>
+    /// Decodes a CALL r/m32 instruction
+    /// </summary>
+    /// <param name="opcode">The opcode of the instruction</param>
+    /// <param name="instruction">The instruction object to populate</param>
+    /// <returns>True if the instruction was successfully decoded</returns>
+    public override bool Decode(byte opcode, Instruction instruction)
+    {
+        int position = Decoder.GetPosition();
+
+        if (position >= Length)
+        {
+            return false;
+        }
+
+        // Read the ModR/M byte
+        byte modRM = CodeBuffer[position++];
+        Decoder.SetPosition(position);
+
+        // Extract the fields from the ModR/M byte
+        byte mod = (byte)((modRM & 0xC0) >> 6);
+        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte rm = (byte)(modRM & 0x07);
+
+        // CALL r/m32 is encoded as FF /2
+        if (reg != 2)
+        {
+            return false;
+        }
+
+        // Set the mnemonic
+        instruction.Mnemonic = "call";
+
+        // For memory operands, set the operand
+        if (mod != 3) // Memory operand
+        {
+            string operand = ModRMDecoder.DecodeModRM(mod, rm, false);
+            instruction.Operands = operand;
+        }
+        else // Register operand
+        {
+            string rmName = GetRegister32(rm);
+            instruction.Operands = rmName;
+        }
+
+        return true;
+    }
+}

X86Disassembler/X86/Handlers/InstructionHandlerFactory.cs

@@ -1,9 +1,11 @@
+using X86Disassembler.X86.Handlers.Add;
 using X86Disassembler.X86.Handlers.ArithmeticImmediate;
 using X86Disassembler.X86.Handlers.ArithmeticUnary;
 using X86Disassembler.X86.Handlers.Call;
 using X86Disassembler.X86.Handlers.Cmp;
 using X86Disassembler.X86.Handlers.Dec;
 using X86Disassembler.X86.Handlers.FloatingPoint;
+using X86Disassembler.X86.Handlers.Group5;
 using X86Disassembler.X86.Handlers.Jump;
 using X86Disassembler.X86.Handlers.Lea;
 using X86Disassembler.X86.Handlers.Mov;
@@ -81,6 +83,12 @@ public class InstructionHandlerFactory
         // Register Dec handlers
         RegisterDecHandlers();
         
+        // Register Add handlers
+        RegisterAddHandlers();
+        
+        // Register Group5 handlers
+        RegisterGroup5Handlers();
+        
         // Register Data Transfer handlers
         RegisterDataTransferHandlers();
         
@@ -251,6 +259,24 @@ public class InstructionHandlerFactory
         _handlers.Add(new DecRegHandler(_codeBuffer, _decoder, _length));
     }
     
+    /// <summary>
+    /// Registers all Add instruction handlers
+    /// </summary>
+    private void RegisterAddHandlers()
+    {
+        // Add Add handlers
+        _handlers.Add(new AddR32Rm32Handler(_codeBuffer, _decoder, _length));
+    }
+    
+    /// <summary>
+    /// Registers all Group5 instruction handlers
+    /// </summary>
+    private void RegisterGroup5Handlers()
+    {
+        // Add Group5 handlers
+        _handlers.Add(new CallRm32Handler(_codeBuffer, _decoder, _length));
+    }
+    
     /// <summary>
     /// Registers all Data Transfer instruction handlers
     /// </summary>

X86Disassembler/X86/OpcodeMap.cs

@@ -72,6 +72,14 @@ public static class OpcodeMap
         OneByteOpcodes[0x4E] = "dec"; // DEC ESI
         OneByteOpcodes[0x4F] = "dec"; // DEC EDI
         
+        // ADD instructions
+        OneByteOpcodes[0x00] = "add"; // ADD r/m8, r8
+        OneByteOpcodes[0x01] = "add"; // ADD r/m32, r32
+        OneByteOpcodes[0x02] = "add"; // ADD r8, r/m8
+        OneByteOpcodes[0x03] = "add"; // ADD r32, r/m32
+        OneByteOpcodes[0x04] = "add"; // ADD AL, imm8
+        OneByteOpcodes[0x05] = "add"; // ADD EAX, imm32
+        
         // Group 1 instructions (ADD, OR, ADC, SBB, AND, SUB, XOR, CMP)
         OneByteOpcodes[0x80] = "group1b";
         OneByteOpcodes[0x81] = "group1d";
@@ -81,6 +89,9 @@ public static class OpcodeMap
         OneByteOpcodes[0xF6] = "group3b"; // 8-bit operations
         OneByteOpcodes[0xF7] = "group3d"; // 32-bit operations
         
+        // Group 5 instructions (INC, DEC, CALL, CALL, JMP, JMP, PUSH)
+        OneByteOpcodes[0xFF] = "group5";
+        
         // TEST instructions
         OneByteOpcodes[0x84] = "test"; // TEST r/m8, r8
         OneByteOpcodes[0x85] = "test"; // TEST r/m32, r32

X86DisassemblerTests/AddInstructionTests.cs

@@ -0,0 +1,49 @@
+namespace X86DisassemblerTests;
+
+using System;
+using Xunit;
+using X86Disassembler.X86;
+
+/// <summary>
+/// Tests for ADD instruction handlers
+/// </summary>
+public class AddInstructionTests
+{
+    /// <summary>
+    /// Tests the ADD r32, r/m32 instruction (0x03) with register operand
+    /// </summary>
+    [Fact]
+    public void TestAddR32Rm32_Register()
+    {
+        // Arrange
+        byte[] code = { 0x03, 0xF5 }; // ADD ESI, EBP
+        
+        // Act
+        Disassembler disassembler = new Disassembler(code, 0x1000);
+        var instructions = disassembler.Disassemble();
+        
+        // Assert
+        Assert.Single(instructions);
+        Assert.Equal("add", instructions[0].Mnemonic);
+        Assert.Equal("esi, ebp", instructions[0].Operands);
+    }
+    
+    /// <summary>
+    /// Tests the ADD r32, m32 instruction (0x03) with memory operand
+    /// </summary>
+    [Fact]
+    public void TestAddR32M32()
+    {
+        // Arrange
+        byte[] code = { 0x03, 0x00 }; // ADD EAX, DWORD PTR [EAX]
+        
+        // Act
+        Disassembler disassembler = new Disassembler(code, 0x1000);
+        var instructions = disassembler.Disassemble();
+        
+        // Assert
+        Assert.Single(instructions);
+        Assert.Equal("add", instructions[0].Mnemonic);
+        Assert.Equal("eax, dword ptr [eax]", instructions[0].Operands);
+    }
+}

X86DisassemblerTests/CallRm32Tests.cs

@@ -0,0 +1,49 @@
+namespace X86DisassemblerTests;
+
+using System;
+using Xunit;
+using X86Disassembler.X86;
+
+/// <summary>
+/// Tests for CALL r/m32 instruction (0xFF /2)
+/// </summary>
+public class CallRm32Tests
+{
+    /// <summary>
+    /// Tests the CALL r32 instruction (0xFF /2) with register operand
+    /// </summary>
+    [Fact]
+    public void TestCallReg()
+    {
+        // Arrange
+        byte[] code = { 0xFF, 0xD3 }; // CALL EBX
+        
+        // Act
+        Disassembler disassembler = new Disassembler(code, 0x1000);
+        var instructions = disassembler.Disassemble();
+        
+        // Assert
+        Assert.Single(instructions);
+        Assert.Equal("call", instructions[0].Mnemonic);
+        Assert.Equal("ebx", instructions[0].Operands);
+    }
+    
+    /// <summary>
+    /// Tests the CALL m32 instruction (0xFF /2) with memory operand
+    /// </summary>
+    [Fact]
+    public void TestCallMem()
+    {
+        // Arrange
+        byte[] code = { 0xFF, 0x10 }; // CALL DWORD PTR [EAX]
+        
+        // Act
+        Disassembler disassembler = new Disassembler(code, 0x1000);
+        var instructions = disassembler.Disassemble();
+        
+        // Assert
+        Assert.Single(instructions);
+        Assert.Equal("call", instructions[0].Mnemonic);
+        Assert.Equal("dword ptr [eax]", instructions[0].Operands);
+    }
+}