From patchwork Wed Aug 6 17:21:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 377143 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 9A7A41400AA for ; Thu, 7 Aug 2014 03:33:16 +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=UcCK5iOSFCWNrdRcxKlu0AGfSmHBC/f+t9zYHxQ1zxfHJkVkENed5 eWRZTghKLHDgi5pWS3PHqexhaNTKk6fCnFi6yrUXwC2uFJVSvzx19Cx16KMUuCVw JHGx0VokQXcYkWTZweFweHRHdR+RqEmZ+REBra+ePsb9Et5j+J1uSE= 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=d1KJSGPdoUZqojtrOUxOssnlHKA=; b=k9b3VrEiSVYRsjz76IOS +1BNIGaAe2NXViu3fPlnAcOkKtrtH+jTwycdH0RH0ozC6VW7cMSpshQMTCkDPIMH 319B3+jYO29YMbqmZZOEaghzlXLIaKi7gHJVcoPl/+vqWV8BqLkbp76Kt7MsDC+U SiPgG+4/X6YjyhyQY89GZX8= Received: (qmail 6208 invoked by alias); 6 Aug 2014 17:20:52 -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 5023 invoked by uid 89); 6 Aug 2014 17:20:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 06 Aug 2014 17:20:40 +0000 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 s76HK7Xs023779 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:20:07 -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 s76HJ2pR030913; Wed, 6 Aug 2014 13:20:07 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 111/236] sched-deps.c: Use rtx_insn Date: Wed, 6 Aug 2014 13:21:30 -0400 Message-Id: <1407345815-14551-112-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-IsSubscribed: yes gcc/ * sched-deps.c (maybe_add_or_update_dep_1): Strengthen locals "elem", "insn" from rtx to rtx_insn *. (change_spec_dep_to_hard): Likewise. (get_back_and_forw_lists): Likewise for local "con". (sd_add_dep): Likewise for locals "elem", "insn". (sd_resolve_dep): Likewise for locals "pro", "con". (sd_unresolve_dep): Likewise. (sd_delete_dep): Likewise. (chain_to_prev_insn): Likewise for local "pro". (find_inc): Likewise for locals "pro", "con". --- gcc/sched-deps.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c index d59cffc..7228356 100644 --- a/gcc/sched-deps.c +++ b/gcc/sched-deps.c @@ -927,8 +927,8 @@ sd_find_dep_between (rtx pro, rtx con, bool resolved_p) static enum DEPS_ADJUST_RESULT maybe_add_or_update_dep_1 (dep_t dep, bool resolved_p, rtx mem1, rtx mem2) { - rtx elem = DEP_PRO (dep); - rtx insn = DEP_CON (dep); + rtx_insn *elem = DEP_PRO (dep); + rtx_insn *insn = DEP_CON (dep); gcc_assert (INSN_P (insn) && INSN_P (elem)); @@ -1118,8 +1118,8 @@ change_spec_dep_to_hard (sd_iterator_def sd_it) dep_node_t node = DEP_LINK_NODE (*sd_it.linkp); dep_link_t link = DEP_NODE_BACK (node); dep_t dep = DEP_NODE_DEP (node); - rtx elem = DEP_PRO (dep); - rtx insn = DEP_CON (dep); + rtx_insn *elem = DEP_PRO (dep); + rtx_insn *insn = DEP_CON (dep); move_dep_link (link, INSN_SPEC_BACK_DEPS (insn), INSN_HARD_BACK_DEPS (insn)); @@ -1296,7 +1296,7 @@ get_back_and_forw_lists (dep_t dep, bool resolved_p, deps_list_t *back_list_ptr, deps_list_t *forw_list_ptr) { - rtx con = DEP_CON (dep); + rtx_insn *con = DEP_CON (dep); if (!resolved_p) { @@ -1322,8 +1322,8 @@ sd_add_dep (dep_t dep, bool resolved_p) dep_node_t n = create_dep_node (); deps_list_t con_back_deps; deps_list_t pro_forw_deps; - rtx elem = DEP_PRO (dep); - rtx insn = DEP_CON (dep); + rtx_insn *elem = DEP_PRO (dep); + rtx_insn *insn = DEP_CON (dep); gcc_assert (INSN_P (insn) && INSN_P (elem) && insn != elem); @@ -1365,8 +1365,8 @@ sd_resolve_dep (sd_iterator_def sd_it) { dep_node_t node = DEP_LINK_NODE (*sd_it.linkp); dep_t dep = DEP_NODE_DEP (node); - rtx pro = DEP_PRO (dep); - rtx con = DEP_CON (dep); + rtx_insn *pro = DEP_PRO (dep); + rtx_insn *con = DEP_CON (dep); if (dep_spec_p (dep)) move_dep_link (DEP_NODE_BACK (node), INSN_SPEC_BACK_DEPS (con), @@ -1386,8 +1386,8 @@ sd_unresolve_dep (sd_iterator_def sd_it) { dep_node_t node = DEP_LINK_NODE (*sd_it.linkp); dep_t dep = DEP_NODE_DEP (node); - rtx pro = DEP_PRO (dep); - rtx con = DEP_CON (dep); + rtx_insn *pro = DEP_PRO (dep); + rtx_insn *con = DEP_CON (dep); if (dep_spec_p (dep)) move_dep_link (DEP_NODE_BACK (node), INSN_RESOLVED_BACK_DEPS (con), @@ -1428,8 +1428,8 @@ sd_delete_dep (sd_iterator_def sd_it) { dep_node_t n = DEP_LINK_NODE (*sd_it.linkp); dep_t dep = DEP_NODE_DEP (n); - rtx pro = DEP_PRO (dep); - rtx con = DEP_CON (dep); + rtx_insn *pro = DEP_PRO (dep); + rtx_insn *con = DEP_CON (dep); deps_list_t con_back_deps; deps_list_t pro_forw_deps; @@ -1670,7 +1670,7 @@ chain_to_prev_insn (rtx insn) FOR_EACH_DEP (insn, SD_LIST_BACK, sd_it, dep) { rtx i = insn; - rtx pro = DEP_PRO (dep); + rtx_insn *pro = DEP_PRO (dep); do { @@ -4717,8 +4717,8 @@ find_inc (struct mem_inc_info *mii, bool backwards) while (sd_iterator_cond (&sd_it, &dep)) { dep_node_t node = DEP_LINK_NODE (*sd_it.linkp); - rtx pro = DEP_PRO (dep); - rtx con = DEP_CON (dep); + rtx_insn *pro = DEP_PRO (dep); + rtx_insn *con = DEP_CON (dep); rtx inc_cand = backwards ? pro : con; if (DEP_NONREG (dep) || DEP_MULTIPLE (dep)) goto next;