diff options
| author | Richard Henderson <rth@twiddle.net> | 2010-07-01 09:42:21 -0700 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-07-01 23:45:28 +0200 |
| commit | 7418027ea4fec276455abd4291558bc58a0a7ba7 (patch) | |
| tree | f87caaee63910d18771005604dcb8e3fc453c30b /target-i386/translate.c | |
| parent | afa88c3ae5fb6b2dce4e6221b4cf2664b05adcc5 (diff) | |
target-i386: fix xchg rax,r8
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>
Diffstat (limited to 'target-i386/translate.c')
| -rw-r--r-- | target-i386/translate.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/target-i386/translate.c b/target-i386/translate.c index 708b0a11e9..8cb5cf0b0a 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -5293,6 +5293,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) break; case 0x91 ... 0x97: /* xchg R, EAX */ + do_xchg_reg_eax: ot = dflag + OT_WORD; reg = (b & 7) | REX_B(s); rm = R_EAX; @@ -6663,10 +6664,14 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) /************************/ /* misc */ case 0x90: /* nop */ - /* XXX: xchg + rex handling */ /* XXX: correct lock test for all insn */ - if (prefixes & PREFIX_LOCK) + if (prefixes & PREFIX_LOCK) { 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) { gen_svm_check_intercept(s, pc_start, SVM_EXIT_PAUSE); } |