From patchwork Wed Aug 6 17:23:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 377161 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 C865A1400AA for ; Thu, 7 Aug 2014 03:38:19 +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=OJSocQDFiUHKgCI2+q5jzBL0qlAgFySlITOcVnxYpyOW2z4/4CEnI BJVU8ztALxUdfWu4pvZTeQ8Hq7SiMsN1+nHp8acxVs1OfzmGdupT2D47EOxEzHUx f0e23CjfFywFFPsAP9Ae1fjqSM0WNnjRPgFkItenF6r7/w7Ax+Ibu4= 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=R6yD9GrqQAzg4SiGue5kB9V3kRQ=; b=JzpSytf5X7b9JPlE1w9J zXLy5OMcFZj6bhoBTDUrknfZuFzynD1bhXBDREuWc1E6AYnzGYdzYpRO5oZyYSDY z29w6GM+0awuTZfZegAnAXJZV5Ikamoq3uXyRER5sCBSli29AyT2tIJHNP9QNPdz f1QbMh3nB6i5E0X1mSCCXqA= Received: (qmail 10484 invoked by alias); 6 Aug 2014 17:21:31 -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 8913 invoked by uid 89); 6 Aug 2014 17:21:17 -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:21:15 +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 s76HLE7O024269 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Aug 2014 13:21:14 -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 s76HJ2rN030913; Wed, 6 Aug 2014 13:21:14 -0400 From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 227/236] find_first_parameter_load params and return type Date: Wed, 6 Aug 2014 13:23:26 -0400 Message-Id: <1407345815-14551-228-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/ * rtl.h (find_first_parameter_load): Strengthen return type and both params from rtx to rtx_insn *. * rtlanal.c (find_first_parameter_load): Strengthen return type, both params and locals "before", "first_set" from rtx to rtx_insn *. Remove now-redundant cast. * except.c (sjlj_mark_call_sites): Use NULL rather than NULL_RTX. --- gcc/except.c | 2 +- gcc/rtl.h | 2 +- gcc/rtlanal.c | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gcc/except.c b/gcc/except.c index d44c027..13df541 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -1164,7 +1164,7 @@ sjlj_mark_call_sites (void) /* Don't separate a call from it's argument loads. */ before = insn; if (CALL_P (insn)) - before = find_first_parameter_load (insn, NULL_RTX); + before = find_first_parameter_load (insn, NULL); start_sequence (); mem = adjust_address (crtl->eh.sjlj_fc, TYPE_MODE (integer_type_node), diff --git a/gcc/rtl.h b/gcc/rtl.h index 8cdb88d..8f8d7f0 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -2820,7 +2820,7 @@ extern int auto_inc_p (const_rtx); extern int in_expr_list_p (const_rtx, const_rtx); extern void remove_node_from_expr_list (const_rtx, rtx_expr_list **); extern int loc_mentioned_in_p (rtx *, const_rtx); -extern rtx_insn *find_first_parameter_load (rtx, rtx); +extern rtx_insn *find_first_parameter_load (rtx_insn *, rtx_insn *); extern bool keep_with_call_p (const_rtx); extern bool label_is_jump_target_p (const_rtx, const_rtx); extern int insn_rtx_cost (rtx, bool); diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index 6429906..df2f734 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -3639,10 +3639,11 @@ parms_set (rtx x, const_rtx pat ATTRIBUTE_UNUSED, void *data) to the outer function is passed down as a parameter). Do not skip BOUNDARY. */ rtx_insn * -find_first_parameter_load (rtx call_insn, rtx boundary) +find_first_parameter_load (rtx_insn *call_insn, rtx_insn *boundary) { struct parms_set_data parm; - rtx p, before, first_set; + rtx p; + rtx_insn *before, *first_set; /* Since different machines initialize their parameter registers in different orders, assume nothing. Collect the set of all @@ -3700,7 +3701,7 @@ find_first_parameter_load (rtx call_insn, rtx boundary) break; } } - return as_a_nullable (first_set); + return first_set; } /* Return true if we should avoid inserting code between INSN and preceding