diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-05 20:11:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-05 20:11:50 +0100 |
| commit | 9d48d3f01cf3f67d54cd7e2c7834e97a57cea0b8 (patch) | |
| tree | 2ba1664d462b15e2165cab45f12022e1663def33 /tcg/i386/tcg-target.c | |
| parent | 9f0355b590ac523d0c4e67c416c3f9cf7af3d574 (diff) | |
| parent | e3eb9806c70c7315336b5e310a841c8f381dacea (diff) | |
| download | focaccia-qemu-9d48d3f01cf3f67d54cd7e2c7834e97a57cea0b8.tar.gz focaccia-qemu-9d48d3f01cf3f67d54cd7e2c7834e97a57cea0b8.zip | |
Merge remote-tracking branch 'remotes/rth/tcg-next' into staging
* remotes/rth/tcg-next: TCG: Fix tcg_gen_extr_i64_tl for 32bit tcg: Remove TCG_TARGET_HAS_new_ldst tci: Convert to new ldst opcodes tcg-i386: Fix win64 qemu store Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tcg/i386/tcg-target.c')
| -rw-r--r-- | tcg/i386/tcg-target.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index d9102335f9..4133dcf1a9 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); } } |