mirror of
https://github.com/sampletext32/ParkanPlayground.git
synced 2025-06-20 08:18:36 +03:00
Fix FCLEX/FNCLEX instruction types and rename handler for consistency
This commit is contained in:
@ -53,7 +53,7 @@ public class FclexHandler : InstructionHandler
|
|||||||
byte secondByte = Decoder.ReadByte();
|
byte secondByte = Decoder.ReadByte();
|
||||||
|
|
||||||
// Set the instruction type
|
// Set the instruction type
|
||||||
instruction.Type = InstructionType.Fclex;
|
instruction.Type = InstructionType.Fnclex;
|
||||||
|
|
||||||
// FCLEX has no operands
|
// FCLEX has no operands
|
||||||
instruction.StructuredOperands = [];
|
instruction.StructuredOperands = [];
|
||||||
|
@ -0,0 +1,71 @@
|
|||||||
|
namespace X86Disassembler.X86.Handlers.FloatingPoint.Control;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Handler for FCLEX instruction with WAIT prefix (0x9B 0xDB 0xE2)
|
||||||
|
/// </summary>
|
||||||
|
public class FclexWaitHandler : InstructionHandler
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the FclexWaitHandler class
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="decoder">The instruction decoder that owns this handler</param>
|
||||||
|
public FclexWaitHandler(InstructionDecoder decoder)
|
||||||
|
: base(decoder)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Checks if this handler can decode the given opcode
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="opcode">The opcode to check</param>
|
||||||
|
/// <returns>True if this handler can decode the opcode</returns>
|
||||||
|
public override bool CanHandle(byte opcode)
|
||||||
|
{
|
||||||
|
// FCLEX with WAIT prefix starts with 0x9B
|
||||||
|
if (opcode != 0x9B) return false;
|
||||||
|
|
||||||
|
// Check if we can read the next two bytes
|
||||||
|
if (!Decoder.CanReadByte())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Check if the next bytes are 0xDB 0xE2 (for FCLEX with WAIT)
|
||||||
|
var (nextByte, thirdByte) = Decoder.PeakTwoBytes();
|
||||||
|
|
||||||
|
// The sequence must be 9B DB E2 for FCLEX with WAIT
|
||||||
|
return nextByte == 0xDB && thirdByte == 0xE2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Decodes a FCLEX instruction with WAIT prefix
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="opcode">The opcode of the instruction</param>
|
||||||
|
/// <param name="instruction">The instruction object to populate</param>
|
||||||
|
/// <returns>True if the instruction was successfully decoded</returns>
|
||||||
|
public override bool Decode(byte opcode, Instruction instruction)
|
||||||
|
{
|
||||||
|
// Skip the WAIT prefix (0x9B) - we already read it in CanHandle
|
||||||
|
if (!Decoder.CanReadByte())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Read the second byte (0xDB)
|
||||||
|
byte secondByte = Decoder.ReadByte();
|
||||||
|
if (secondByte != 0xDB)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Read the third byte (0xE2)
|
||||||
|
if (!Decoder.CanReadByte())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
byte thirdByte = Decoder.ReadByte();
|
||||||
|
if (thirdByte != 0xE2)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Set the instruction type
|
||||||
|
instruction.Type = InstructionType.Fclex;
|
||||||
|
|
||||||
|
// FCLEX has no operands
|
||||||
|
instruction.StructuredOperands = [];
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
@ -435,7 +435,8 @@ public class InstructionHandlerFactory
|
|||||||
_handlers.Add(new FloatingPoint.Conditional.FcmovnuHandler(_decoder)); // FCMOVNU (DB D8-DF)
|
_handlers.Add(new FloatingPoint.Conditional.FcmovnuHandler(_decoder)); // FCMOVNU (DB D8-DF)
|
||||||
|
|
||||||
// DB opcode handlers (control instructions)
|
// DB opcode handlers (control instructions)
|
||||||
_handlers.Add(new FloatingPoint.Control.FclexHandler(_decoder)); // FCLEX (DB E2)
|
_handlers.Add(new FloatingPoint.Control.FclexHandler(_decoder)); // FNCLEX (DB E2)
|
||||||
|
_handlers.Add(new FloatingPoint.Control.FclexWaitHandler(_decoder)); // FCLEX (9B DB E2)
|
||||||
_handlers.Add(new FloatingPoint.Control.FinitHandler(_decoder)); // FINIT (DB E3)
|
_handlers.Add(new FloatingPoint.Control.FinitHandler(_decoder)); // FINIT (DB E3)
|
||||||
|
|
||||||
// DB opcode handlers (comparison instructions)
|
// DB opcode handlers (comparison instructions)
|
||||||
|
Reference in New Issue
Block a user