From 3276bb06b6f4a7626ed4b14e8fc3329e5955a935 Mon Sep 17 00:00:00 2001 From: wtfsck Date: Sat, 15 May 2021 00:01:45 +0200 Subject: [PATCH] Update rex opcode handler --- .../Intel/Iced/Intel/DecoderInternal/OpCodeHandlers_Legacy.cs | 4 ++-- src/rust/iced-x86/src/decoder/handlers_legacy.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/csharp/Intel/Iced/Intel/DecoderInternal/OpCodeHandlers_Legacy.cs b/src/csharp/Intel/Iced/Intel/DecoderInternal/OpCodeHandlers_Legacy.cs index 3c5a62d4a..a16593f8d 100644 --- a/src/csharp/Intel/Iced/Intel/DecoderInternal/OpCodeHandlers_Legacy.cs +++ b/src/csharp/Intel/Iced/Intel/DecoderInternal/OpCodeHandlers_Legacy.cs @@ -195,9 +195,9 @@ namespace Iced.Intel.DecoderInternal { decoder.state.flags |= StateFlags.HasRex; decoder.state.flags &= ~StateFlags.W; if ((decoder.state.flags & StateFlags.Has66) == 0) - decoder.state.operandSize = decoder.defaultOperandSize; + decoder.state.operandSize = OpSize.Size32; else - decoder.state.operandSize = decoder.defaultInvertedOperandSize; + decoder.state.operandSize = OpSize.Size16; } decoder.state.extraRegisterBase = (rex & 4) << 1; decoder.state.extraIndexRegisterBase = (rex & 2) << 2; diff --git a/src/rust/iced-x86/src/decoder/handlers_legacy.rs b/src/rust/iced-x86/src/decoder/handlers_legacy.rs index 432676aec..51729eff7 100644 --- a/src/rust/iced-x86/src/decoder/handlers_legacy.rs +++ b/src/rust/iced-x86/src/decoder/handlers_legacy.rs @@ -314,9 +314,9 @@ impl OpCodeHandler_PrefixREX { } else { decoder.state.flags &= !StateFlags::W; if (decoder.state.flags & StateFlags::HAS66) == 0 { - decoder.state.operand_size = decoder.default_operand_size; + decoder.state.operand_size = OpSize::Size32; } else { - decoder.state.operand_size = decoder.default_inverted_operand_size; + decoder.state.operand_size = OpSize::Size16; } } decoder.state.extra_register_base = (b & 4) << 1;