From nobody Tue Apr 15 02:54:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544757887648945.8019721821879; Thu, 13 Dec 2018 19:24:47 -0800 (PST) Received: from localhost ([::1]:59078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe5k-0001kG-Db for importer@patchew.org; Thu, 13 Dec 2018 22:24:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe0m-0005tp-JL for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXe0l-0006Yu-K3 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:36 -0500 Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]:42982) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXe0l-0006W0-Dk for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:35 -0500 Received: by mail-ot1-x329.google.com with SMTP id v23so4096170otk.9 for ; Thu, 13 Dec 2018 19:19:35 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id g138sm2367537oib.26.2018.12.13.19.19.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 19:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7EGeWCwiLOWCXY2HFjlb7FD3hn04KtScBAMx3eYxs8U=; b=TFH9AcDO339sDQdLTHVAs5NhztvybTzDJnV+F1k5xaTjGyKO8dTgTV6mwsGAHUsHNR ht3ok0eWlvaDDO8Sz2j290gYv2TBMOHykOW3ODmXPiaQZC95vT+YDc9UULAyzQ2qoMiY fxHwqNq4TNGFHCeIZwYbkPJzMjHE+eYzKmrz0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7EGeWCwiLOWCXY2HFjlb7FD3hn04KtScBAMx3eYxs8U=; b=J3fUopcIABuh6vTyMkc2tPR2r5WoP5fUn+fzPJTPCBExO+I5dwIgsfkCt2AN37Td0U 6cmTOlYBh0+eRUJv07A01pGXJk8d0GIFYZ4llzOt1l3Dx2fFJpRW/awVidd/+ZEJ9na9 FFD04L1j93a/QYOUrBlBfGpnOvqFDUGffCNbDH6U6YkQcYASBADDoy8bWQIgCMQZeKvl 5svFrQuQwHLkWr3jk1c4ZbzUR48TlsIBVzqZzJWqI5921OPpetrfW4gZ9hohZm0ViTDH csSxUfQ3IODA3iku32A5ddFX1f3mhTe1Jqo6IyXxaVpaziDgIwdXV2cAcPikQrrPgrZn Vefw== X-Gm-Message-State: AA+aEWZDo2DoRKxmFTHxWunSsxCYV+rfGZltMp2qEc01eMfmkgzK1EfA jvHw1RHimQtH+GzKOffOJbasScCqnRgjWA== X-Google-Smtp-Source: AFSGD/Wpdi0dDjLaUw5eSEKQKNy6qdJSdL5veHPtVRFKIS/W8tN9SLahDC3pglhYcXYdhiSxnJwOsA== X-Received: by 2002:a9d:1c97:: with SMTP id l23mr1019110ota.276.1544757574488; Thu, 13 Dec 2018 19:19:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 21:18:58 -0600 Message-Id: <20181214031923.29527-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214031923.29527-1-richard.henderson@linaro.org> References: <20181214031923.29527-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::329 Subject: [Qemu-devel] [PULL 07/32] tcg/ppc: Fold away "noaddr" branch routines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There is no longer a need for preserving branch offset operands, as we no longer re-translate. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.inc.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index c2f729ee8f..2e2a22f579 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -210,18 +210,6 @@ static void reloc_pc14(tcg_insn_unit *pc, tcg_insn_uni= t *target) *pc =3D (*pc & ~0xfffc) | reloc_pc14_val(pc, target); } =20 -static inline void tcg_out_b_noaddr(TCGContext *s, int insn) -{ - unsigned retrans =3D *s->code_ptr & 0x3fffffc; - tcg_out32(s, insn | retrans); -} - -static inline void tcg_out_bc_noaddr(TCGContext *s, int insn) -{ - unsigned retrans =3D *s->code_ptr & 0xfffc; - tcg_out32(s, insn | retrans); -} - /* parse target specific constraints */ static const char *target_parse_constraint(TCGArgConstraint *ct, const char *ct_str, TCGType typ= e) @@ -1179,11 +1167,11 @@ static void tcg_out_setcond(TCGContext *s, TCGType = type, TCGCond cond, static void tcg_out_bc(TCGContext *s, int bc, TCGLabel *l) { if (l->has_value) { - tcg_out32(s, bc | reloc_pc14_val(s->code_ptr, l->u.value_ptr)); + bc |=3D reloc_pc14_val(s->code_ptr, l->u.value_ptr); } else { tcg_out_reloc(s, s->code_ptr, R_PPC_REL14, l, 0); - tcg_out_bc_noaddr(s, bc); } + tcg_out32(s, bc); } =20 static void tcg_out_brcond(TCGContext *s, TCGCond cond, @@ -1771,7 +1759,7 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGA= rg *args, bool is_64) =20 /* Load a pointer into the current opcode w/conditional branch-link. */ label_ptr =3D s->code_ptr; - tcg_out_bc_noaddr(s, BC | BI(7, CR_EQ) | BO_COND_FALSE | LK); + tcg_out32(s, BC | BI(7, CR_EQ) | BO_COND_FALSE | LK); =20 rbase =3D TCG_REG_R3; #else /* !CONFIG_SOFTMMU */ @@ -1846,7 +1834,7 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGA= rg *args, bool is_64) =20 /* Load a pointer into the current opcode w/conditional branch-link. */ label_ptr =3D s->code_ptr; - tcg_out_bc_noaddr(s, BC | BI(7, CR_EQ) | BO_COND_FALSE | LK); + tcg_out32(s, BC | BI(7, CR_EQ) | BO_COND_FALSE | LK); =20 rbase =3D TCG_REG_R3; #else /* !CONFIG_SOFTMMU */ @@ -2044,13 +2032,14 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc= , const TCGArg *args, case INDEX_op_br: { TCGLabel *l =3D arg_label(args[0]); + uint32_t insn =3D B; =20 if (l->has_value) { - tcg_out_b(s, 0, l->u.value_ptr); + insn |=3D reloc_pc24_val(s->code_ptr, l->u.value_ptr); } else { tcg_out_reloc(s, s->code_ptr, R_PPC_REL24, l, 0); - tcg_out_b_noaddr(s, B); } + tcg_out32(s, insn); } break; case INDEX_op_ld8u_i32: --=20 2.17.2