From patchwork Tue Sep 6 03:43:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9315679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 616FE60760 for ; Tue, 6 Sep 2016 05:31:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4637D28B56 for ; Tue, 6 Sep 2016 05:31:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B26A28B5E; Tue, 6 Sep 2016 05:31:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9F4EC28B56 for ; Tue, 6 Sep 2016 05:31:58 +0000 (UTC) Received: from localhost ([::1]:58770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh8zF-0006Lm-Si for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Sep 2016 01:31:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GT-0003HW-U9 for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7GI-0007wK-RZ for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:37 -0400 Received: from ozlabs.org ([103.22.144.67]:39784) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GI-0007lN-Fu; Mon, 05 Sep 2016 23:41:26 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3sSspF506hz9t2D; Tue, 6 Sep 2016 13:41:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1473133285; bh=EcJfbHMwfkqAEy7MSkv401R0Itu+5hk5pdjGDBb72e0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jf1EHq1jfseLMAf3nhBdu8L6PnuKShTEzmqW9YQGrBWvSHM0nSdK8NRvKFqoYw51B JPEPk+B2RhWcl/rIZ/P+kLK7ilZxCSKaf44rIQ6heDKCLfog2nFovN2Ydii+gEP1Q/ 34v3UDKYsWST/uMPA41arn+KqZ9CppQLf1wCG4cs= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 6 Sep 2016 13:43:10 +1000 Message-Id: <1473133396-18940-61-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473133396-18940-1-git-send-email-david@gibson.dropbear.id.au> References: <1473133396-18940-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 60/66] ppc: Don't generate dead code on unconditional branches 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: David Gibson , qemu-ppc@nongnu.org, agraf@suse.de, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Benjamin Herrenschmidt We are always generating the "else" case of the condition even when generating an unconditional branch that will never hit it. Signed-off-by: Benjamin Herrenschmidt Reviewed-by: Richard Henderson Signed-off-by: David Gibson --- target-ppc/translate.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 0a5a3e2..618334a 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -3480,8 +3480,10 @@ static inline void gen_bcond(DisasContext *ctx, int type) } else { gen_goto_tb(ctx, 0, li); } - gen_set_label(l1); - gen_goto_tb(ctx, 1, ctx->nip); + if ((bo & 0x14) != 0x14) { + gen_set_label(l1); + gen_goto_tb(ctx, 1, ctx->nip); + } } else { if (NARROW_MODE(ctx)) { tcg_gen_andi_tl(cpu_nip, target, (uint32_t)~3); @@ -3489,9 +3491,11 @@ static inline void gen_bcond(DisasContext *ctx, int type) tcg_gen_andi_tl(cpu_nip, target, ~3); } tcg_gen_exit_tb(0); - gen_set_label(l1); - gen_update_nip(ctx, ctx->nip); - tcg_gen_exit_tb(0); + if ((bo & 0x14) != 0x14) { + gen_set_label(l1); + gen_update_nip(ctx, ctx->nip); + tcg_gen_exit_tb(0); + } } if (type == BCOND_LR || type == BCOND_CTR || type == BCOND_TAR) { tcg_temp_free(target);