0
mirror of https://github.com/sampletext32/ParkanPlayground.git synced 2025-06-20 16:18:37 +03:00

Fixed instruction boundary detection for complex instruction sequences

This commit is contained in:
bird_egop
2025-04-13 03:08:37 +03:00
parent 33b151d856
commit e12f5b5bdf
4 changed files with 267 additions and 23 deletions

View File

@ -34,26 +34,37 @@ public class JmpRel8Handler : InstructionHandler
/// <returns>True if the instruction was successfully decoded</returns>
public override bool Decode(byte opcode, Instruction instruction)
{
// Save the original position for raw bytes calculation
int startPosition = Decoder.GetPosition();
// Set the mnemonic
instruction.Mnemonic = "jmp";
int position = Decoder.GetPosition();
if (position >= Length)
// Check if we have enough bytes for the offset
if (startPosition >= Length)
{
return false;
// Not enough bytes for the offset
instruction.Operands = "??";
instruction.RawBytes = new byte[] { opcode };
return true;
}
// Read the relative offset
sbyte offset = (sbyte)CodeBuffer[position];
Decoder.SetPosition(position + 1);
sbyte offset = (sbyte)CodeBuffer[startPosition];
// Advance the decoder position past the offset byte
Decoder.SetPosition(startPosition + 1);
// Calculate the target address
uint targetAddress = (uint)(position + offset + 1);
// The target is relative to the next instruction (after the JMP instruction)
uint targetAddress = (uint)(instruction.Address + offset + 2);
// Set the operands
instruction.Operands = $"0x{targetAddress:X8}";
// Set the raw bytes
instruction.RawBytes = new byte[] { opcode, (byte)offset };
return true;
}
}