From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23209 invoked by alias); 26 Aug 2014 15:54:59 -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 23058 invoked by uid 89); 26 Aug 2014 15:54:58 -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,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; Tue, 26 Aug 2014 15:54:56 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7QFssv9017259 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Aug 2014 11:54:54 -0400 Received: from c64.redhat.com (vpn-226-49.phx2.redhat.com [10.3.226.49]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7QFsoUm026101; Tue, 26 Aug 2014 11:54:53 -0400 From: David Malcolm To: Jeff Law Cc: Richard Henderson , gcc-patches@gcc.gnu.org, David Malcolm Subject: [PATCH 3/3] Use rtx_insn in more places in dwarf2cfi.c Date: Tue, 26 Aug 2014 15:54:00 -0000 Message-Id: <1409068812-3313-4-git-send-email-dmalcolm@redhat.com> In-Reply-To: <1409068812-3313-1-git-send-email-dmalcolm@redhat.com> References: <53FB4691.1080501@redhat.com> <1409068812-3313-1-git-send-email-dmalcolm@redhat.com> X-IsSubscribed: yes X-SW-Source: 2014-08/txt/msg02413.txt.bz2 gcc/ * dwarf2cfi.c (dw_trace_info): Strengthen field "head" from rtx to rtx_insn *. (get_trace_info): Likewise for param "insn". (save_point_p): Likewise. (maybe_record_trace_start): Likewise for both params. (maybe_record_trace_start_abnormal): Likewise. (create_trace_edges): Likewise for sole param and for three of the locals named "lab". (scan_trace): Strengthen local "prev", "insn", "control" from rtx to rtx_insn *, and update a call to pat->element to pat->insn. --- gcc/dwarf2cfi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c index 8b00b1e..e3fb078 100644 --- a/gcc/dwarf2cfi.c +++ b/gcc/dwarf2cfi.c @@ -100,7 +100,7 @@ typedef struct GTY(()) reg_saved_in_data_struct { typedef struct { /* The insn that begins the trace. */ - rtx head; + rtx_insn *head; /* The row state at the beginning and end of the trace. */ dw_cfi_row *beg_row, *end_row; @@ -303,7 +303,7 @@ expand_builtin_init_dwarf_reg_sizes (tree address) static dw_trace_info * -get_trace_info (rtx insn) +get_trace_info (rtx_insn *insn) { dw_trace_info dummy; dummy.head = insn; @@ -311,7 +311,7 @@ get_trace_info (rtx insn) } static bool -save_point_p (rtx insn) +save_point_p (rtx_insn *insn) { /* Labels, except those that are really jump tables. */ if (LABEL_P (insn)) @@ -2197,7 +2197,7 @@ add_cfis_to_fde (void) trace from CUR_TRACE and CUR_ROW. */ static void -maybe_record_trace_start (rtx start, rtx origin) +maybe_record_trace_start (rtx_insn *start, rtx_insn *origin) { dw_trace_info *ti; HOST_WIDE_INT args_size; @@ -2248,7 +2248,7 @@ maybe_record_trace_start (rtx start, rtx origin) and non-local goto edges. */ static void -maybe_record_trace_start_abnormal (rtx start, rtx origin) +maybe_record_trace_start_abnormal (rtx_insn *start, rtx_insn *origin) { HOST_WIDE_INT save_args_size, delta; dw_cfa_location save_cfa; @@ -2284,7 +2284,7 @@ maybe_record_trace_start_abnormal (rtx start, rtx origin) /* ??? Sadly, this is in large part a duplicate of make_edges. */ static void -create_trace_edges (rtx insn) +create_trace_edges (rtx_insn *insn) { rtx tmp; int i, n; @@ -2303,7 +2303,7 @@ create_trace_edges (rtx insn) n = GET_NUM_ELEM (vec); for (i = 0; i < n; ++i) { - rtx lab = XEXP (RTVEC_ELT (vec, i), 0); + rtx_insn *lab = as_a (XEXP (RTVEC_ELT (vec, i), 0)); maybe_record_trace_start (lab, insn); } } @@ -2319,13 +2319,14 @@ create_trace_edges (rtx insn) n = ASM_OPERANDS_LABEL_LENGTH (tmp); for (i = 0; i < n; ++i) { - rtx lab = XEXP (ASM_OPERANDS_LABEL (tmp, i), 0); + rtx_insn *lab = + as_a (XEXP (ASM_OPERANDS_LABEL (tmp, i), 0)); maybe_record_trace_start (lab, insn); } } else { - rtx lab = JUMP_LABEL (insn); + rtx_insn *lab = JUMP_LABEL_AS_INSN (insn); gcc_assert (lab != NULL); maybe_record_trace_start (lab, insn); } @@ -2376,7 +2377,7 @@ scan_insn_after (rtx insn) static void scan_trace (dw_trace_info *trace) { - rtx prev, insn = trace->head; + rtx_insn *prev, *insn = trace->head; dw_cfa_location this_cfa; if (dump_file) @@ -2397,7 +2398,7 @@ scan_trace (dw_trace_info *trace) insn; prev = insn, insn = NEXT_INSN (insn)) { - rtx control; + rtx_insn *control; /* Do everything that happens "before" the insn. */ add_cfi_insn = prev; @@ -2427,7 +2428,7 @@ scan_trace (dw_trace_info *trace) rtx elt; int i, n = pat->len (); - control = pat->element (0); + control = pat->insn (0); if (can_throw_internal (control)) notice_eh_throw (control); dwarf2out_flush_queued_reg_saves (); -- 1.8.5.3