mirrors/ParkanPlayground
0
Fork 0
mirror of https://github.com/sampletext32/ParkanPlayground.git synced 2025-06-20 08:18:36 +03:00
Code Issues Releases Activity

Fix x86 disassembler issues with direct memory addressing and immediate value formatting

Browse Source
This commit is contained in:
bird_egop
2025-04-15 02:29:32 +03:00
parent d351f41808
commit 3ea327064a
67 changed files with 854 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
X86Disassembler/X86/Operands/ImmediateOperand.cs
View File

@ -8,7 +8,7 @@ public class ImmediateOperand : Operand
/// <summary>
/// Gets or sets the immediate value
/// </summary>
public long Value { get; set; }
public ulong Value { get; set; }
/// <summary>
/// Initializes a new instance of the ImmediateOperand class
@ -18,7 +18,17 @@ public class ImmediateOperand : Operand
public ImmediateOperand(long value, int size = 32)
{
Type = OperandType.ImmediateValue;
Value = value;
// For negative values in 32-bit mode, convert to unsigned 32-bit representation
if (value < 0 && size == 32)
{
Value = (ulong)(uint)value; // Sign-extend to 32 bits, then store as unsigned
}
else
{
Value = (ulong)value;
}
Size = size;
}
@ -27,13 +37,51 @@ public class ImmediateOperand : Operand
/// </summary>
public override string ToString()
{
// For negative values, ensure we show the full 32-bit representation
if (Value < 0 && Size == 32)
// Mask the value based on its size
ulong maskedValue = Size switch
{
return $"0x{Value & 0xFFFFFFFF:X8}";
8 => Value & 0xFF,
16 => Value & 0xFFFF,
32 => Value & 0xFFFFFFFF,
_ => Value
};
// For 8-bit immediate values, always use at least 2 digits
if (Size == 8)
{
return $"0x{maskedValue:X2}";
}
// For positive values or other sizes, show the regular representation
return $"0x{Value:X}";
// For 16-bit immediate values, format depends on the value
if (Size == 16)
{
// For small values (< 256), show without leading zeros
if (maskedValue < 256)
{
return $"0x{maskedValue:X}";
}
// For larger values, use at least 4 digits
return $"0x{maskedValue:X4}";
}
// For 32-bit immediate values, format depends on the instruction context
if (Size == 32)
{
// For small values (0), always show as 0x00
if (maskedValue == 0)
{
return "0x00";
}
// For other small values (< 256), show as 0xNN
if (maskedValue < 256)
{
return $"0x{maskedValue:X2}";
}
}
// For larger 32-bit values, show the full 32-bit representation
return $"0x{maskedValue:X8}";
}
}