From patchwork Wed Sep 25 16:27:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 277924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2CD342C012E for ; Thu, 26 Sep 2013 02:41:45 +1000 (EST) Received: from localhost ([::1]:53834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOs0a-0000Rk-0D for incoming@patchwork.ozlabs.org; Wed, 25 Sep 2013 12:32:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOrwo-0002sH-7S for qemu-devel@nongnu.org; Wed, 25 Sep 2013 12:28:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOrwi-00039E-DN for qemu-devel@nongnu.org; Wed, 25 Sep 2013 12:28:18 -0400 Received: from mail-pd0-x22b.google.com ([2607:f8b0:400e:c02::22b]:45656) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOrwi-000397-5U for qemu-devel@nongnu.org; Wed, 25 Sep 2013 12:28:12 -0400 Received: by mail-pd0-f171.google.com with SMTP id g10so6290856pdj.2 for ; Wed, 25 Sep 2013 09:28:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=JhJOLPHf4+NNNcax+RDLLbt8PgREcEcUmH7nmZBr4tU=; b=G/MKgwWitONqMmiSKcPB4xTRgr2uouHsbZQxnhr8JsxpfccGQdEVpV80RhmGQ0Vvei +tYGPaX5N0liTDeSwnNddOXtd7TKwp0TOYRltnE9UfK3AQqQjr9YACu1XXt9pbGBfwCg 9gtwrOOypQcWMArmsbRsf9NeGAdx1xdMPqs4P8p0lauaruPMylDRVaAhdhopt3wU6//c eudSkARftc8cS2GkaKnDLS1blE716QyxbYIjFcaIBveBIWfMZ60nBDd7Y5TG5tUySxi0 P0/igU23aOgblKnPBGFLR62JSi6lKvDcvZ0IsqD6Y7Vh0wtOWkdhz1PULSvujBp7WAit v2vw== X-Received: by 10.68.239.168 with SMTP id vt8mr18399688pbc.125.1380126491349; Wed, 25 Sep 2013 09:28:11 -0700 (PDT) Received: from anchor.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id oj6sm54530947pab.9.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 25 Sep 2013 09:28:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 25 Sep 2013 09:27:37 -0700 Message-Id: <1380126458-3247-21-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1380126458-3247-1-git-send-email-rth@twiddle.net> References: <1380126458-3247-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22b Cc: anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 20/21] tcg-ppc64: Add _noaddr functions for emitting forward branches X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org ... 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 2076299..c225c8e 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, intptr_t value, intptr_t 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;