Fix VEX+REX handling

This commit is contained in:
Alexis Engelke
2019-11-02 22:16:50 +01:00
parent a5a15258fd
commit dbf72dd282

View File

@@ -132,8 +132,11 @@ decode_prefixes(const uint8_t* buffer, int len, DecodeMode mode,
if (mode == DECODE_32 && (byte & 0xc0) != 0xc0) if (mode == DECODE_32 && (byte & 0xc0) != 0xc0)
goto out; goto out;
// VEX + REX/66/F2/F3/LOCK will #UD. // VEX + 66/F2/F3/LOCK will #UD.
if (prefixes & (PREFIX_REX|PREFIX_REP|PREFIX_REPNZ|PREFIX_LOCK)) if (prefixes & (PREFIX_REP|PREFIX_REPNZ|PREFIX_OPSZ|PREFIX_LOCK)
return -1;
// VEX + REX will #UD.
if (rex_prefix)
return -1; return -1;
prefixes |= PREFIX_VEX; prefixes |= PREFIX_VEX;