From 49f1d7d2218259dcd9cc89b6ecb7f5252568459e Mon Sep 17 00:00:00 2001 From: bird_egop Date: Tue, 15 Apr 2025 02:32:14 +0300 Subject: [PATCH] cleanup --- .../X86/Operands/BaseRegisterMemoryOperand.cs | 2 +- X86Disassembler/X86/Operands/DirectMemoryOperand.cs | 2 +- .../X86/Operands/DisplacementMemoryOperand.cs | 2 +- X86Disassembler/X86/Operands/MemoryOperand.cs | 12 +----------- .../X86/Operands/ScaledIndexMemoryOperand.cs | 2 +- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/X86Disassembler/X86/Operands/BaseRegisterMemoryOperand.cs b/X86Disassembler/X86/Operands/BaseRegisterMemoryOperand.cs index b48e62c..5dff8ec 100644 --- a/X86Disassembler/X86/Operands/BaseRegisterMemoryOperand.cs +++ b/X86Disassembler/X86/Operands/BaseRegisterMemoryOperand.cs @@ -29,6 +29,6 @@ public class BaseRegisterMemoryOperand : MemoryOperand public override string ToString() { var registerName = ModRMDecoder.GetRegisterName(BaseRegister, 32); - return $"{GetSegmentPrefix()}{GetSizePrefix()}[{registerName}]"; + return $"{GetSizePrefix()}[{registerName}]"; } } diff --git a/X86Disassembler/X86/Operands/DirectMemoryOperand.cs b/X86Disassembler/X86/Operands/DirectMemoryOperand.cs index 041896e..a536ed8 100644 --- a/X86Disassembler/X86/Operands/DirectMemoryOperand.cs +++ b/X86Disassembler/X86/Operands/DirectMemoryOperand.cs @@ -28,6 +28,6 @@ public class DirectMemoryOperand : MemoryOperand /// public override string ToString() { - return $"{GetSegmentPrefix()}{GetSizePrefix()}[0x{Address:X}]"; + return $"{GetSizePrefix()}[0x{Address:X}]"; } } diff --git a/X86Disassembler/X86/Operands/DisplacementMemoryOperand.cs b/X86Disassembler/X86/Operands/DisplacementMemoryOperand.cs index 9f47db8..8ab7e84 100644 --- a/X86Disassembler/X86/Operands/DisplacementMemoryOperand.cs +++ b/X86Disassembler/X86/Operands/DisplacementMemoryOperand.cs @@ -43,6 +43,6 @@ public class DisplacementMemoryOperand : MemoryOperand ? $"0x{Math.Abs(Displacement):X2}" : $"0x{Math.Abs(Displacement):X}"; - return $"{GetSegmentPrefix()}{GetSizePrefix()}[{registerName}{sign}{formattedDisplacement}]"; + return $"{GetSizePrefix()}[{registerName}{sign}{formattedDisplacement}]"; } } diff --git a/X86Disassembler/X86/Operands/MemoryOperand.cs b/X86Disassembler/X86/Operands/MemoryOperand.cs index 90b6912..c4636ef 100644 --- a/X86Disassembler/X86/Operands/MemoryOperand.cs +++ b/X86Disassembler/X86/Operands/MemoryOperand.cs @@ -20,17 +20,7 @@ public abstract class MemoryOperand : Operand Size = size; SegmentOverride = segmentOverride; } - - /// - /// Gets the segment prefix string for display - /// - /// The segment prefix string - protected string GetSegmentPrefix() - { - // Format changed to match expected test output: "dword ptr es:[ebp+0x10]" instead of "es:dword ptr [ebp+0x10]" - return ""; - } - + /// /// Gets the size prefix string for display (e.g., "byte ptr", "word ptr", "dword ptr") /// diff --git a/X86Disassembler/X86/Operands/ScaledIndexMemoryOperand.cs b/X86Disassembler/X86/Operands/ScaledIndexMemoryOperand.cs index 7537201..0b5f3bd 100644 --- a/X86Disassembler/X86/Operands/ScaledIndexMemoryOperand.cs +++ b/X86Disassembler/X86/Operands/ScaledIndexMemoryOperand.cs @@ -60,6 +60,6 @@ public class ScaledIndexMemoryOperand : MemoryOperand dispPart = $"{sign}0x{Math.Abs(Displacement):X}"; } - return $"{GetSegmentPrefix()}{GetSizePrefix()}[{baseRegPart}{indexPart}{dispPart}]"; + return $"{GetSizePrefix()}[{baseRegPart}{indexPart}{dispPart}]"; } }