mirror of
https://github.com/sampletext32/ParkanPlayground.git
synced 2025-12-11 04:51:21 +04: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.Xor;
|
||||
|
||||
/// <summary>
|
||||
@@ -8,11 +10,9 @@ public class XorImmWithRm16SignExtendedHandler : InstructionHandler
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the XorImmWithRm16SignExtendedHandler 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 XorImmWithRm16SignExtendedHandler(byte[] codeBuffer, InstructionDecoder decoder, int length)
|
||||
: base(codeBuffer, decoder, length)
|
||||
public XorImmWithRm16SignExtendedHandler(InstructionDecoder decoder)
|
||||
: base(decoder)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ public class XorImmWithRm16SignExtendedHandler : InstructionHandler
|
||||
if (!Decoder.CanReadByte())
|
||||
return false;
|
||||
|
||||
byte modRM = CodeBuffer[Decoder.GetPosition()];
|
||||
byte modRM = Decoder.PeakByte();
|
||||
byte reg = (byte)((modRM & 0x38) >> 3);
|
||||
|
||||
return reg == 6; // 6 = XOR
|
||||
@@ -44,8 +44,8 @@ public class XorImmWithRm16SignExtendedHandler : InstructionHandler
|
||||
/// <returns>True if the instruction was successfully decoded</returns>
|
||||
public override bool Decode(byte opcode, Instruction instruction)
|
||||
{
|
||||
// Set the mnemonic
|
||||
instruction.Mnemonic = "xor";
|
||||
// Set the instruction type
|
||||
instruction.Type = InstructionType.Xor;
|
||||
|
||||
if (!Decoder.CanReadByte())
|
||||
{
|
||||
@@ -53,27 +53,13 @@ public class XorImmWithRm16SignExtendedHandler : InstructionHandler
|
||||
}
|
||||
|
||||
// Read the ModR/M byte
|
||||
var (mod, reg, rm, memOperand) = ModRMDecoder.ReadModRM();
|
||||
// For XOR r/m16, imm8 (sign-extended) (0x83 /6 with 0x66 prefix):
|
||||
// - The r/m field with mod specifies the destination operand (register or memory)
|
||||
// - The immediate value is the source operand (sign-extended from 8 to 16 bits)
|
||||
var (mod, reg, rm, destinationOperand) = ModRMDecoder.ReadModRM();
|
||||
|
||||
// For the first operand, handle based on addressing mode
|
||||
string rmOperand;
|
||||
if (mod == 3) // Register addressing mode
|
||||
{
|
||||
// Get 16-bit register name for the operand
|
||||
rmOperand = ModRMDecoder.GetRegisterName(rm, 16);
|
||||
}
|
||||
else // Memory addressing mode
|
||||
{
|
||||
// For memory operands, replace "dword ptr" with "word ptr"
|
||||
if (memOperand.StartsWith("dword ptr "))
|
||||
{
|
||||
rmOperand = memOperand.Replace("dword ptr", "word ptr");
|
||||
}
|
||||
else
|
||||
{
|
||||
rmOperand = memOperand;
|
||||
}
|
||||
}
|
||||
// Adjust the operand size to 16-bit
|
||||
destinationOperand.Size = 16;
|
||||
|
||||
// Read the immediate value (sign-extended from 8 to 16 bits)
|
||||
if (!Decoder.CanReadByte())
|
||||
@@ -81,24 +67,18 @@ public class XorImmWithRm16SignExtendedHandler : InstructionHandler
|
||||
return false;
|
||||
}
|
||||
|
||||
// Read the immediate value as a signed byte and automatically sign-extend it to short
|
||||
short imm16 = (sbyte)Decoder.ReadByte();
|
||||
|
||||
// Format the immediate value
|
||||
// For 16-bit operations, we want to show the immediate value without leading zeros
|
||||
string immStr;
|
||||
if (imm16 < 0)
|
||||
{
|
||||
// For negative values, show the full sign-extended 16-bit value
|
||||
immStr = $"0x{(ushort)imm16:X}";
|
||||
}
|
||||
else
|
||||
{
|
||||
// For positive values, show without leading zeros
|
||||
immStr = $"0x{imm16:X}";
|
||||
}
|
||||
// Create the source immediate operand with the sign-extended value
|
||||
var sourceOperand = OperandFactory.CreateImmediateOperand(imm16, 16);
|
||||
|
||||
// Set the operands
|
||||
instruction.Operands = $"{rmOperand}, {immStr}";
|
||||
// Set the structured operands
|
||||
instruction.StructuredOperands =
|
||||
[
|
||||
destinationOperand,
|
||||
sourceOperand
|
||||
];
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user