From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOrwV-0002K2-1u for qemu-devel@nongnu.org; Wed, 25 Sep 2013 12:28:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOrwI-000321-S1 for qemu-devel@nongnu.org; Wed, 25 Sep 2013 12:27:58 -0400 Received: from mail-pd0-x229.google.com ([2607:f8b0:400e:c02::229]:33564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOrwI-00031v-KE for qemu-devel@nongnu.org; Wed, 25 Sep 2013 12:27:46 -0400 Received: by mail-pd0-f169.google.com with SMTP id r10so6368700pdi.28 for ; Wed, 25 Sep 2013 09:27:45 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Wed, 25 Sep 2013 09:27:19 -0700 Message-Id: <1380126458-3247-3-git-send-email-rth@twiddle.net> In-Reply-To: <1380126458-3247-1-git-send-email-rth@twiddle.net> References: <1380126458-3247-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 02/21] tcg-ppc: fix qemu_ld/qemu_st for AIX ABI List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , anthony@codemonkey.ws From: Paolo Bonzini For the AIX ABI, the function pointer and small area pointer need to be loaded in the trampoline. The trampoline instead is called with a normal BL instruction. Signed-off-by: Paolo Bonzini Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index 2595556..204ffbe 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -490,7 +490,8 @@ static void tcg_out_b (TCGContext *s, int mask, tcg_target_long target) } } -static void tcg_out_call (TCGContext *s, tcg_target_long arg, int const_arg) +static void tcg_out_call (TCGContext *s, tcg_target_long arg, int const_arg, + int lk) { #ifdef _CALL_AIX int reg; @@ -504,14 +505,14 @@ static void tcg_out_call (TCGContext *s, tcg_target_long arg, int const_arg) tcg_out32 (s, LWZ | RT (0) | RA (reg)); tcg_out32 (s, MTSPR | RA (0) | CTR); tcg_out32 (s, LWZ | RT (2) | RA (reg) | 4); - tcg_out32 (s, BCCTR | BO_ALWAYS | LK); + tcg_out32 (s, BCCTR | BO_ALWAYS | lk); #else if (const_arg) { - tcg_out_b (s, LK, arg); + tcg_out_b (s, lk, arg); } else { tcg_out32 (s, MTSPR | RS (arg) | LR); - tcg_out32 (s, BCLR | BO_ALWAYS | LK); + tcg_out32 (s, BCLR | BO_ALWAYS | lk); } #endif } @@ -860,7 +861,7 @@ static void tcg_out_qemu_ld_slow_path (TCGContext *s, TCGLabelQemuLdst *label) tcg_out_mov (s, TCG_TYPE_I32, ir++, addr_reg); #endif tcg_out_movi (s, TCG_TYPE_I32, ir, mem_index); - tcg_out_call (s, (tcg_target_long) ld_trampolines[s_bits], 1); + tcg_out_b (s, LK, (tcg_target_long) ld_trampolines[s_bits]); tcg_out32 (s, (tcg_target_long) raddr); switch (opc) { case 0|4: @@ -954,7 +955,7 @@ static void tcg_out_qemu_st_slow_path (TCGContext *s, TCGLabelQemuLdst *label) ir++; tcg_out_movi (s, TCG_TYPE_I32, ir, mem_index); - tcg_out_call (s, (tcg_target_long) st_trampolines[opc], 1); + tcg_out_b (s, LK, (tcg_target_long) st_trampolines[opc]); tcg_out32 (s, (tcg_target_long) raddr); tcg_out_b (s, 0, (tcg_target_long) raddr); } @@ -984,7 +985,7 @@ static void emit_ldst_trampoline (TCGContext *s, const void *ptr) tcg_out32 (s, ADDI | RT (3) | RA (3) | 4); tcg_out32 (s, MTSPR | RS (3) | LR); tcg_out_mov (s, TCG_TYPE_I32, 3, TCG_AREG0); - tcg_out_b (s, 0, (tcg_target_long) ptr); + tcg_out_call (s, (tcg_target_long) ptr, 1, 0); } #endif @@ -1493,7 +1494,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, } break; case INDEX_op_call: - tcg_out_call (s, args[0], const_args[0]); + tcg_out_call (s, args[0], const_args[0], LK); break; case INDEX_op_movi_i32: tcg_out_movi(s, TCG_TYPE_I32, args[0], args[1]); -- 1.8.1.4