0
mirror of https://github.com/sampletext32/ParkanPlayground.git synced 2025-05-19 03:41:18 +03:00

broken tests

This commit is contained in:
bird_egop 2025-04-13 20:20:51 +03:00
parent 89b2b32cd6
commit 59df064ca4
5 changed files with 119 additions and 57 deletions

View File

@ -176,18 +176,18 @@ public class InstructionHandlerFactory
/// </summary>
private void RegisterXorHandlers()
{
// 32-bit handlers
_handlers.Add(new XorMemRegHandler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorRegMemHandler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorImmWithRm32Handler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorImmWithRm32SignExtendedHandler(_codeBuffer, _decoder, _length));
// 16-bit handlers
_handlers.Add(new XorRm16R16Handler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorR16Rm16Handler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorImmWithRm16Handler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorImmWithRm16SignExtendedHandler(_codeBuffer, _decoder, _length));
// 32-bit handlers
_handlers.Add(new XorMemRegHandler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorRegMemHandler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorImmWithRm32Handler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorImmWithRm32SignExtendedHandler(_codeBuffer, _decoder, _length));
// 8-bit handlers
_handlers.Add(new XorRm8R8Handler(_codeBuffer, _decoder, _length));
_handlers.Add(new XorR8Rm8Handler(_codeBuffer, _decoder, _length));

View File

@ -71,7 +71,18 @@ public class XorImmWithRm16SignExtendedHandler : InstructionHandler
short imm16 = (sbyte)Decoder.ReadByte();
// Format the immediate value
string immStr = $"0x{(ushort)imm16:X4}";
// 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}";
}
// Set the operands
instruction.Operands = $"{destOperand}, {immStr}";

View File

@ -58,6 +58,23 @@ public class XorImmWithRm8Handler : InstructionHandler
// Read the ModR/M byte
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
// Advance past the ModR/M byte
Decoder.SetPosition(position + 1);
// If mod == 3, then the r/m field specifies a register
if (mod == 3)
{
// Get the r/m register name (8-bit)
destOperand = ModRMDecoder.GetRegisterName(rm, 8);
}
else
{
// For memory operands, use the ModRMDecoder to get the full operand string
// Replace "dword ptr" with "byte ptr" to indicate 8-bit operation
destOperand = destOperand.Replace("dword ptr", "byte ptr");
}
// Get the updated position after ModR/M decoding
position = Decoder.GetPosition();

View File

@ -45,13 +45,30 @@ public class XorR8Rm8Handler : InstructionHandler
}
// Read the ModR/M byte
var (mod, reg, rm, memOperand) = ModRMDecoder.ReadModRM();
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
// Get register name
// Advance past the ModR/M byte
Decoder.SetPosition(position + 1);
// Get register name (8-bit)
string regName = ModRMDecoder.GetRegisterName(reg, 8);
// If mod == 3, then the r/m field specifies a register
if (mod == 3)
{
// Get the r/m register name (8-bit)
string rmRegName = ModRMDecoder.GetRegisterName(rm, 8);
// Set the operands
instruction.Operands = $"{regName}, {memOperand}";
instruction.Operands = $"{regName}, {rmRegName}";
return true;
}
// Replace "dword ptr" with "byte ptr" to indicate 8-bit operation
string byteOperand = destOperand.Replace("dword ptr", "byte ptr");
// Set the operands
instruction.Operands = $"{regName}, {byteOperand}";
return true;
}

View File

@ -45,13 +45,30 @@ public class XorRm8R8Handler : InstructionHandler
}
// Read the ModR/M byte
var (mod, reg, rm, memOperand) = ModRMDecoder.ReadModRM();
var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
// Get register name
// Advance past the ModR/M byte
Decoder.SetPosition(position + 1);
// Get register name (8-bit)
string regName = ModRMDecoder.GetRegisterName(reg, 8);
// If mod == 3, then the r/m field specifies a register
if (mod == 3)
{
// Get the r/m register name (8-bit)
string rmRegName = ModRMDecoder.GetRegisterName(rm, 8);
// Set the operands
instruction.Operands = $"{memOperand}, {regName}";
instruction.Operands = $"{rmRegName}, {regName}";
return true;
}
// Replace "dword ptr" with "byte ptr" to indicate 8-bit operation
string byteOperand = destOperand.Replace("dword ptr", "byte ptr");
// Set the operands
instruction.Operands = $"{byteOperand}, {regName}";
return true;
}