From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGAKR-0000R1-PU for qemu-devel@nongnu.org; Sun, 01 Sep 2013 12:16:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGAKL-0006yw-W6 for qemu-devel@nongnu.org; Sun, 01 Sep 2013 12:16:43 -0400 Received: from mail-pb0-x22e.google.com ([2607:f8b0:400e:c01::22e]:36233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGAKL-0006ym-Or for qemu-devel@nongnu.org; Sun, 01 Sep 2013 12:16:37 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so3774374pbb.5 for ; Sun, 01 Sep 2013 09:16:36 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Sun, 1 Sep 2013 09:16:12 -0700 Message-Id: <1378052173-3579-14-git-send-email-rth@twiddle.net> In-Reply-To: <1378052173-3579-1-git-send-email-rth@twiddle.net> References: <1378052173-3579-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 13/14] tcg-ppc64: Add _noaddr functions for emitting forward branches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Vassili Karpov (malc)" , aurelien@aurel32.net, Richard Henderson ... rather than open-coding this stuff through the file. Signed-off-by: Richard Henderson --- tcg/ppc64/tcg-target.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 61bb463..4b53560 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -204,6 +204,18 @@ static void reloc_pc14(void *pc, tcg_target_long target) *(uint32_t *)pc = (*(uint32_t *)pc & ~0xfffc) | reloc_pc14_val(pc, target); } +static inline void tcg_out_b_noaddr(TCGContext *s, int insn) +{ + unsigned retrans = *(uint32_t *)s->code_ptr & 0x3fffffc; + tcg_out32(s, insn | retrans); +} + +static inline void tcg_out_bc_noaddr(TCGContext *s, int insn) +{ + unsigned retrans = *(uint32_t *)s->code_ptr & 0xfffc; + tcg_out32(s, insn | retrans); +} + static void patch_reloc(uint8_t *code_ptr, int type, tcg_target_long value, tcg_target_long addend) { @@ -1362,11 +1374,8 @@ static void tcg_out_bc(TCGContext *s, int bc, int label_index) if (l->has_value) { tcg_out32(s, bc | reloc_pc14_val(s->code_ptr, l->u.value)); } else { - uint16_t val = *(uint16_t *) &s->code_ptr[2]; - - /* Thanks to Andrzej Zaborowski */ - tcg_out32(s, bc | (val & 0xfffc)); - tcg_out_reloc(s, s->code_ptr - 4, R_PPC_REL14, label_index, 0); + tcg_out_reloc(s, s->code_ptr, R_PPC_REL14, label_index, 0); + tcg_out_bc_noaddr(s, bc); } } @@ -1466,11 +1475,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, if (l->has_value) { tcg_out_b(s, 0, l->u.value); } else { - uint32_t val = *(uint32_t *) s->code_ptr; - - /* Thanks to Andrzej Zaborowski */ - tcg_out32(s, B | (val & 0x3fffffc)); - tcg_out_reloc(s, s->code_ptr - 4, R_PPC_REL24, args[0], 0); + tcg_out_reloc(s, s->code_ptr, R_PPC_REL24, args[0], 0); + tcg_out_b_noaddr(s, B); } } break; -- 1.8.3.1