mirrors/ParkanPlayground
0
Fork 0
mirror of https://github.com/sampletext32/ParkanPlayground.git synced 2025-05-19 11:51:17 +03:00
Code Issues Releases Activity

Simplified CmpImmWithRm8Handler by removing unnecessary raw bytes handling and improving operand formatting

Browse Source
This commit is contained in:
bird_egop 2025-04-13 23:41:30 +03:00
parent ec70b31058
commit ec1aa4a124
1 changed files with 26 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
X86Disassembler/X86/Handlers/Cmp/CmpImmWithRm8Handler.cs
View File

@ -28,7 +28,7 @@ public class CmpImmWithRm8Handler : InstructionHandler
// Check if the reg field of the ModR/M byte is 7 (CMP) // Check if the reg field of the ModR/M byte is 7 (CMP)
int position = Decoder.GetPosition(); int position = Decoder.GetPosition();
if (position >= Length) if (!Decoder.CanReadByte())
return false; return false;
byte modRM = CodeBuffer[position]; byte modRM = CodeBuffer[position];
@ -45,88 +45,51 @@ public class CmpImmWithRm8Handler : InstructionHandler
/// <returns>True if the instruction was successfully decoded</returns> /// <returns>True if the instruction was successfully decoded</returns>
public override bool Decode(byte opcode, Instruction instruction) public override bool Decode(byte opcode, Instruction instruction)
{ {
// Save the original position for raw bytes calculation
int startPosition = Decoder.GetPosition();
// Set the mnemonic // Set the mnemonic
instruction.Mnemonic = "cmp"; instruction.Mnemonic = "cmp";
if (startPosition >= Length)
{
instruction.Operands = "??";
instruction.RawBytes = new byte[] {opcode};
return true;
}
// Read the ModR/M byte // Read the ModR/M byte
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM(); var (mod, reg, rm, memOperand) = ModRMDecoder.ReadModRM();
// CMP r/m8, imm8 is encoded as 80 /7
if (reg != RegisterIndex.Bp)
{
instruction.Operands = "??";
return true;
}
// Get the position after decoding the ModR/M byte // Get the position after decoding the ModR/M byte
int newPosition = Decoder.GetPosition(); int position = Decoder.GetPosition();
// Check if we have enough bytes for the immediate value // Check if we have enough bytes for the immediate value
if (newPosition >= Length) if (position >= Length)
{ {
instruction.Operands = "??"; return false; // Not enough bytes for the immediate value
byte[] rawBytesImm = new byte[newPosition - startPosition + 1]; // +1 for opcode
rawBytesImm[0] = opcode;
for (int i = 0; i < newPosition - startPosition; i++)
{
if (startPosition + i < Length)
{
rawBytesImm[i + 1] = CodeBuffer[startPosition + i];
}
}
instruction.RawBytes = rawBytesImm;
return true;
} }
// Read the immediate byte // Read the immediate byte
byte imm8 = Decoder.ReadByte(); byte imm8 = Decoder.ReadByte();
// Replace the size prefix with "byte ptr" // Format the destination operand based on addressing mode
string operand; string destOperand;
if (destOperand.StartsWith("qword ptr ")) if (mod == 3) // Register addressing mode
{ {
operand = destOperand.Replace("qword ptr ", "byte ptr "); // Get 8-bit register name
destOperand = ModRMDecoder.GetRegisterName(rm, 8);
} }
else if (destOperand.StartsWith("dword ptr ")) else // Memory addressing mode
{ {
operand = destOperand.Replace("dword ptr ", "byte ptr "); // Ensure we have the correct size prefix (byte ptr)
} if (memOperand.Contains("dword ptr") || memOperand.Contains("qword ptr"))
else if (mod != 3) // Memory operand without prefix
{
operand = $"byte ptr {destOperand}";
}
else // Register operand
{
operand = ModRMDecoder.GetRegisterName(rm, 8);
}
// Set the operands
instruction.Operands = $"{operand}, 0x{imm8:X2}";
// Set the raw bytes
byte[] rawBytes = new byte[newPosition - startPosition + 2]; // +1 for opcode, +1 for immediate
rawBytes[0] = opcode;
for (int i = 0; i < newPosition - startPosition; i++)
{
if (startPosition + i < Length)
{ {
rawBytes[i + 1] = CodeBuffer[startPosition + i]; // 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}";
rawBytes[rawBytes.Length - 1] = imm8; // Set the operands
instruction.RawBytes = rawBytes; instruction.Operands = $"{destOperand}, {immStr}";
return true; return true;
} }