mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-i386: fix xchg rax,r8

Browse Source 
We were ignoring REX_B while special-casing NOP, i.e. xchg eax,eax.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Richard Henderson 2010-07-01 09:42:21 -07:00 committed by Aurelien Jarno
parent afa88c3ae5
commit 7418027ea4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target-i386/translate.c
View File

@ -5293,6 +5293,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
break; break;
case 0x91 ... 0x97: /* xchg R, EAX */ case 0x91 ... 0x97: /* xchg R, EAX */
do_xchg_reg_eax:
ot = dflag + OT_WORD; ot = dflag + OT_WORD;
reg = (b & 7) | REX_B(s); reg = (b & 7) | REX_B(s);
rm = R_EAX; rm = R_EAX;
@ -6663,10 +6664,14 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
/************************/ /************************/
/* misc */ /* misc */
case 0x90: /* nop */ case 0x90: /* nop */
/* XXX: xchg + rex handling */
/* XXX: correct lock test for all insn */ /* XXX: correct lock test for all insn */
if (prefixes & PREFIX_LOCK) if (prefixes & PREFIX_LOCK) {
goto illegal_op; goto illegal_op;
}
/* If REX_B is set, then this is xchg eax, r8d, not a nop. */
if (REX_B(s)) {
goto do_xchg_reg_eax;
}
if (prefixes & PREFIX_REPZ) { if (prefixes & PREFIX_REPZ) {
gen_svm_check_intercept(s, pc_start, SVM_EXIT_PAUSE); gen_svm_check_intercept(s, pc_start, SVM_EXIT_PAUSE);
} }