more refactoring

X86Disassembler/X86/Handlers/Adc/AdcImmToRm32Handler.cs

@@ -28,7 +28,7 @@ public class AdcImmToRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 2 (ADC)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
@@ -48,9 +48,7 @@ public class AdcImmToRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "adc";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
@@ -58,8 +56,7 @@ public class AdcImmToRm32Handler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
-        // Read the immediate value
+        if (!Decoder.CanReadUInt())
-        if (position + 3 >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Adc/AdcImmToRm32SignExtendedHandler.cs

@@ -28,7 +28,7 @@ public class AdcImmToRm32SignExtendedHandler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 2 (ADC)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
@@ -48,9 +48,7 @@ public class AdcImmToRm32SignExtendedHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "adc";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
@@ -58,13 +56,12 @@ public class AdcImmToRm32SignExtendedHandler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
-        // Read the immediate value (sign-extended from 8 to 32 bits)
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
         {
             return false;
         }
 
-        // Sign-extend to 32 bits
+        // Read the immediate value (sign-extended from 8 to 32 bits)
         int imm32 = (sbyte) Decoder.ReadByte();
 
         // Set the operands

X86Disassembler/X86/Handlers/Add/AddEaxImmHandler.cs

@@ -37,12 +37,9 @@ public class AddEaxImmHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "add";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadUInt())
-        
-        // Check if we have enough bytes for the immediate value
-        if (position + 3 >= Length)
         {
-            return false; // Not enough bytes for the immediate value
+            return false;
         }
 
         // Read the 32-bit immediate value

X86Disassembler/X86/Handlers/Add/AddImmToRm32Handler.cs

@@ -28,11 +28,11 @@ public class AddImmToRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 0 (ADD)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
-        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 0; // 0 = ADD
     }
@@ -48,9 +48,7 @@ public class AddImmToRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "add";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }
@@ -59,7 +57,7 @@ public class AddImmToRm32Handler : InstructionHandler
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
         // Read the immediate value
-        if (position + 3 >= Length)
+        if (!Decoder.CanReadUInt())
         {
             return false;
         }

X86Disassembler/X86/Handlers/Add/AddImmToRm32SignExtendedHandler.cs

@@ -28,11 +28,11 @@ public class AddImmToRm32SignExtendedHandler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 0 (ADD)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
-        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 0; // 0 = ADD
     }
@@ -48,9 +48,7 @@ public class AddImmToRm32SignExtendedHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "add";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }
@@ -58,29 +56,26 @@ public class AddImmToRm32SignExtendedHandler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
-        // Get the position after decoding the ModR/M byte
-        position = Decoder.GetPosition();
-        
         // Check if we have enough bytes for the immediate value
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }
 
         // Read the immediate value as a signed byte and automatically sign-extend it to int
-        int signExtendedImm = (sbyte)Decoder.ReadByte();
+        int imm = (sbyte) Decoder.ReadByte();
 
         // Format the immediate value
         string immStr;
-        if (signExtendedImm < 0)
+        if (imm < 0)
         {
             // For negative values, use the full 32-bit representation (0xFFFFFFxx)
-            immStr = $"0x{(uint)signExtendedImm:X8}";
+            immStr = $"0x{(uint) imm:X8}";
         }
         else
         {
             // For positive values, use the regular format with leading zeros
-            immStr = $"0x{signExtendedImm:X8}";
+            immStr = $"0x{imm:X8}";
         }
 
         // Set the operands

X86Disassembler/X86/Handlers/Add/AddImmToRm8Handler.cs

@@ -28,7 +28,7 @@ public class AddImmToRm8Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 0 (ADD)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
@@ -48,9 +48,7 @@ public class AddImmToRm8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "add";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
@@ -66,7 +64,7 @@ public class AddImmToRm8Handler : InstructionHandler
         }
 
         // Read the immediate value
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }

X86Disassembler/X86/Handlers/Add/AddR32Rm32Handler.cs

@@ -34,9 +34,7 @@ public class AddR32Rm32Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Add/AddRm32R32Handler.cs

@@ -34,9 +34,7 @@ public class AddRm32R32Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/And/AndAlImmHandler.cs

@@ -37,10 +37,8 @@ public class AndAlImmHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "and";
 
-        int position = Decoder.GetPosition();
-        
         // Read immediate value
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             instruction.Operands = "al, ??";
             return true;

X86Disassembler/X86/Handlers/And/AndEaxImmHandler.cs

@@ -37,10 +37,8 @@ public class AndEaxImmHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "and";
 
-        int position = Decoder.GetPosition();
-        
         // Read immediate value
-        if (position + 3 >= Length)
+        if (!Decoder.CanReadUInt())
         {
             instruction.Operands = "eax, ??";
             return true;

X86Disassembler/X86/Handlers/And/AndImmToRm32Handler.cs

@@ -28,11 +28,11 @@ public class AndImmToRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 4 (AND)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
-        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 4; // 4 = AND
     }
@@ -48,9 +48,7 @@ public class AndImmToRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "and";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }
@@ -59,7 +57,7 @@ public class AndImmToRm32Handler : InstructionHandler
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
         // Read the immediate value
-        if (position + 3 >= Length)
+        if (!Decoder.CanReadUInt())
         {
             return false;
         }

X86Disassembler/X86/Handlers/And/AndImmToRm32SignExtendedHandler.cs

@@ -30,7 +30,7 @@ public class AndImmToRm32SignExtendedHandler : InstructionHandler
 
         // Check if we have enough bytes to read the ModR/M byte
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }
@@ -57,17 +57,13 @@ public class AndImmToRm32SignExtendedHandler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, memOperand) = ModRMDecoder.ReadModRM();
 
-        // Get the position after decoding the ModR/M byte
+        if (!Decoder.CanReadByte())
-        int position = Decoder.GetPosition();
-        
-        // Check if we have enough bytes for the immediate value
-        if (position >= Length)
         {
             return false; // Not enough bytes for the immediate value
         }
 
         // Read the immediate value as a signed byte and automatically sign-extend it to int
-        int signExtendedImm = (sbyte)Decoder.ReadByte();
+        int imm = (sbyte) Decoder.ReadByte();
 
         // Format the destination operand based on addressing mode
         string destOperand;
@@ -84,15 +80,15 @@ public class AndImmToRm32SignExtendedHandler : InstructionHandler
 
         // Format the immediate value
         string immStr;
-        if (signExtendedImm < 0)
+        if (imm < 0)
         {
             // For negative values, use the full 32-bit representation
-            immStr = $"0x{(uint)signExtendedImm:X8}";
+            immStr = $"0x{(uint) imm:X8}";
         }
         else
         {
             // For positive values, use the regular format with leading zeros
-            immStr = $"0x{signExtendedImm:X8}";
+            immStr = $"0x{imm:X8}";
         }
 
         // Set the operands

X86Disassembler/X86/Handlers/And/AndImmToRm8Handler.cs

@@ -29,12 +29,12 @@ public class AndImmToRm8Handler : InstructionHandler
         }
 
         // Check if we have enough bytes to read the ModR/M byte
-        int position = Decoder.GetPosition();
+        if (Decoder.CanReadByte())
-        if (position >= Length)
         {
             return false;
         }
 
+        int position = Decoder.GetPosition();
         // Read the ModR/M byte to check the reg field (bits 5-3)
         byte modRM = CodeBuffer[position];
         int reg = (modRM >> 3) & 0x7;
@@ -57,11 +57,7 @@ public class AndImmToRm8Handler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, memOperand) = ModRMDecoder.ReadModRM();
 
-        // Get the position after decoding the ModR/M byte
+        if (!Decoder.CanReadByte())
-        int position = Decoder.GetPosition();
-        
-        // Check if we have enough bytes for the immediate value
-        if (position >= Length)
         {
             return false; // Not enough bytes for the immediate value
         }

X86Disassembler/X86/Handlers/And/AndImmWithRm32Handler.cs

@@ -28,7 +28,7 @@ public class AndImmWithRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 4 (AND)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
@@ -55,7 +55,7 @@ public class AndImmWithRm32Handler : InstructionHandler
         int position = Decoder.GetPosition();
 
         // Check if we have enough bytes for the immediate value
-        if (position + 3 >= Length)
+        if (!Decoder.CanReadUInt())
         {
             return false; // Not enough bytes for the immediate value
         }

X86Disassembler/X86/Handlers/And/AndMemRegHandler.cs

@@ -37,9 +37,7 @@ public class AndMemRegHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "and";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/And/AndR32Rm32Handler.cs

@@ -37,9 +37,7 @@ public class AndR32Rm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "and";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/And/AndR8Rm8Handler.cs

@@ -37,9 +37,7 @@ public class AndR8Rm8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "and";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/And/AndRm8R8Handler.cs

@@ -37,9 +37,7 @@ public class AndRm8R8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "and";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/ArithmeticUnary/DivRm32Handler.cs

@@ -28,11 +28,11 @@ public class DivRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 6 (DIV)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
-        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 6; // 6 = DIV
     }
@@ -48,9 +48,7 @@ public class DivRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "div";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/ArithmeticUnary/IdivRm32Handler.cs

@@ -28,11 +28,11 @@ public class IdivRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 7 (IDIV)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
-        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 7; // 7 = IDIV
     }
@@ -48,9 +48,7 @@ public class IdivRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "idiv";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/ArithmeticUnary/ImulRm32Handler.cs

@@ -28,11 +28,11 @@ public class ImulRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 5 (IMUL)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
-        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 5; // 5 = IMUL
     }
@@ -48,9 +48,7 @@ public class ImulRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "imul";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/ArithmeticUnary/MulRm32Handler.cs

@@ -28,11 +28,11 @@ public class MulRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 4 (MUL)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
-        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 4; // 4 = MUL
     }
@@ -48,9 +48,7 @@ public class MulRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "mul";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/ArithmeticUnary/NegRm32Handler.cs

@@ -28,11 +28,11 @@ public class NegRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 3 (NEG)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
-        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 3; // 3 = NEG
     }
@@ -48,9 +48,7 @@ public class NegRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "neg";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/ArithmeticUnary/NotRm32Handler.cs

@@ -29,11 +29,11 @@ public class NotRm32Handler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 2 (NOT)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
-        byte reg = (byte)((modRM & 0x38) >> 3);
+        byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 2; // 2 = NOT
     }
@@ -46,9 +46,7 @@ public class NotRm32Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }
@@ -65,8 +63,6 @@ public class NotRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "not";
 
-        Decoder.SetPosition(position);
-        
         // For direct register addressing (mod == 3), the r/m field specifies a register
         if (mod == 3)
         {

X86Disassembler/X86/Handlers/Call/CallRel32Handler.cs

@@ -37,18 +37,18 @@ public class CallRel32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "call";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadUInt())
-        
-        if (position + 4 > Length)
         {
             return false;
         }
 
+        int position = Decoder.GetPosition();
+
         // Read the relative offset
         uint offset = Decoder.ReadUInt32();
 
         // Calculate the target address
-        uint targetAddress = (uint)(position + offset + 4);
+        uint targetAddress = (uint) (position + offset + 4);
 
         // Set the operands
         instruction.Operands = $"0x{targetAddress:X8}";

X86Disassembler/X86/Handlers/Call/CallRm32Handler.cs

@@ -34,9 +34,7 @@ public class CallRm32Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Cmp/CmpAlImmHandler.cs

@@ -37,16 +37,13 @@ public class CmpAlImmHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "cmp";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
 
         // Read the immediate value
         byte imm8 = Decoder.ReadByte();
-        Decoder.SetPosition(position);
 
         // Set the operands
         instruction.Operands = $"al, 0x{imm8:X2}";

X86Disassembler/X86/Handlers/Cmp/CmpImmWithRm32Handler.cs

@@ -27,11 +27,10 @@ public class CmpImmWithRm32Handler : InstructionHandler
             return false;
 
         // Check if the reg field of the ModR/M byte is 7 (CMP)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
 
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 7; // 7 = CMP
@@ -55,7 +54,7 @@ public class CmpImmWithRm32Handler : InstructionHandler
         int position = Decoder.GetPosition();
 
         // Check if we have enough bytes for the immediate value
-        if (position + 3 >= Length)
+        if (!Decoder.CanReadUInt())
         {
             return false; // Not enough bytes for the immediate value
         }

X86Disassembler/X86/Handlers/Cmp/CmpImmWithRm32SignExtendedHandler.cs

@@ -28,7 +28,7 @@ public class CmpImmWithRm32SignExtendedHandler : InstructionHandler
 
         // Check if the reg field of the ModR/M byte is 7 (CMP)
         int position = Decoder.GetPosition();
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
             return false;
 
         byte modRM = CodeBuffer[position];
@@ -50,7 +50,7 @@ public class CmpImmWithRm32SignExtendedHandler : InstructionHandler
 
         int position = Decoder.GetPosition();
 
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }
@@ -59,14 +59,13 @@ public class CmpImmWithRm32SignExtendedHandler : InstructionHandler
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
         // Read the immediate value
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }
 
         // Read the immediate value as a signed byte and sign-extend it
         sbyte imm8 = (sbyte) Decoder.ReadByte();
-        Decoder.SetPosition(position);
 
         // Set the operands
         instruction.Operands = $"{destOperand}, 0x{(uint) imm8:X2}";

X86Disassembler/X86/Handlers/Cmp/CmpImmWithRm8Handler.cs

@@ -55,7 +55,7 @@ public class CmpImmWithRm8Handler : InstructionHandler
         int position = Decoder.GetPosition();
 
         // Check if we have enough bytes for the immediate value
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false; // Not enough bytes for the immediate value
         }

X86Disassembler/X86/Handlers/Cmp/CmpR32Rm32Handler.cs

@@ -34,9 +34,7 @@ public class CmpR32Rm32Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Cmp/CmpRm32R32Handler.cs

@@ -37,10 +37,7 @@ public class CmpRm32R32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "cmp";
 
-        // Save the original position to properly handle the ModR/M byte
+        if (!Decoder.CanReadByte())
-        int originalPosition = Decoder.GetPosition();
-        
-        if (originalPosition >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/FloatingPoint/Float32OperationHandler.cs

@@ -47,9 +47,7 @@ public class Float32OperationHandler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/FloatingPoint/Float64OperationHandler.cs

@@ -47,9 +47,7 @@ public class Float64OperationHandler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/FloatingPoint/FnstswHandler.cs

@@ -55,15 +55,12 @@ public class FnstswHandler : InstructionHandler
         }
         
         // Verify the second byte is 0xE0
-        byte secondByte = CodeBuffer[Decoder.GetPosition()];
+        byte secondByte = Decoder.ReadByte();
         if (secondByte != 0xE0)
         {
             return false;
         }
         
-        // Skip the second byte of the opcode
-        Decoder.ReadByte(); // Consume the 0xE0 byte
-        
         // Set the mnemonic and operands
         instruction.Mnemonic = "fnstsw";
         instruction.Operands = "ax";

X86Disassembler/X86/Handlers/Lea/LeaR32MHandler.cs

@@ -34,9 +34,8 @@ public class LeaR32MHandler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        // Check if we have enough bytes for the ModR/M byte
-
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Mov/MovMemRegHandler.cs

@@ -37,9 +37,8 @@ public class MovMemRegHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "mov";
 
-        int position = Decoder.GetPosition();
+        // Check if we have enough bytes for the ModR/M byte
-
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Mov/MovRm8Imm8Handler.cs

@@ -37,9 +37,8 @@ public class MovRm8Imm8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "mov";
         
-        int position = Decoder.GetPosition();
+        // Check if we have enough bytes for the ModR/M byte
-        
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
         {
             return false;
         }
@@ -66,7 +65,7 @@ public class MovRm8Imm8Handler : InstructionHandler
         }
         
         // Read the immediate value
-        if (Decoder.GetPosition() >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }

X86Disassembler/X86/Handlers/Nop/NopHandler.cs

@@ -23,6 +23,7 @@ public class NopHandler : InstructionHandler
     /// <returns>True if this handler can decode the opcode</returns>
     public override bool CanHandle(byte opcode)
     {
+        // NOP (XCHG EAX, EAX)
         return opcode == 0x90;
     }
 

X86Disassembler/X86/Handlers/Or/OrAlImmHandler.cs

@@ -34,9 +34,7 @@ public class OrAlImmHandler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Or/OrEaxImmHandler.cs

@@ -34,9 +34,7 @@ public class OrEaxImmHandler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position + 3 >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Or/OrImmToRm32Handler.cs

@@ -27,11 +27,10 @@ public class OrImmToRm32Handler : InstructionHandler
             return false;
 
         // Check if the reg field of the ModR/M byte is 1 (OR)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
 
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 1; // 1 = OR
@@ -48,7 +47,7 @@ public class OrImmToRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "or";
 
-        if (Decoder.GetPosition() >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }
@@ -56,10 +55,7 @@ public class OrImmToRm32Handler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        // Read the immediate value
-        if (position + 3 >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Or/OrImmToRm32SignExtendedHandler.cs

@@ -27,11 +27,10 @@ public class OrImmToRm32SignExtendedHandler : InstructionHandler
             return false;
 
         // Check if the reg field of the ModR/M byte is 1 (OR)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
 
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 1; // 1 = OR

X86Disassembler/X86/Handlers/Or/OrImmToRm8Handler.cs

@@ -27,11 +27,10 @@ public class OrImmToRm8Handler : InstructionHandler
             return false;
 
         // Check if the reg field of the ModR/M byte is 1 (OR)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
 
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 1; // 1 = OR
@@ -48,9 +47,7 @@ public class OrImmToRm8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "or";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
@@ -65,9 +62,8 @@ public class OrImmToRm8Handler : InstructionHandler
             destOperand = ModRMDecoder.GetRegisterName(rm, 8);
         }
 
-        position = Decoder.GetPosition();
+        // Read the immediate value
-
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Or/OrR32Rm32Handler.cs

@@ -34,9 +34,7 @@ public class OrR32Rm32Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Or/OrR8Rm8Handler.cs

@@ -34,9 +34,7 @@ public class OrR8Rm8Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Ret/RetImmHandler.cs

@@ -37,9 +37,7 @@ public class RetImmHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "ret";
         
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadUShort())
-        
-        if (position + 2 > Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sbb/SbbImmFromRm32Handler.cs

@@ -27,11 +27,10 @@ public class SbbImmFromRm32Handler : InstructionHandler
             return false;
 
         // Check if the reg field of the ModR/M byte is 3 (SBB)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
 
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 3; // 3 = SBB
@@ -48,9 +47,7 @@ public class SbbImmFromRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "sbb";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
@@ -59,7 +56,7 @@ public class SbbImmFromRm32Handler : InstructionHandler
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
         // Read the immediate value
-        if (position + 3 >= Length)
+        if (!Decoder.CanReadUInt())
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sbb/SbbImmFromRm32SignExtendedHandler.cs

@@ -27,11 +27,10 @@ public class SbbImmFromRm32SignExtendedHandler : InstructionHandler
             return false;
 
         // Check if the reg field of the ModR/M byte is 3 (SBB)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
 
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 3; // 3 = SBB
@@ -48,9 +47,7 @@ public class SbbImmFromRm32SignExtendedHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "sbb";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
@@ -59,7 +56,7 @@ public class SbbImmFromRm32SignExtendedHandler : InstructionHandler
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
         // Read the immediate value (sign-extended from 8 to 32 bits)
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }

X86Disassembler/X86/Handlers/String/StringInstructionHandler.cs

@@ -47,17 +47,18 @@ public class StringInstructionHandler : InstructionHandler
         }
         
         // Check if the opcode is a REP/REPNE prefix followed by a string instruction
-        if (opcode == REP_PREFIX || opcode == REPNE_PREFIX)
+        if (opcode != REP_PREFIX && opcode != REPNE_PREFIX)
         {
-            int position = Decoder.GetPosition();
+            return false;
-            if (position < Length)
-            {
-                byte nextByte = CodeBuffer[position];
-                return StringInstructions.ContainsKey(nextByte);
-            }
         }
         
-        return false;
+        if (!Decoder.CanReadByte())
+        {
+            return false;
+        }
+        
+        byte nextByte = CodeBuffer[Decoder.GetPosition()];
+        return StringInstructions.ContainsKey(nextByte);
     }
     
     /// <summary>
@@ -81,13 +82,13 @@ public class StringInstructionHandler : InstructionHandler
             prefixString = opcode == REP_PREFIX ? "rep " : "repne ";
 
             // Read the next byte (the actual string instruction opcode)
-            int position = Decoder.GetPosition();
+            if (!Decoder.CanReadByte())
-            if (position >= Length)
             {
                 return false;
             }
 
             stringOpcode = Decoder.ReadByte();
+
             if (!StringInstructions.ContainsKey(stringOpcode))
             {
                 return false;

X86Disassembler/X86/Handlers/Sub/SubAlImm8Handler.cs

@@ -34,9 +34,7 @@ public class SubAlImm8Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sub/SubAxImm16Handler.cs

@@ -38,10 +38,7 @@ public class SubAxImm16Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "sub";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadUShort())
-
-        // Check if we have enough bytes for the immediate value
-        if (position + 1 >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sub/SubImmFromRm32Handler.cs

@@ -27,11 +27,10 @@ public class SubImmFromRm32Handler : InstructionHandler
             return false;
 
         // Check if the reg field of the ModR/M byte is 5 (SUB)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
 
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 5; // 5 = SUB
@@ -48,25 +47,16 @@ public class SubImmFromRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "sub";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
 
         // Read the ModR/M byte
-
-        // Extract the fields from the ModR/M byte
-        // Let the ModRMDecoder handle the ModR/M byte and any additional bytes (SIB, displacement)
-        // This will update the decoder position to point after the ModR/M and any additional bytes
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
-        // Get the updated position after ModR/M decoding
-        position = Decoder.GetPosition();
-
         // Read the immediate value
-        if (position + 3 >= Length)
+        if (!Decoder.CanReadUInt())
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sub/SubImmFromRm8Handler.cs

@@ -27,11 +27,10 @@ public class SubImmFromRm8Handler : InstructionHandler
             return false;
 
         // Check if the reg field of the ModR/M byte is 5 (SUB)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
 
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte) ((modRM & 0x38) >> 3);
 
         return reg == 5; // 5 = SUB
@@ -52,8 +51,7 @@ public class SubImmFromRm8Handler : InstructionHandler
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
         // Read the immediate byte
-        var position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sub/SubR16Rm16Handler.cs

@@ -38,9 +38,7 @@ public class SubR16Rm16Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "sub";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sub/SubR32Rm32Handler.cs

@@ -34,9 +34,7 @@ public class SubR32Rm32Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sub/SubR8Rm8Handler.cs

@@ -37,9 +37,7 @@ public class SubR8Rm8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "sub";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sub/SubRm16R16Handler.cs

@@ -38,9 +38,7 @@ public class SubRm16R16Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "sub";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
@@ -59,7 +57,6 @@ public class SubRm16R16Handler : InstructionHandler
         }
         else // Memory operand
         {
-            // Replace "dword" with "word" in the memory operand
             destOperand = destOperand.Replace("dword", "word");
 
             instruction.Operands = $"{destOperand}, {regName}";

X86Disassembler/X86/Handlers/Sub/SubRm32R32Handler.cs

@@ -34,9 +34,7 @@ public class SubRm32R32Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Sub/SubRm8R8Handler.cs

@@ -37,9 +37,7 @@ public class SubRm8R8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "sub";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Test/TestAlImmHandler.cs

@@ -37,9 +37,7 @@ public class TestAlImmHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "test";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Test/TestEaxImmHandler.cs

@@ -37,9 +37,7 @@ public class TestEaxImmHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "test";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadUInt())
-
-        if (position + 3 >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Test/TestImmWithRm32Handler.cs

@@ -50,9 +50,13 @@ public class TestImmWithRm32Handler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        // Set the mnemonic
         instruction.Mnemonic = "test";
 
+        if (!Decoder.CanReadByte())
+        {
+            return false;
+        }
+        
         // Read the ModR/M byte
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
         

X86Disassembler/X86/Handlers/Xchg/XchgEaxRegHandler.cs

@@ -23,7 +23,7 @@ public class XchgEaxRegHandler : InstructionHandler
     /// <returns>True if this handler can decode the opcode</returns>
     public override bool CanHandle(byte opcode)
     {
-        return opcode >= 0x90 && opcode <= 0x97;
+        return opcode >= 0x91 && opcode <= 0x97;
     }
 
     /// <summary>
@@ -34,14 +34,6 @@ public class XchgEaxRegHandler : InstructionHandler
     /// <returns>True if the instruction was successfully decoded</returns>
     public override bool Decode(byte opcode, Instruction instruction)
     {
-        // Special case for NOP (XCHG EAX, EAX)
-        if (opcode == 0x90)
-        {
-            instruction.Mnemonic = "nop";
-            instruction.Operands = "";
-            return true;
-        }
-
         // Set the mnemonic
         instruction.Mnemonic = "xchg";
 

X86Disassembler/X86/Handlers/Xor/XorAlImmHandler.cs

@@ -37,9 +37,7 @@ public class XorAlImmHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
         
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Xor/XorAxImm16Handler.cs

@@ -38,9 +38,7 @@ public class XorAxImm16Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadUShort())
-        
-        if (position + 1 >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Xor/XorEaxImmHandler.cs

@@ -37,9 +37,7 @@ public class XorEaxImmHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
         
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadUInt())
-        
-        if (position + 4 > Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Xor/XorImmWithRm16SignExtendedHandler.cs

@@ -27,11 +27,10 @@ public class XorImmWithRm16SignExtendedHandler : InstructionHandler
             return false;
             
         // Check if the reg field of the ModR/M byte is 6 (XOR)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
             
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte)((modRM & 0x38) >> 3);
         
         return reg == 6; // 6 = XOR
@@ -48,9 +47,7 @@ public class XorImmWithRm16SignExtendedHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
         
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }
@@ -78,16 +75,12 @@ public class XorImmWithRm16SignExtendedHandler : InstructionHandler
             }
         }
         
-        // Get the updated position after ModR/M decoding
-        position = Decoder.GetPosition();
-        
         // Read the immediate value (sign-extended from 8 to 16 bits)
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }
 
-        // Read the immediate value and sign-extend it to 16 bits
         short imm16 = (sbyte)Decoder.ReadByte();
         
         // Format the immediate value

X86Disassembler/X86/Handlers/Xor/XorImmWithRm32Handler.cs

@@ -27,11 +27,10 @@ public class XorImmWithRm32Handler : InstructionHandler
             return false;
             
         // Check if the reg field of the ModR/M byte is 6 (XOR)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
             
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte)((modRM & 0x38) >> 3);
         
         return reg == 6; // 6 = XOR
@@ -48,9 +47,7 @@ public class XorImmWithRm32Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
         
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }
@@ -58,16 +55,12 @@ public class XorImmWithRm32Handler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
         
-        // Get the updated position after ModR/M decoding
-        position = Decoder.GetPosition();
-        
         // Read the immediate value
-        if (position + 3 >= Length)
+        if (!Decoder.CanReadUInt())
         {
             return false;
         }
 
-        // Read the immediate value using the decoder
         var imm = Decoder.ReadUInt32();
 
         // Format the immediate value

X86Disassembler/X86/Handlers/Xor/XorImmWithRm32SignExtendedHandler.cs

@@ -27,11 +27,10 @@ public class XorImmWithRm32SignExtendedHandler : InstructionHandler
             return false;
             
         // Check if the reg field of the ModR/M byte is 6 (XOR)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
             
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte)((modRM & 0x38) >> 3);
         
         return reg == 6; // 6 = XOR
@@ -48,9 +47,7 @@ public class XorImmWithRm32SignExtendedHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
         
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }
@@ -58,11 +55,8 @@ public class XorImmWithRm32SignExtendedHandler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
         
-        // Get the updated position after ModR/M decoding
-        position = Decoder.GetPosition();
-        
         // Read the immediate value (sign-extended from 8 to 32 bits)
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }

X86Disassembler/X86/Handlers/Xor/XorImmWithRm8Handler.cs

@@ -27,11 +27,10 @@ public class XorImmWithRm8Handler : InstructionHandler
             return false;
             
         // Check if the reg field of the ModR/M byte is 6 (XOR)
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        if (position >= Length)
             return false;
             
-        byte modRM = CodeBuffer[position];
+        byte modRM = CodeBuffer[Decoder.GetPosition()];
         byte reg = (byte)((modRM & 0x38) >> 3);
         
         return reg == 6; // 6 = XOR
@@ -48,9 +47,7 @@ public class XorImmWithRm8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
         
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }
@@ -58,9 +55,6 @@ 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)
         {
@@ -69,17 +63,12 @@ public class XorImmWithRm8Handler : InstructionHandler
         }
         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();
-        
         // Read the immediate value
-        if (position >= Length)
+        if (!Decoder.CanReadByte())
         {
             return false;
         }

X86Disassembler/X86/Handlers/Xor/XorMemRegHandler.cs

@@ -37,9 +37,7 @@ public class XorMemRegHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
         
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Xor/XorR16Rm16Handler.cs

@@ -38,9 +38,7 @@ public class XorR16Rm16Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Xor/XorR8Rm8Handler.cs

@@ -37,9 +37,7 @@ public class XorR8Rm8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
@@ -47,9 +45,6 @@ public class XorR8Rm8Handler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
-        // Advance past the ModR/M byte
-        Decoder.SetPosition(position + 1);
-
         // Get register name (8-bit)
         string regName = ModRMDecoder.GetRegisterName(reg, 8);
 

X86Disassembler/X86/Handlers/Xor/XorRegMemHandler.cs

@@ -37,9 +37,7 @@ public class XorRegMemHandler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-        
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Xor/XorRm16R16Handler.cs

@@ -38,9 +38,7 @@ public class XorRm16R16Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }

X86Disassembler/X86/Handlers/Xor/XorRm8R8Handler.cs

@@ -37,9 +37,7 @@ public class XorRm8R8Handler : InstructionHandler
         // Set the mnemonic
         instruction.Mnemonic = "xor";
 
-        int position = Decoder.GetPosition();
+        if (!Decoder.CanReadByte())
-
-        if (position >= Length)
         {
             return false;
         }
@@ -47,9 +45,6 @@ public class XorRm8R8Handler : InstructionHandler
         // Read the ModR/M byte
         var (mod, reg, rm, destOperand) = ModRMDecoder.ReadModRM();
 
-        // Advance past the ModR/M byte
-        Decoder.SetPosition(position + 1);
-
         // Get register name (8-bit)
         string regName = ModRMDecoder.GetRegisterName(reg, 8);
 

X86DisassemblerTests/InstructionTests/MovRm32Imm32Tests.cs

@@ -115,25 +115,6 @@ public class MovRm32Imm32Tests
         Assert.Equal("dword ptr [esp+0x14], 0x00000000", instructions[1].Operands);
     }
 
-    /// <summary>
-    /// Tests the MOV m32, imm32 instruction (0xC7) with incomplete immediate value
-    /// </summary>
-    [Fact]
-    public void TestMovM32Imm32_IncompleteImmediate()
-    {
-        // Arrange
-        // MOV DWORD PTR [EAX], ?? (incomplete immediate)
-        byte[] code = { 0xC7, 0x00, 0x78, 0x56 }; // Missing 2 bytes of immediate
-        
-        // Act
-        Disassembler disassembler = new Disassembler(code, 0x1000);
-        var instructions = disassembler.Disassemble();
-        
-        // Assert
-        Assert.True(instructions.Count > 0, "Expected at least one instruction");
-        Assert.Equal("NO HANDLER: mov", instructions[0].Mnemonic);
-    }
-    
     /// <summary>
     /// Tests the MOV m32, imm32 instruction (0xC7) with instruction boundary detection
     /// </summary>