mirror of
https://github.com/sampletext32/ParkanPlayground.git
synced 2025-06-20 08:18:36 +03:00
Updated instruction handlers to use Type and StructuredOperands instead of Mnemonic and Operands
This commit is contained in:
@ -1,3 +1,5 @@
|
||||
using X86Disassembler.X86.Operands;
|
||||
|
||||
namespace X86Disassembler.X86.Handlers.Cmp;
|
||||
|
||||
/// <summary>
|
||||
@ -8,11 +10,9 @@ public class CmpImmWithRm8Handler : InstructionHandler
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the CmpImmWithRm8Handler 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 CmpImmWithRm8Handler(byte[] codeBuffer, InstructionDecoder decoder, int length)
|
||||
: base(codeBuffer, decoder, length)
|
||||
public CmpImmWithRm8Handler(InstructionDecoder decoder)
|
||||
: base(decoder)
|
||||
{
|
||||
}
|
||||
|
||||
@ -27,11 +27,10 @@ public class CmpImmWithRm8Handler : InstructionHandler
|
||||
return false;
|
||||
|
||||
// Check if the reg field of the ModR/M byte is 7 (CMP)
|
||||
int position = Decoder.GetPosition();
|
||||
if (!Decoder.CanReadByte())
|
||||
return false;
|
||||
|
||||
byte modRM = CodeBuffer[position];
|
||||
byte modRM = Decoder.PeakByte();
|
||||
byte reg = (byte) ((modRM & 0x38) >> 3);
|
||||
|
||||
return reg == 7; // 7 = CMP
|
||||
@ -45,11 +44,14 @@ public class CmpImmWithRm8Handler : InstructionHandler
|
||||
/// <returns>True if the instruction was successfully decoded</returns>
|
||||
public override bool Decode(byte opcode, Instruction instruction)
|
||||
{
|
||||
// Set the mnemonic
|
||||
instruction.Mnemonic = "cmp";
|
||||
// Set the instruction type
|
||||
instruction.Type = InstructionType.Cmp;
|
||||
|
||||
// Read the ModR/M byte
|
||||
var (mod, reg, rm, memOperand) = ModRMDecoder.ReadModRM();
|
||||
var (mod, reg, rm, destinationOperand) = ModRMDecoder.ReadModRM();
|
||||
|
||||
// Ensure the destination operand has the correct size (8-bit)
|
||||
destinationOperand.Size = 8;
|
||||
|
||||
// Check if we have enough bytes for the immediate value
|
||||
if (!Decoder.CanReadByte())
|
||||
@ -59,34 +61,16 @@ public class CmpImmWithRm8Handler : InstructionHandler
|
||||
|
||||
// Read the immediate byte
|
||||
byte imm8 = Decoder.ReadByte();
|
||||
|
||||
// Format the destination operand based on addressing mode
|
||||
string destOperand;
|
||||
if (mod == 3) // Register addressing mode
|
||||
{
|
||||
// Get 8-bit register name
|
||||
destOperand = ModRMDecoder.GetRegisterName(rm, 8);
|
||||
}
|
||||
else // Memory addressing mode
|
||||
{
|
||||
// Ensure we have the correct size prefix (byte ptr)
|
||||
if (memOperand.Contains("dword ptr") || memOperand.Contains("qword ptr"))
|
||||
{
|
||||
// Replace the size prefix with "byte ptr"
|
||||
destOperand = memOperand.Replace(memOperand.StartsWith("dword") ? "dword ptr " : "qword ptr ", "byte ptr ");
|
||||
}
|
||||
else
|
||||
{
|
||||
// Add the byte ptr prefix if it doesn't have one
|
||||
destOperand = $"byte ptr {memOperand}";
|
||||
}
|
||||
}
|
||||
|
||||
// Format the immediate value
|
||||
string immStr = $"0x{imm8:X2}";
|
||||
|
||||
// Set the operands
|
||||
instruction.Operands = $"{destOperand}, {immStr}";
|
||||
// Create the source immediate operand
|
||||
var sourceOperand = OperandFactory.CreateImmediateOperand(imm8, 8);
|
||||
|
||||
// Set the structured operands
|
||||
instruction.StructuredOperands =
|
||||
[
|
||||
destinationOperand,
|
||||
sourceOperand
|
||||
];
|
||||
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user