fixed PAUSE/NOP decoding bug in prev commit

This commit is contained in:
Stanislav Shwartsman 2013-10-16 05:46:57 +00:00
parent 8bcc8cf073
commit 39f2f172b5

View File

@ -2208,12 +2208,6 @@ modrm_done:
// the if() above after fetching the 2nd byte, so this path is
// taken in all cases if a modrm byte is NOT required.
if (b1 == 0x90) {
if (! rex_prefix) {
ia_opcode = (sse_prefix == SSE_PREFIX_F3) ? BX_IA_PAUSE : BX_IA_NOP;
}
}
else {
unsigned group = attr & BxGroupX;
if (group == BxPrefixSSE && sse_prefix)
OpcodeInfoPtr = &(OpcodeInfoPtr->AnotherArray[sse_prefix-1]);
@ -2222,6 +2216,12 @@ modrm_done:
rm = (b1 & 7) | rex_b;
nnn = (b1 >> 3) & 7;
i->assertModC0();
if (b1 == 0x90) {
if (sse_prefix == SSE_PREFIX_F3)
ia_opcode = BX_IA_PAUSE;
else if (! rex_b)
ia_opcode = BX_IA_NOP;
}
}