From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3774 invoked by alias); 6 Aug 2014 17:20:28 -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 2860 invoked by uid 89); 6 Aug 2014 17:20:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,KAM_STOCKGEN,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=no 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:17 +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 s76HKFqn024545 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:20:15 -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 s76HJ2pf030913; Wed, 6 Aug 2014 13:20:15 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 125/236] config/aarch64/aarch64.c: Use rtx_insn Date: Wed, 06 Aug 2014 17:20:00 -0000 Message-Id: <1407345815-14551-126-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 X-SW-Source: 2014-08/txt/msg00526.txt.bz2 gcc/ * config/aarch64/aarch64.c (aarch64_load_symref_appropriately): Strengthen local "insns" from rtx to rtx_insn *. (aarch64_set_frame_expr): Likewise for local "insn". (aarch64_save_or_restore_fprs): Likewise. (aarch64_save_or_restore_callee_save_registers): Likewise. (aarch64_expand_prologue): Likewise. (aarch64_expand_epilogue): Likewise. (aarch64_output_mi_thunk): Likewise. (aarch64_split_compare_and_swap): Strengthen locals "label1" and "label2" from rtx to rtx_code_label *. (aarch64_split_atomic_op): Likewise for local "label". --- gcc/config/aarch64/aarch64.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index f69457a..4c821f5 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -691,7 +691,7 @@ aarch64_load_symref_appropriately (rtx dest, rtx imm, case SYMBOL_SMALL_TLSGD: { - rtx insns; + rtx_insn *insns; rtx result = gen_rtx_REG (Pmode, R0_REGNUM); start_sequence (); @@ -1882,7 +1882,7 @@ aarch64_layout_frame (void) static void aarch64_set_frame_expr (rtx frame_pattern) { - rtx insn; + rtx_insn *insn; insn = get_last_insn (); RTX_FRAME_RELATED_P (insn) = 1; @@ -1906,7 +1906,7 @@ aarch64_save_or_restore_fprs (int start_offset, int increment, { unsigned regno; unsigned regno2; - rtx insn; + rtx_insn *insn; rtx (*gen_mem_ref)(enum machine_mode, rtx) = (frame_pointer_needed)? gen_frame_mem : gen_rtx_MEM; @@ -1990,7 +1990,7 @@ static void aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT offset, bool restore) { - rtx insn; + rtx_insn *insn; rtx base_rtx = stack_pointer_rtx; HOST_WIDE_INT start_offset = offset; HOST_WIDE_INT increment = UNITS_PER_WORD; @@ -2128,7 +2128,7 @@ aarch64_expand_prologue (void) HOST_WIDE_INT original_frame_size; /* local variables + vararg save */ HOST_WIDE_INT frame_size, offset; HOST_WIDE_INT fp_offset; /* FP offset from SP */ - rtx insn; + rtx_insn *insn; aarch64_layout_frame (); original_frame_size = get_frame_size () + cfun->machine->saved_varargs_size; @@ -2293,7 +2293,7 @@ aarch64_expand_epilogue (bool for_sibcall) { HOST_WIDE_INT original_frame_size, frame_size, offset; HOST_WIDE_INT fp_offset; - rtx insn; + rtx_insn *insn; rtx cfa_reg; aarch64_layout_frame (); @@ -2669,7 +2669,8 @@ aarch64_output_mi_thunk (FILE *file, tree thunk ATTRIBUTE_UNUSED, to return a pointer to an aggregate. On AArch64 a result value pointer will be in x8. */ int this_regno = R0_REGNUM; - rtx this_rtx, temp0, temp1, addr, insn, funexp; + rtx this_rtx, temp0, temp1, addr, funexp; + rtx_insn *insn; reload_completed = 1; emit_note (NOTE_INSN_PROLOGUE_END); @@ -8294,7 +8295,8 @@ aarch64_split_compare_and_swap (rtx operands[]) rtx rval, mem, oldval, newval, scratch; enum machine_mode mode; bool is_weak; - rtx label1, label2, x, cond; + rtx_code_label *label1, *label2; + rtx x, cond; rval = operands[0]; mem = operands[1]; @@ -8304,7 +8306,7 @@ aarch64_split_compare_and_swap (rtx operands[]) scratch = operands[7]; mode = GET_MODE (mem); - label1 = NULL_RTX; + label1 = NULL; if (!is_weak) { label1 = gen_label_rtx (); @@ -8347,7 +8349,8 @@ aarch64_split_atomic_op (enum rtx_code code, rtx old_out, rtx new_out, rtx mem, { enum machine_mode mode = GET_MODE (mem); enum machine_mode wmode = (mode == DImode ? DImode : SImode); - rtx label, x; + rtx_code_label *label; + rtx x; label = gen_label_rtx (); emit_label (label); -- 1.8.5.3