summary refs log tree commit diff stats
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:20:04 +0100
commit41b1e61f51b05fd6ca060f901b822f83e0beb6b6 (patch)
tree10eeb9940c5e707fa908e47a6551950e2cbc9299
parentc22549204a6edc431e8e4358e61bd56386ff6957 (diff)
downloadfocaccia-qemu-41b1e61f51b05fd6ca060f901b822f83e0beb6b6.tar.gz
focaccia-qemu-41b1e61f51b05fd6ca060f901b822f83e0beb6b6.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>
-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 525a83b744..7a99e2055a 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -4589,9 +4589,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;