From patchwork Thu Sep 14 08:06:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 813741 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-462107-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="W14ukKrD"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xtB255BLKz9s72 for ; Thu, 14 Sep 2017 18:06:37 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:reply-to:mime-version:content-type; q=dns; s=default; b=j8n62P+hnvExXuRER7DN98ZW+Hz0tjZNyIdi7tKLqi7 q3UI+KxdPLI+uhI0mEBiALFvMT8AeO1Wqp3gWEpiYyaWbWspWLJ8C5sYirK4x9hE Kg6sIRxjYKvMpOIBc0F16hjEJTNVQ16Z3UnLJ83LHbBVCD04k+2xyyvcM6Y/xYbY = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:reply-to:mime-version:content-type; s=default; bh=vBTOEFMDK1BkIgF+uVFe1I+XrLA=; b=W14ukKrDCYCSjCo3b 3CeSBR906DZxuDYj664XGaPgf7pc5ZVERHuiS8h2D/lxwD3j2dqUO/C5grjLUOHp thYVIWUS2SPQxb2jT8hFCvaUvWNW1rw6hZCeD+vgHDuujldw7Ulasu0DzK99lxRV uIkDmEVdOuUSPeemUArViW4e1s= Received: (qmail 108675 invoked by alias); 14 Sep 2017 08:06:29 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 108652 invoked by uid 89); 14 Sep 2017 08:06:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.9 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 14 Sep 2017 08:06:16 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 544704E4D4 for ; Thu, 14 Sep 2017 08:06:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 544704E4D4 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jakub@redhat.com Received: from tucnak.zalov.cz (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F31EA5C8B6 for ; Thu, 14 Sep 2017 08:06:14 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.15.2/8.15.2) with ESMTP id v8E86CNY009768 for ; Thu, 14 Sep 2017 10:06:12 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.15.2/8.15.2/Submit) id v8E86Bbn009767 for gcc-patches@gcc.gnu.org; Thu, 14 Sep 2017 10:06:11 +0200 Date: Thu, 14 Sep 2017 10:06:11 +0200 From: Jakub Jelinek To: gcc-patches@gcc.gnu.org Subject: [committed] Formatting fixes in the combiner Message-ID: <20170914080611.GF1701@tucnak> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.7.1 (2016-10-04) X-IsSubscribed: yes Hi! While debugging this function I've noticed way too many formatting issues and fixed them, committed as obvious to trunk: 2017-09-14 Jakub Jelinek * combine.c (make_compound_operation_int): Formatting fixes. Jakub --- gcc/combine.c.jj 2017-09-12 21:58:06.000000000 +0200 +++ gcc/combine.c 2017-09-13 14:37:07.521081009 +0200 @@ -7976,8 +7976,8 @@ make_compound_operation_int (scalar_int_ && (i = exact_log2 (UINTVAL (XEXP (x, 1)) + 1)) >= 0) { new_rtx = make_compound_operation (XEXP (XEXP (x, 0), 0), next_code); - new_rtx = make_extraction (mode, new_rtx, 0, XEXP (XEXP (x, 0), 1), i, 1, - 0, in_code == COMPARE); + new_rtx = make_extraction (mode, new_rtx, 0, XEXP (XEXP (x, 0), 1), + i, 1, 0, in_code == COMPARE); } /* Same as previous, but for (subreg (lshiftrt ...)) in first op. */ @@ -8016,10 +8016,10 @@ make_compound_operation_int (scalar_int_ { /* Apply the distributive law, and then try to make extractions. */ new_rtx = gen_rtx_fmt_ee (GET_CODE (XEXP (x, 0)), mode, - gen_rtx_AND (mode, XEXP (XEXP (x, 0), 0), - XEXP (x, 1)), - gen_rtx_AND (mode, XEXP (XEXP (x, 0), 1), - XEXP (x, 1))); + gen_rtx_AND (mode, XEXP (XEXP (x, 0), 0), + XEXP (x, 1)), + gen_rtx_AND (mode, XEXP (XEXP (x, 0), 1), + XEXP (x, 1))); new_rtx = make_compound_operation (new_rtx, in_code); } @@ -8033,9 +8033,9 @@ make_compound_operation_int (scalar_int_ { new_rtx = make_compound_operation (XEXP (XEXP (x, 0), 0), next_code); new_rtx = make_extraction (mode, new_rtx, - (GET_MODE_PRECISION (mode) - - INTVAL (XEXP (XEXP (x, 0), 1))), - NULL_RTX, i, 1, 0, in_code == COMPARE); + (GET_MODE_PRECISION (mode) + - INTVAL (XEXP (XEXP (x, 0), 1))), + NULL_RTX, i, 1, 0, in_code == COMPARE); } /* On machines without logical shifts, if the operand of the AND is @@ -8055,8 +8055,10 @@ make_compound_operation_int (scalar_int_ if ((INTVAL (XEXP (x, 1)) & ~mask) == 0) SUBST (XEXP (x, 0), gen_rtx_ASHIFTRT (mode, - make_compound_operation - (XEXP (XEXP (x, 0), 0), next_code), + make_compound_operation (XEXP (XEXP (x, + 0), + 0), + next_code), XEXP (XEXP (x, 0), 1))); } @@ -8066,9 +8068,9 @@ make_compound_operation_int (scalar_int_ we are in a COMPARE. */ else if ((i = exact_log2 (UINTVAL (XEXP (x, 1)) + 1)) >= 0) new_rtx = make_extraction (mode, - make_compound_operation (XEXP (x, 0), - next_code), - 0, NULL_RTX, i, 1, 0, in_code == COMPARE); + make_compound_operation (XEXP (x, 0), + next_code), + 0, NULL_RTX, i, 1, 0, in_code == COMPARE); /* If we are in a comparison and this is an AND with a power of two, convert this into the appropriate bit extract. */ @@ -8119,9 +8121,9 @@ make_compound_operation_int (scalar_int_ && (nonzero_bits (XEXP (x, 0), mode) & (1 << (mode_width - 1))) == 0) { new_rtx = gen_rtx_ASHIFTRT (mode, - make_compound_operation (XEXP (x, 0), - next_code), - XEXP (x, 1)); + make_compound_operation (XEXP (x, 0), + next_code), + XEXP (x, 1)); break; } @@ -8142,9 +8144,9 @@ make_compound_operation_int (scalar_int_ { new_rtx = make_compound_operation (XEXP (lhs, 0), next_code); new_rtx = make_extraction (mode, new_rtx, - INTVAL (rhs) - INTVAL (XEXP (lhs, 1)), - NULL_RTX, mode_width - INTVAL (rhs), - code == LSHIFTRT, 0, in_code == COMPARE); + INTVAL (rhs) - INTVAL (XEXP (lhs, 1)), + NULL_RTX, mode_width - INTVAL (rhs), + code == LSHIFTRT, 0, in_code == COMPARE); break; } @@ -8161,9 +8163,10 @@ make_compound_operation_int (scalar_int_ && INTVAL (rhs) < HOST_BITS_PER_WIDE_INT && INTVAL (rhs) < mode_width && (new_rtx = extract_left_shift (mode, lhs, INTVAL (rhs))) != 0) - new_rtx = make_extraction (mode, make_compound_operation (new_rtx, next_code), - 0, NULL_RTX, mode_width - INTVAL (rhs), - code == LSHIFTRT, 0, in_code == COMPARE); + new_rtx = make_extraction (mode, make_compound_operation (new_rtx, + next_code), + 0, NULL_RTX, mode_width - INTVAL (rhs), + code == LSHIFTRT, 0, in_code == COMPARE); break;