From patchwork Wed Aug 6 17:20:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 377321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 EA7AC140080 for ; Thu, 7 Aug 2014 04:20:35 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=FO36LjVTAjkY6dlwcq5NlGQdPNOsOylXj1df/7aulEuA79/Z4l6vz c06rZXkh0ZCVAUpZIUo2uIS0fy78BdDcvTdZQc1/EtxluCUL0HihIpyAH5EzPEBu 4eHcdyiusZ3KCGCfOSNBHYo+OM8n4vqGdQ+UmUf7dZQx9fbEQ36UuA= 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:from :to:cc:subject:date:message-id:in-reply-to:references; s= default; bh=prtPOk1YF8QyOYhat+W+QhoXtDs=; b=KJheSS2zdfQhD1eq6/3F Dx7vheBdCJwGUXeIOo9vKqYxeNsaTu3KSvExLosACYhfPOTdy3d/JJsnE4UNQm7K ydaTIp5/Qpd9VcqzkjOt5xRJajpryNBRI7NsUo+fsMW0Ppg12+DFDPSajcdG+Acc U1+uBh3CFDITmTtlDw8kjkM= Received: (qmail 26933 invoked by alias); 6 Aug 2014 18:03:04 -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 26754 invoked by uid 89); 6 Aug 2014 18:03:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (208.118.235.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 06 Aug 2014 18:03:01 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF4tE-000103-00 for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:20:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF4tD-0000zd-OW for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:20:39 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s76HJdPO005587 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:19:39 -0400 Received: from c64.redhat.com (vpn-239-139.phx2.redhat.com [10.3.239.139]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s76HJ2oc030913; Wed, 6 Aug 2014 13:19:38 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 062/236] combine-stack-adj.c: Use rtx_insn Date: Wed, 6 Aug 2014 13:20:41 -0400 Message-Id: <1407345815-14551-63-git-send-email-dmalcolm@redhat.com> In-Reply-To: <1407345815-14551-1-git-send-email-dmalcolm@redhat.com> References: <1407345815-14551-1-git-send-email-dmalcolm@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 X-IsSubscribed: yes gcc/ * combine-stack-adj.c (struct csa_reflist): Strengthen field "insn" from rtx to rtx_insn *. (single_set_for_csa): Likewise for param "insn". (record_one_stack_ref): Likewise. (try_apply_stack_adjustment): Likewise. (struct record_stack_refs_data): Likewise for field "insn". (maybe_move_args_size_note): Likewise for params "last" and "insn". (prev_active_insn_bb): Likewise for return type and param "insn". (next_active_insn_bb): Likewise. (force_move_args_size_note): Likewise for params "prev" and "last" and locals "test", "next_candidate", "prev_candidate". (combine_stack_adjustments_for_block): Strengthen locals "last_sp_set", "last2_sp_set", "insn", "next" from rtx to rtx_insn *. --- gcc/combine-stack-adj.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c index 11434dd..29bd3d3 100644 --- a/gcc/combine-stack-adj.c +++ b/gcc/combine-stack-adj.c @@ -73,16 +73,17 @@ along with GCC; see the file COPYING3. If not see struct csa_reflist { HOST_WIDE_INT sp_offset; - rtx insn, *ref; + rtx_insn *insn; + rtx *ref; struct csa_reflist *next; }; static int stack_memref_p (rtx); -static rtx single_set_for_csa (rtx); +static rtx single_set_for_csa (rtx_insn *); static void free_csa_reflist (struct csa_reflist *); -static struct csa_reflist *record_one_stack_ref (rtx, rtx *, +static struct csa_reflist *record_one_stack_ref (rtx_insn *, rtx *, struct csa_reflist *); -static int try_apply_stack_adjustment (rtx, struct csa_reflist *, +static int try_apply_stack_adjustment (rtx_insn *, struct csa_reflist *, HOST_WIDE_INT, HOST_WIDE_INT); static void combine_stack_adjustments_for_block (basic_block); static int record_stack_refs (rtx *, void *); @@ -122,7 +123,7 @@ stack_memref_p (rtx x) tying fp and sp adjustments. */ static rtx -single_set_for_csa (rtx insn) +single_set_for_csa (rtx_insn *insn) { int i; rtx tmp = single_set (insn); @@ -171,7 +172,7 @@ free_csa_reflist (struct csa_reflist *reflist) predicate stack_memref_p or a REG representing the stack pointer. */ static struct csa_reflist * -record_one_stack_ref (rtx insn, rtx *ref, struct csa_reflist *next_reflist) +record_one_stack_ref (rtx_insn *insn, rtx *ref, struct csa_reflist *next_reflist) { struct csa_reflist *ml; @@ -194,7 +195,7 @@ record_one_stack_ref (rtx insn, rtx *ref, struct csa_reflist *next_reflist) on success. */ static int -try_apply_stack_adjustment (rtx insn, struct csa_reflist *reflist, +try_apply_stack_adjustment (rtx_insn *insn, struct csa_reflist *reflist, HOST_WIDE_INT new_adjust, HOST_WIDE_INT delta) { struct csa_reflist *ml; @@ -240,7 +241,7 @@ try_apply_stack_adjustment (rtx insn, struct csa_reflist *reflist, references in the insn and discard all other stack pointer references. */ struct record_stack_refs_data { - rtx insn; + rtx_insn *insn; struct csa_reflist *reflist; }; @@ -297,7 +298,7 @@ record_stack_refs (rtx *xp, void *data) AFTER is true iff LAST follows INSN in the instruction stream. */ static void -maybe_move_args_size_note (rtx last, rtx insn, bool after) +maybe_move_args_size_note (rtx_insn *last, rtx_insn *insn, bool after) { rtx note, last_note; @@ -319,35 +320,36 @@ maybe_move_args_size_note (rtx last, rtx insn, bool after) /* Return the next (or previous) active insn within BB. */ -static rtx -prev_active_insn_bb (basic_block bb, rtx insn) +static rtx_insn * +prev_active_insn_bb (basic_block bb, rtx_insn *insn) { for (insn = PREV_INSN (insn); insn != PREV_INSN (BB_HEAD (bb)); insn = PREV_INSN (insn)) if (active_insn_p (insn)) return insn; - return NULL_RTX; + return NULL; } -static rtx -next_active_insn_bb (basic_block bb, rtx insn) +static rtx_insn * +next_active_insn_bb (basic_block bb, rtx_insn *insn) { for (insn = NEXT_INSN (insn); insn != NEXT_INSN (BB_END (bb)); insn = NEXT_INSN (insn)) if (active_insn_p (insn)) return insn; - return NULL_RTX; + return NULL; } /* If INSN has a REG_ARGS_SIZE note, if possible move it to PREV. Otherwise search for a nearby candidate within BB where we can stick the note. */ static void -force_move_args_size_note (basic_block bb, rtx prev, rtx insn) +force_move_args_size_note (basic_block bb, rtx_insn *prev, rtx_insn *insn) { - rtx note, test, next_candidate, prev_candidate; + rtx note; + rtx_insn *test, *next_candidate, *prev_candidate; /* If PREV exists, tail-call to the logic in the other function. */ if (prev) @@ -425,10 +427,11 @@ static void combine_stack_adjustments_for_block (basic_block bb) { HOST_WIDE_INT last_sp_adjust = 0; - rtx last_sp_set = NULL_RTX; - rtx last2_sp_set = NULL_RTX; + rtx_insn *last_sp_set = NULL; + rtx_insn *last2_sp_set = NULL; struct csa_reflist *reflist = NULL; - rtx insn, next, set; + rtx_insn *insn, *next; + rtx set; struct record_stack_refs_data data; bool end_of_block = false; @@ -574,7 +577,7 @@ combine_stack_adjustments_for_block (basic_block bb) delete_insn (last_sp_set); free_csa_reflist (reflist); reflist = NULL; - last_sp_set = NULL_RTX; + last_sp_set = NULL; last_sp_adjust = 0; continue; } @@ -603,8 +606,8 @@ combine_stack_adjustments_for_block (basic_block bb) } free_csa_reflist (reflist); reflist = NULL; - last2_sp_set = NULL_RTX; - last_sp_set = NULL_RTX; + last2_sp_set = NULL; + last_sp_set = NULL; last_sp_adjust = 0; } }