mirror of
https://github.com/sampletext32/ParkanPlayground.git
synced 2025-06-20 08:18:36 +03:00
nice big refactor
This commit is contained in:
@ -42,8 +42,7 @@ public class OrAlImmHandler : InstructionHandler
|
||||
}
|
||||
|
||||
// Read the immediate byte
|
||||
byte imm8 = CodeBuffer[position++];
|
||||
Decoder.SetPosition(position);
|
||||
byte imm8 = Decoder.ReadByte();
|
||||
|
||||
// Set the mnemonic
|
||||
instruction.Mnemonic = "or";
|
||||
|
@ -42,12 +42,8 @@ public class OrEaxImmHandler : InstructionHandler
|
||||
}
|
||||
|
||||
// Read the immediate dword (little-endian)
|
||||
byte b0 = CodeBuffer[position++];
|
||||
byte b1 = CodeBuffer[position++];
|
||||
byte b2 = CodeBuffer[position++];
|
||||
byte b3 = CodeBuffer[position++];
|
||||
uint imm32 = (uint)(b0 | (b1 << 8) | (b2 << 16) | (b3 << 24));
|
||||
Decoder.SetPosition(position);
|
||||
|
||||
uint imm32 = Decoder.ReadUInt32();
|
||||
|
||||
// Set the mnemonic
|
||||
instruction.Mnemonic = "or";
|
||||
|
@ -11,11 +11,11 @@ public class OrImmToRm32Handler : InstructionHandler
|
||||
/// <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 OrImmToRm32Handler(byte[] codeBuffer, InstructionDecoder decoder, int length)
|
||||
public OrImmToRm32Handler(byte[] codeBuffer, InstructionDecoder decoder, int length)
|
||||
: base(codeBuffer, decoder, length)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Checks if this handler can decode the given opcode
|
||||
/// </summary>
|
||||
@ -25,18 +25,18 @@ public class OrImmToRm32Handler : InstructionHandler
|
||||
{
|
||||
if (opcode != 0x81)
|
||||
return false;
|
||||
|
||||
|
||||
// Check if the reg field of the ModR/M byte is 1 (OR)
|
||||
int position = Decoder.GetPosition();
|
||||
if (position >= Length)
|
||||
return false;
|
||||
|
||||
|
||||
byte modRM = CodeBuffer[position];
|
||||
byte reg = (byte)((modRM & 0x38) >> 3);
|
||||
|
||||
byte reg = (byte) ((modRM & 0x38) >> 3);
|
||||
|
||||
return reg == 1; // 1 = OR
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Decodes an OR r/m32, imm32 instruction
|
||||
/// </summary>
|
||||
@ -47,38 +47,29 @@ public class OrImmToRm32Handler : InstructionHandler
|
||||
{
|
||||
// Set the mnemonic
|
||||
instruction.Mnemonic = "or";
|
||||
|
||||
int position = Decoder.GetPosition();
|
||||
|
||||
if (position >= Length)
|
||||
|
||||
if (Decoder.GetPosition() >= 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); // Should be 1 for OR
|
||||
byte rm = (byte)(modRM & 0x07);
|
||||
|
||||
// Decode the destination operand
|
||||
string destOperand = ModRMDecoder.DecodeModRM(mod, rm, false);
|
||||
|
||||
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
|
||||
|
||||
int position = Decoder.GetPosition();
|
||||
|
||||
// Read the immediate value
|
||||
if (position + 3 >= Length)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
uint imm32 = BitConverter.ToUInt32(CodeBuffer, position);
|
||||
Decoder.SetPosition(position + 4);
|
||||
|
||||
|
||||
// Set the operands
|
||||
instruction.Operands = $"{destOperand}, 0x{imm32:X8}";
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
@ -11,11 +11,11 @@ public class OrImmToRm32SignExtendedHandler : InstructionHandler
|
||||
/// <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 OrImmToRm32SignExtendedHandler(byte[] codeBuffer, InstructionDecoder decoder, int length)
|
||||
public OrImmToRm32SignExtendedHandler(byte[] codeBuffer, InstructionDecoder decoder, int length)
|
||||
: base(codeBuffer, decoder, length)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Checks if this handler can decode the given opcode
|
||||
/// </summary>
|
||||
@ -25,18 +25,18 @@ public class OrImmToRm32SignExtendedHandler : InstructionHandler
|
||||
{
|
||||
if (opcode != 0x83)
|
||||
return false;
|
||||
|
||||
|
||||
// Check if the reg field of the ModR/M byte is 1 (OR)
|
||||
int position = Decoder.GetPosition();
|
||||
if (position >= Length)
|
||||
return false;
|
||||
|
||||
|
||||
byte modRM = CodeBuffer[position];
|
||||
byte reg = (byte)((modRM & 0x38) >> 3);
|
||||
|
||||
byte reg = (byte) ((modRM & 0x38) >> 3);
|
||||
|
||||
return reg == 1; // 1 = OR
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Decodes an OR r/m32, imm8 (sign-extended) instruction
|
||||
/// </summary>
|
||||
@ -47,39 +47,29 @@ public class OrImmToRm32SignExtendedHandler : InstructionHandler
|
||||
{
|
||||
// Set the mnemonic
|
||||
instruction.Mnemonic = "or";
|
||||
|
||||
|
||||
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); // Should be 1 for OR
|
||||
byte rm = (byte)(modRM & 0x07);
|
||||
|
||||
// Decode the destination operand
|
||||
string destOperand = ModRMDecoder.DecodeModRM(mod, rm, false);
|
||||
|
||||
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
|
||||
|
||||
// Read the immediate value (sign-extended from 8 to 32 bits)
|
||||
if (position >= Length)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
sbyte imm8 = (sbyte)CodeBuffer[position];
|
||||
int imm32 = imm8; // Sign-extend to 32 bits
|
||||
Decoder.SetPosition(position + 1);
|
||||
|
||||
|
||||
// Sign-extend to 32 bits
|
||||
int imm32 = (sbyte) Decoder.ReadByte();
|
||||
|
||||
// Set the operands
|
||||
instruction.Operands = $"{destOperand}, 0x{imm32:X8}";
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
@ -11,11 +11,11 @@ public class OrImmToRm8Handler : InstructionHandler
|
||||
/// <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 OrImmToRm8Handler(byte[] codeBuffer, InstructionDecoder decoder, int length)
|
||||
public OrImmToRm8Handler(byte[] codeBuffer, InstructionDecoder decoder, int length)
|
||||
: base(codeBuffer, decoder, length)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Checks if this handler can decode the given opcode
|
||||
/// </summary>
|
||||
@ -25,18 +25,18 @@ public class OrImmToRm8Handler : InstructionHandler
|
||||
{
|
||||
if (opcode != 0x80)
|
||||
return false;
|
||||
|
||||
|
||||
// Check if the reg field of the ModR/M byte is 1 (OR)
|
||||
int position = Decoder.GetPosition();
|
||||
if (position >= Length)
|
||||
return false;
|
||||
|
||||
|
||||
byte modRM = CodeBuffer[position];
|
||||
byte reg = (byte)((modRM & 0x38) >> 3);
|
||||
|
||||
byte reg = (byte) ((modRM & 0x38) >> 3);
|
||||
|
||||
return reg == 1; // 1 = OR
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Decodes an OR r/m8, imm8 instruction
|
||||
/// </summary>
|
||||
@ -47,49 +47,37 @@ public class OrImmToRm8Handler : InstructionHandler
|
||||
{
|
||||
// Set the mnemonic
|
||||
instruction.Mnemonic = "or";
|
||||
|
||||
|
||||
int position = Decoder.GetPosition();
|
||||
|
||||
|
||||
if (position >= Length)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Read the ModR/M byte
|
||||
byte modRM = CodeBuffer[position++];
|
||||
|
||||
// Extract the fields from the ModR/M byte
|
||||
byte mod = (byte)((modRM & 0xC0) >> 6);
|
||||
byte reg = (byte)((modRM & 0x38) >> 3); // Should be 1 for OR
|
||||
byte rm = (byte)(modRM & 0x07);
|
||||
|
||||
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
|
||||
|
||||
// For direct register addressing (mod == 3), use 8-bit register names
|
||||
string destOperand;
|
||||
if (mod == 3)
|
||||
{
|
||||
// Use 8-bit register names for direct register addressing
|
||||
destOperand = GetRegister8(rm);
|
||||
destOperand = ModRMDecoder.GetRegisterName(rm, 8);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Use ModR/M decoder for memory addressing
|
||||
destOperand = ModRMDecoder.DecodeModRM(mod, rm, false);
|
||||
}
|
||||
|
||||
Decoder.SetPosition(position);
|
||||
|
||||
// Read the immediate value
|
||||
|
||||
position = Decoder.GetPosition();
|
||||
|
||||
if (position >= Length)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
byte imm8 = CodeBuffer[position++];
|
||||
Decoder.SetPosition(position);
|
||||
|
||||
|
||||
// Read the immediate value
|
||||
byte imm8 = Decoder.ReadByte();
|
||||
|
||||
// Set the operands
|
||||
instruction.Operands = $"{destOperand}, 0x{imm8:X2}";
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
@ -42,29 +42,22 @@ public class OrR32Rm32Handler : InstructionHandler
|
||||
}
|
||||
|
||||
// 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);
|
||||
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
|
||||
|
||||
// Set the mnemonic
|
||||
instruction.Mnemonic = "or";
|
||||
|
||||
// Get the register name
|
||||
string regName = GetRegister32(reg);
|
||||
string regName = ModRMDecoder.GetRegisterName(reg, 32);
|
||||
|
||||
// For memory operands, set the operand
|
||||
if (mod != 3) // Memory operand
|
||||
{
|
||||
string operand = ModRMDecoder.DecodeModRM(mod, rm, false);
|
||||
instruction.Operands = $"{regName}, {operand}";
|
||||
instruction.Operands = $"{regName}, {destOperand}";
|
||||
}
|
||||
else // Register operand
|
||||
{
|
||||
string rmName = GetRegister32(rm);
|
||||
string rmName = ModRMDecoder.GetRegisterName(rm, 32);
|
||||
instruction.Operands = $"{regName}, {rmName}";
|
||||
}
|
||||
|
||||
|
@ -42,31 +42,24 @@ public class OrR8Rm8Handler : InstructionHandler
|
||||
}
|
||||
|
||||
// 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);
|
||||
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
|
||||
|
||||
// Set the mnemonic
|
||||
instruction.Mnemonic = "or";
|
||||
|
||||
// Get the register name
|
||||
string regName = GetRegister8(reg);
|
||||
string regName = ModRMDecoder.GetRegisterName(reg, 8);
|
||||
|
||||
// For memory operands, set the operand
|
||||
if (mod != 3) // Memory operand
|
||||
{
|
||||
string operand = ModRMDecoder.DecodeModRM(mod, rm, false);
|
||||
// Replace dword ptr with byte ptr for 8-bit operations
|
||||
operand = operand.Replace("dword ptr", "byte ptr");
|
||||
instruction.Operands = $"{regName}, {operand}";
|
||||
destOperand = destOperand.Replace("dword ptr", "byte ptr");
|
||||
instruction.Operands = $"{regName}, {destOperand}";
|
||||
}
|
||||
else // Register operand
|
||||
{
|
||||
string rmName = GetRegister8(rm);
|
||||
string rmName = ModRMDecoder.GetRegisterName(rm, 8);
|
||||
instruction.Operands = $"{regName}, {rmName}";
|
||||
}
|
||||
|
||||
|
@ -5,9 +5,6 @@ namespace X86Disassembler.X86.Handlers.Or;
|
||||
/// </summary>
|
||||
public class OrRm8R8Handler : InstructionHandler
|
||||
{
|
||||
// 8-bit register names
|
||||
private static readonly string[] RegisterNames8 = { "al", "cl", "dl", "bl", "ah", "ch", "dh", "bh" };
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the OrRm8R8Handler class
|
||||
/// </summary>
|
||||
@ -59,17 +56,10 @@ public class OrRm8R8Handler : InstructionHandler
|
||||
return true;
|
||||
}
|
||||
|
||||
// Proceed with normal ModR/M decoding
|
||||
position++;
|
||||
Decoder.SetPosition(position);
|
||||
|
||||
// Extract fields from ModR/M byte
|
||||
byte mod = (byte)((modRM & 0xC0) >> 6); // Top 2 bits
|
||||
byte reg = (byte)((modRM & 0x38) >> 3); // Middle 3 bits
|
||||
byte rm = (byte)(modRM & 0x07); // Bottom 3 bits
|
||||
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
|
||||
|
||||
// The register operand is in the reg field (8-bit register)
|
||||
string regOperand = RegisterNames8[reg];
|
||||
string regOperand = ModRMDecoder.GetRegisterName(reg, 8);
|
||||
|
||||
// Handle the r/m operand based on mod field
|
||||
string rmOperand;
|
||||
@ -77,16 +67,12 @@ public class OrRm8R8Handler : InstructionHandler
|
||||
if (mod == 3) // Register-to-register
|
||||
{
|
||||
// Direct register addressing
|
||||
rmOperand = RegisterNames8[rm];
|
||||
rmOperand = ModRMDecoder.GetRegisterName(rm, 8);
|
||||
}
|
||||
else // Memory addressing
|
||||
{
|
||||
// Use ModRMDecoder for memory addressing, but we need to adjust for 8-bit operands
|
||||
var modRMDecoder = new ModRMDecoder(CodeBuffer, Decoder, Length);
|
||||
string memOperand = modRMDecoder.DecodeModRM(mod, rm, false); // false = not 64-bit
|
||||
|
||||
// Replace "dword ptr" with "byte ptr" for 8-bit operands
|
||||
rmOperand = memOperand.Replace("dword ptr", "byte ptr");
|
||||
rmOperand = destOperand.Replace("dword ptr", "byte ptr");
|
||||
}
|
||||
|
||||
// Set the operands (r/m8, r8 format)
|
||||
|
Reference in New Issue
Block a user