summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormalc <av1474@comtv.ru>2010-03-04 15:09:26 +0300
committerAurelien Jarno <aurelien@aurel32.net>2010-03-06 19:40:11 +0100
commitc248df6161e7cacaa37f3214323307b8cb29dd28 (patch)
treec47183089c41b77e236b2802bca6d5e09520f170 /target-i386
parenttarget-i386: fix lddqu SSE instruction (diff)
downloadqemu-kvm-c248df6161e7cacaa37f3214323307b8cb29dd28.tar.gz
qemu-kvm-c248df6161e7cacaa37f3214323307b8cb29dd28.tar.bz2
qemu-kvm-c248df6161e7cacaa37f3214323307b8cb29dd28.zip
target-i386: Fix long jumps/calls in long mode with REX.W set
Signed-off-by: malc <av1474@comtv.ru> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry picked from commit 41b1e61f51b05fd6ca060f901b822f83e0beb6b6)
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/translate.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 4ab226f43..0f7255d9d 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -4591,9 +4591,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
/* operand size for jumps is 64 bit */
ot = OT_QUAD;
} else if (op == 3 || op == 5) {
- /* for call calls, the operand is 16 or 32 bit, even
- in long mode */
- ot = dflag ? OT_LONG : OT_WORD;
+ ot = dflag ? OT_LONG + (rex_w == 1) : OT_WORD;
} else if (op == 6) {
/* default push size is 64 bit */
ot = dflag ? OT_QUAD : OT_WORD;