From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27021 invoked by alias); 6 Aug 2014 17:43:38 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 26989 invoked by uid 89); 6 Aug 2014 17:43:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 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 17:43:37 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XF4uH-0001j3-NX for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:21:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XF4uH-0001ip-FP for gcc-patches@gcc.gnu.org; Wed, 06 Aug 2014 13:21:45 -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 s76HKix7029149 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:20:44 -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 s76HJ2qU030913; Wed, 6 Aug 2014 13:20:43 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 174/236] Remove VINSN_INSN_RTX scaffolding Date: Wed, 06 Aug 2014 17:43:00 -0000 Message-Id: <1407345815-14551-175-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 X-SW-Source: 2014-08/txt/msg00663.txt.bz2 gcc/ * sel-sched-ir.h (struct vinsn_def): Strengthen field "insn_rtx" from rtx to rtx_insn *. (VINSN_INSN_RTX): Eliminate rvalue function and... (SET_VINSN_INSN): ...lvalue function in favor of... (VINSN_INSN_RTX): reinstate this old macro. * sel-sched-ir.c (vinsn_init): Eliminate use of SET_VINSN_INSN_RTX in favor of VINSN_INSN_RTX. (VINSN_INSN_RTX): Delete this function. (SET_VINSN_INSN_RTX): Likewise. / * rtx-classes-status.txt: Delete SET_VINSN_INSN_RTX. --- gcc/sel-sched-ir.c | 12 +----------- gcc/sel-sched-ir.h | 5 ++--- rtx-classes-status.txt | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index a15bfc0..a996cc8 100644 --- a/gcc/sel-sched-ir.c +++ b/gcc/sel-sched-ir.c @@ -1182,7 +1182,7 @@ vinsn_init (vinsn_t vi, insn_t insn, bool force_unique_p) hash_rtx_callback_function hrcf; int insn_class; - SET_VINSN_INSN_RTX (vi) = insn; + VINSN_INSN_RTX (vi) = insn; VINSN_COUNT (vi) = 0; vi->cost = -1; @@ -6454,14 +6454,4 @@ sel_remove_loop_preheader (void) preheader_blocks); } -rtx_insn *VINSN_INSN_RTX (vinsn_t vi) -{ - return as_a_nullable (vi->insn_rtx); -} - -rtx& SET_VINSN_INSN_RTX (vinsn_t vi) -{ - return vi->insn_rtx; -} - #endif diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h index 118e001..9f1fb6b 100644 --- a/gcc/sel-sched-ir.h +++ b/gcc/sel-sched-ir.h @@ -655,7 +655,7 @@ struct idata_def struct vinsn_def { /* Associated insn. */ - rtx insn_rtx; + rtx_insn *insn_rtx; /* Its description. */ struct idata_def id; @@ -677,8 +677,7 @@ struct vinsn_def bool may_trap_p; }; -extern rtx_insn *VINSN_INSN_RTX (vinsn_t); -extern rtx& SET_VINSN_INSN_RTX (vinsn_t); +#define VINSN_INSN_RTX(VI) ((VI)->insn_rtx) #define VINSN_PATTERN(VI) (PATTERN (VINSN_INSN_RTX (VI))) #define VINSN_ID(VI) (&((VI)->id)) diff --git a/rtx-classes-status.txt b/rtx-classes-status.txt index 29d445f..347114b 100644 --- a/rtx-classes-status.txt +++ b/rtx-classes-status.txt @@ -14,4 +14,3 @@ TODO: "Scaffolding" to be removed * SET_BB_HEAD, SET_BB_END, SET_BB_HEADER * SET_DEP_PRO, SET_DEP_CON * SET_NEXT_INSN, SET_PREV_INSN -* SET_VINSN_INSN_RTX -- 1.8.5.3