This commit is contained in:
Joel Höner 2017-05-05 19:26:13 +02:00
commit d3192a8be7
1 changed files with 3 additions and 2 deletions

View File

@ -1795,7 +1795,8 @@ static ZydisStatus ZydisNodeHandlerOpcode(ZydisDecoderContext* ctx,
{ {
uint8_t nextInput; uint8_t nextInput;
ZYDIS_CHECK(ZydisInputPeek(ctx, info, &nextInput)); ZYDIS_CHECK(ZydisInputPeek(ctx, info, &nextInput));
if ((nextInput & 0xF0) >= 0xC0) if (((nextInput & 0xF0) >= 0xC0) ||
(ctx->operatingMode == ZYDIS_OPERATING_MODE_64BIT))
{ {
if (info->attributes & ZYDIS_ATTRIB_HAS_REX) if (info->attributes & ZYDIS_ATTRIB_HAS_REX)
{ {
@ -1856,7 +1857,7 @@ static ZydisStatus ZydisNodeHandlerOpcode(ZydisDecoderContext* ctx,
{ {
uint8_t nextInput; uint8_t nextInput;
ZYDIS_CHECK(ZydisInputPeek(ctx, info, &nextInput)); ZYDIS_CHECK(ZydisInputPeek(ctx, info, &nextInput));
if (((nextInput >> 0) & 0x1F) >= 8) if ((nextInput & 0x1F) >= 8)
{ {
if (info->attributes & ZYDIS_ATTRIB_HAS_REX) if (info->attributes & ZYDIS_ATTRIB_HAS_REX)
{ {