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

remove direct position changes from modrmdecoder

Browse Source
This commit is contained in:
bird_egop 2025-04-14 01:15:26 +03:00
parent 99b93523a4
commit c9e854a663
1 changed files with 96 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
X86Disassembler/X86/ModRMDecoder.cs
View File

@ -51,8 +51,9 @@ public class ModRMDecoder
/// <returns>The operand string</returns>
public string DecodeModRM(byte mod, RegisterIndex rmIndex, bool is64Bit)
{
string sizePrefix = is64Bit ? "qword" : "dword";
int position = _decoder.GetPosition();
string sizePrefix = is64Bit
? "qword"
: "dword";
switch (mod)
{
@ -60,51 +61,49 @@ public class ModRMDecoder
// Special case: [EBP] is encoded as disp32 with no base register
if (rmIndex == RegisterIndex.Di) // disp32 (was EBP/BP)
{
if (position + 4 <= _length)
if (_decoder.CanReadUInt())
{
uint disp32 = BitConverter.ToUInt32(_codeBuffer, position);
_decoder.SetPosition(position + 4);
uint disp32 = _decoder.ReadUInt32();
return $"{sizePrefix} ptr [0x{disp32:X8}]";
}
return $"{sizePrefix} ptr [???]";
}
// Special case: [ESP] is encoded with SIB byte
else if (rmIndex == RegisterIndex.Si) // SIB (was ESP/SP)
if (rmIndex == RegisterIndex.Si) // SIB (was ESP/SP)
{
// Handle SIB byte
if (position < _length)
if (_decoder.CanReadByte())
{
byte sib = _codeBuffer[position];
_decoder.SetPosition(position + 1);
byte sib = _decoder.ReadByte();
return DecodeSIB(sib, 0, is64Bit);
}
return $"{sizePrefix} ptr [???]";
}
else
{
// Regular case: [reg]
return $"{sizePrefix} ptr [{GetRegisterName(rmIndex, 32)}]";
}
case 1: // [reg + disp8]
if (rmIndex == RegisterIndex.Si) // SIB + disp8 (was ESP/SP)
{
// Handle SIB byte
if (position + 1 < _length)
if (_decoder.CanReadByte())
{
byte sib = _codeBuffer[position];
sbyte disp8 = (sbyte)_codeBuffer[position + 1];
_decoder.SetPosition(position + 2);
byte sib = _decoder.ReadByte();
uint disp8 = (uint) (sbyte) _decoder.ReadByte();
return DecodeSIB(sib, disp8, is64Bit);
}
return $"{sizePrefix} ptr [???]";
}
else
{
if (position < _length)
if (_decoder.CanReadByte())
{
sbyte disp8 = (sbyte)_codeBuffer[position];
_decoder.SetPosition(position + 1);
sbyte disp8 = (sbyte) _decoder.ReadByte();
// Only show displacement if it's not zero
if (disp8 == 0)
@ -112,9 +111,12 @@ public class ModRMDecoder
return $"{sizePrefix} ptr [{GetRegisterName(rmIndex, 32)}]";
}
string dispStr8 = disp8 < 0 ? $"-0x{-disp8:X2}" : $"+0x{disp8:X2}";
string dispStr8 = disp8 < 0
? $"-0x{-disp8:X2}"
: $"+0x{disp8:X2}";
return $"{sizePrefix} ptr [{GetRegisterName(rmIndex, 32)}{dispStr8}]";
}
return $"{sizePrefix} ptr [{GetRegisterName(rmIndex, 32)}+???]";
}
@ -122,21 +124,20 @@ public class ModRMDecoder
if (rmIndex == RegisterIndex.Si) // SIB + disp32 (was ESP/SP)
{
// Handle SIB byte
if (position + 4 < _length)
if (_decoder.CanReadUInt())
{
byte sib = _codeBuffer[position];
int disp32 = BitConverter.ToInt32(_codeBuffer, position + 1);
_decoder.SetPosition(position + 5);
byte sib = _decoder.ReadByte();
uint disp32 = _decoder.ReadUInt32();
return DecodeSIB(sib, disp32, is64Bit);
}
return $"{sizePrefix} ptr [???]";
}
else
{
if (position + 4 <= _length)
if (_decoder.CanReadUInt())
{
int disp32 = BitConverter.ToInt32(_codeBuffer, position);
_decoder.SetPosition(position + 4);
uint disp32 = _decoder.ReadUInt32();
// Only show displacement if it's not zero
if (disp32 == 0)
@ -144,14 +145,16 @@ public class ModRMDecoder
return $"{sizePrefix} ptr [{GetRegisterName(rmIndex, 32)}]";
}
string dispStr32 = disp32 < 0 ? $"-0x{-disp32:X8}" : $"+0x{disp32:X8}";
return $"{sizePrefix} ptr [{GetRegisterName(rmIndex, 32)}{dispStr32}]";
return $"{sizePrefix} ptr [{GetRegisterName(rmIndex, 32)}+0x{disp32:X8}]";
}
return $"{sizePrefix} ptr [{GetRegisterName(rmIndex, 32)}+???]";
}
case 3: // reg (direct register access)
return is64Bit ? $"mm{(int)rmIndex}" : GetRegisterName(rmIndex, 32);
return is64Bit
? $"mm{(int) rmIndex}"
: GetRegisterName(rmIndex, 32);
default:
return "???";
@ -165,15 +168,12 @@ public class ModRMDecoder
/// <returns>A tuple containing the mod, reg, rm fields and the decoded operand string</returns>
public (byte mod, RegisterIndex reg, RegisterIndex rm, string operand) ReadModRM(bool is64Bit = false)
{
int position = _decoder.GetPosition();
if (position >= _length)
if (!_decoder.CanReadByte())
{
return (0, RegisterIndex.A, RegisterIndex.A, "???");
}
byte modRM = _codeBuffer[position];
_decoder.SetPosition(position + 1);
byte modRM = _decoder.ReadByte();
// Extract fields from ModR/M byte
byte mod = (byte) ((modRM & MOD_MASK) >> 6);
@ -192,10 +192,11 @@ public class ModRMDecoder
/// <param name="displacement">The displacement value</param>
/// <param name="is64Bit">True if the operand is 64-bit</param>
/// <returns>The decoded SIB string</returns>
private string DecodeSIB(byte sib, int displacement, bool is64Bit)
private string DecodeSIB(byte sib, uint displacement, bool is64Bit)
{
string sizePrefix = is64Bit ? "qword" : "dword";
int position = _decoder.GetPosition();
string sizePrefix = is64Bit
? "qword"
: "dword";
// Extract fields from SIB byte
byte scale = (byte) ((sib & SIB_SCALE_MASK) >> 6);
@ -208,16 +209,15 @@ public class ModRMDecoder
// Special case: EBP/BP (5) in base field with no displacement means disp32 only
if (@base == RegisterIndex.Di && displacement == 0)
{
if (position + 4 <= _length)
if (_decoder.CanReadUInt())
{
uint disp32 = BitConverter.ToUInt32(_codeBuffer, position);
_decoder.SetPosition(position + 4);
uint disp32 = _decoder.ReadUInt32();
return $"{sizePrefix} ptr [0x{disp32:X8}]";
}
return $"{sizePrefix} ptr [???]";
}
else
{
// Base register only
// Only show displacement if it's not zero
if (displacement == 0)
@ -225,18 +225,16 @@ public class ModRMDecoder
return $"{sizePrefix} ptr [{GetRegisterName(@base, 32)}]";
}
string baseDispStr = displacement < 0 ?
$"-0x{-displacement:X}" :
$"+0x{displacement:X}";
return $"{sizePrefix} ptr [{GetRegisterName(@base, 32)}{baseDispStr}]";
}
return $"{sizePrefix} ptr [{GetRegisterName(@base, 32)}+0x{displacement:X}]";
}
// Normal case with base and index registers
int scaleFactor = 1 << scale; // 1, 2, 4, or 8
// Only include the scale factor if it's not 1
string scaleStr = scaleFactor > 1 ? $"*{scaleFactor}" : "";
string scaleStr = scaleFactor > 1
? $"*{scaleFactor}"
: "";
// Only show displacement if it's not zero
if (displacement == 0)
@ -244,11 +242,7 @@ public class ModRMDecoder
return $"{sizePrefix} ptr [{GetRegisterName(@base, 32)}+{GetRegisterName(index, 32)}{scaleStr}]";
}
string indexDispStr = displacement < 0 ?
$"-0x{-displacement:X}" :
$"+0x{displacement:X}";
return $"{sizePrefix} ptr [{GetRegisterName(@base, 32)}+{GetRegisterName(index, 32)}{scaleStr}{indexDispStr}]";
return $"{sizePrefix} ptr [{GetRegisterName(@base, 32)}+{GetRegisterName(index, 32)}{scaleStr}+0x{displacement:X}]";
}
/// <summary>