T0b1/test-repo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

decode: Fix combinations of VEX with legacy prefix

Browse Source
This commit is contained in:
Alexis Engelke
2020-11-21 14:59:25 +01:00
parent 318fdc50eb
commit 7f0bd4de8b
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
decode.c
View File

@@ -128,10 +128,10 @@ decode_prefixes(const uint8_t* buffer, int len, DecodeMode mode,
goto out; goto out;
// VEX + 66/F2/F3/LOCK will #UD. // VEX + 66/F2/F3/LOCK will #UD.
if (prefixes & (PREFIX_REP|PREFIX_REPNZ|PREFIX_OPSZ|PREFIX_LOCK)) if (prefixes & (PREFIX_OPSZ|PREFIX_LOCK))
return FD_ERR_UD; return FD_ERR_UD;
// VEX + REX will #UD. // VEX + REX will #UD.
if (rex_prefix) if (rex_prefix || rep)
return FD_ERR_UD; return FD_ERR_UD;
prefixes |= PREFIX_VEX; prefixes |= PREFIX_VEX;

8
tests/test_decode.c
View File

@@ -264,6 +264,14 @@ main(int argc, char** argv)
TEST("\x66\x0f\x71\xd0\x01", "[SSE_PSRLW reg16:r0 imm1:0x1]"); TEST("\x66\x0f\x71\xd0\x01", "[SSE_PSRLW reg16:r0 imm1:0x1]");
TEST("\x66\x0f\x71\x10\x01", "UD"); TEST("\x66\x0f\x71\x10\x01", "UD");
TEST("\xc5\xf2\x2a\xc0", "[VCVTSI2SS reg16:r0 reg16:r1 reg4:r0]");
TEST("\xf3\xc5\xf2\x2a\xc0", "UD"); // VEX+REP
TEST("\xf2\xc5\xf2\x2a\xc0", "UD"); // VEX+REPNZ
TEST("\xf2\xf3\xc5\xf2\x2a\xc0", "UD"); // VEX+REP+REPNZ
TEST("\x66\xc5\xf2\x2a\xc0", "UD"); // VEX+66
TEST("\xf0\xc5\xf2\x2a\xc0", "UD"); // VEX+LOCK
TEST64("\x40\xc5\xf2\x2a\xc0", "UD"); // VEX+REX
TEST("\xf3\x0f\x7e\x5c\x24\x08", "[SSE_MOVQ reg16:r3 mem8:r4+0x8]"); TEST("\xf3\x0f\x7e\x5c\x24\x08", "[SSE_MOVQ reg16:r3 mem8:r4+0x8]");
TEST32("\xc4\xe1\x00\x58\xc1", "[VADDPS reg16:r0 reg16:r7 reg16:r1]"); // MSB in vvvv ignored TEST32("\xc4\xe1\x00\x58\xc1", "[VADDPS reg16:r0 reg16:r7 reg16:r1]"); // MSB in vvvv ignored
TEST64("\xc4\xe1\x00\x58\xc1", "[VADDPS reg16:r0 reg16:r15 reg16:r1]"); TEST64("\xc4\xe1\x00\x58\xc1", "[VADDPS reg16:r0 reg16:r15 reg16:r1]");