From: Richard Henderson <rth@twiddle.net>
Date: Wed, 28 May 2014 21:01:44 +0000 (-0700)
Subject: tcg-i386: Fix win64 qemu store
X-Git-Tag: qemu-xen-4.5.0-rc1^2~54
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6ea80edc0165a11060b5e13d62e81630abbc5d25;p=qemu-upstream-4.5-testing.git

tcg-i386: Fix win64 qemu store

The first non-register argument isn't placed at offset 0.

Cc: qemu-stable@nongnu.org
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Richard Henderson <rth@twiddle.net>
(cherry picked from commit 0b919667302aa395bfde0328749dc21a0b123c44)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
index f832282d1..175fae8a4 100644
--- a/tcg/i386/tcg-target.c
+++ b/tcg/i386/tcg-target.c
@@ -1407,7 +1407,8 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l)
         } else {
             retaddr = TCG_REG_RAX;
             tcg_out_movi(s, TCG_TYPE_PTR, retaddr, (uintptr_t)l->raddr);
-            tcg_out_st(s, TCG_TYPE_PTR, retaddr, TCG_REG_ESP, 0);
+            tcg_out_st(s, TCG_TYPE_PTR, retaddr, TCG_REG_ESP,
+                       TCG_TARGET_CALL_STACK_OFFSET);
         }
     }