From: malc <av1474@comtv.ru>
Date: Thu, 4 Mar 2010 12:09:26 +0000 (+0300)
Subject: target-i386: Fix long jumps/calls in long mode with REX.W set
X-Git-Tag: v0.12.4~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c248df6161e7cacaa37f3214323307b8cb29dd28;p=thirdparty%2Fqemu.git

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)
---

diff --git a/target-i386/translate.c b/target-i386/translate.c
index 4ab226f436b..0f7255d9d42 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;