From c1696d94c17b7fe03a2b103b1ba117fb0726a316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 9 May 2012 19:26:56 +0200 Subject: [PATCH] tcg/ppc: Do not overwrite lower address word on Darwin and AIX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For targets where TARGET_LONG_BITS != 32, i.e. 64-bit guests, addr_reg is moved to r4. For hosts without TCG_TARGET_CALL_ALIGN_ARGS either data_reg2 or data_reg or a masked version thereof would overwrite r4. Place it in r5 instead, matching TCG_TARGET_CALL_ALIGN_ARGS hosts. This fixes immediate crashes of 64-bit guests observed on Darwin/ppc but not on Darwin/ppc64. Signed-off-by: Andreas Färber Acked-by: malc Acked-by: Alexander Graf Signed-off-by: Anthony Liguori --- tcg/ppc/tcg-target.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index dc407166f5..4b85c897e1 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -816,11 +816,7 @@ static void tcg_out_qemu_st (TCGContext *s, const TCGArg *args, int opc) #else tcg_out_mov (s, TCG_TYPE_I32, 3, addr_reg2); tcg_out_mov (s, TCG_TYPE_I32, 4, addr_reg); -#ifdef TCG_TARGET_CALL_ALIGN_ARGS ir = 5; -#else - ir = 4; -#endif #endif switch (opc) {