From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 73122 invoked by alias); 17 May 2016 01:09:30 -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 73094 invoked by uid 89); 17 May 2016 01:09:30 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=crtl, retain, wish X-HELO: gcc1-power7.osuosl.org Received: from gcc1-power7.osuosl.org (HELO gcc1-power7.osuosl.org) (140.211.15.137) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 17 May 2016 01:09:20 +0000 Received: by gcc1-power7.osuosl.org (Postfix, from userid 10019) id E1B271C0441; Tue, 17 May 2016 01:09:18 +0000 (UTC) From: Segher Boessenkool To: gcc-patches@gcc.gnu.org Cc: Segher Boessenkool Subject: [PATCH 2/3] function: Factor out make_*logue_seq Date: Tue, 17 May 2016 01:09:00 -0000 Message-Id: In-Reply-To: <213485283eede9da12b217737d95fc8f5c4be442.1463428211.git.segher@kernel.crashing.org> References: <213485283eede9da12b217737d95fc8f5c4be442.1463428211.git.segher@kernel.crashing.org> In-Reply-To: <213485283eede9da12b217737d95fc8f5c4be442.1463428211.git.segher@kernel.crashing.org> References: <213485283eede9da12b217737d95fc8f5c4be442.1463428211.git.segher@kernel.crashing.org> X-IsSubscribed: yes X-SW-Source: 2016-05/txt/msg01162.txt.bz2 Make new functions make_split_prologue_seq, make_prologue_seq, and make_epilogue_seq. Tested as in the previous patch; is this okay for trunk? Segher 2016-05-16 Segher Boessenkool * function.c (make_split_prologue_seq, make_prologue_seq, make_epilogue_seq): New functions, factored out from... (thread_prologue_and_epilogue_insns): Here. --- gcc/function.c | 154 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 69 deletions(-) diff --git a/gcc/function.c b/gcc/function.c index b9a6338..75d2ad4 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -5768,6 +5768,83 @@ set_return_jump_label (rtx_insn *returnjump) JUMP_LABEL (returnjump) = ret_rtx; } +static rtx_insn * +make_split_prologue_seq (void) +{ + if (!flag_split_stack + || lookup_attribute ("no_split_stack", DECL_ATTRIBUTES (cfun->decl))) + return NULL; + + start_sequence (); + emit_insn (targetm.gen_split_stack_prologue ()); + rtx_insn *seq = get_insns (); + end_sequence (); + + record_insns (seq, NULL, &prologue_insn_hash); + set_insn_locations (seq, prologue_location); + + return seq; +} + +static rtx_insn * +make_prologue_seq (void) +{ + if (!targetm.have_prologue ()) + return NULL; + + start_sequence (); + rtx_insn *seq = targetm.gen_prologue (); + emit_insn (seq); + + /* Insert an explicit USE for the frame pointer + if the profiling is on and the frame pointer is required. */ + if (crtl->profile && frame_pointer_needed) + emit_use (hard_frame_pointer_rtx); + + /* Retain a map of the prologue insns. */ + record_insns (seq, NULL, &prologue_insn_hash); + emit_note (NOTE_INSN_PROLOGUE_END); + + /* Ensure that instructions are not moved into the prologue when + profiling is on. The call to the profiling routine can be + emitted within the live range of a call-clobbered register. */ + if (!targetm.profile_before_prologue () && crtl->profile) + emit_insn (gen_blockage ()); + + seq = get_insns (); + end_sequence (); + set_insn_locations (seq, prologue_location); + + return seq; +} + +static rtx_insn * +make_epilogue_seq (rtx_insn **epilogue_end) +{ + if (!targetm.have_epilogue ()) + return NULL; + + start_sequence (); + *epilogue_end = emit_note (NOTE_INSN_EPILOGUE_BEG); + rtx_insn *seq = targetm.gen_epilogue (); + if (seq) + emit_jump_insn (seq); + + /* Retain a map of the epilogue insns. */ + record_insns (seq, NULL, &epilogue_insn_hash); + set_insn_locations (seq, epilogue_location); + + seq = get_insns (); + rtx_insn *returnjump = get_last_insn (); + end_sequence (); + + if (JUMP_P (returnjump)) + set_return_jump_label (returnjump); + + return seq; +} + + /* Generate the prologue and epilogue RTL if the machine supports it. Thread this into place with notes indicating where the prologue ends and where @@ -5822,9 +5899,7 @@ thread_prologue_and_epilogue_insns (void) { bool inserted; bitmap_head bb_flags; - rtx_insn *returnjump; rtx_insn *epilogue_end ATTRIBUTE_UNUSED; - rtx_insn *prologue_seq ATTRIBUTE_UNUSED, *split_prologue_seq ATTRIBUTE_UNUSED; edge e, entry_edge, orig_entry_edge, exit_fallthru_edge; edge_iterator ei; @@ -5834,7 +5909,6 @@ thread_prologue_and_epilogue_insns (void) inserted = false; epilogue_end = NULL; - returnjump = NULL; /* Can't deal with multiple successors of the entry block at the moment. Function should always have at least one entry @@ -5843,46 +5917,9 @@ thread_prologue_and_epilogue_insns (void) entry_edge = single_succ_edge (ENTRY_BLOCK_PTR_FOR_FN (cfun)); orig_entry_edge = entry_edge; - split_prologue_seq = NULL; - if (flag_split_stack - && (lookup_attribute ("no_split_stack", DECL_ATTRIBUTES (cfun->decl)) - == NULL)) - { - start_sequence (); - emit_insn (targetm.gen_split_stack_prologue ()); - split_prologue_seq = get_insns (); - end_sequence (); - - record_insns (split_prologue_seq, NULL, &prologue_insn_hash); - set_insn_locations (split_prologue_seq, prologue_location); - } - - prologue_seq = NULL; - if (targetm.have_prologue ()) - { - start_sequence (); - rtx_insn *seq = targetm.gen_prologue (); - emit_insn (seq); - - /* Insert an explicit USE for the frame pointer - if the profiling is on and the frame pointer is required. */ - if (crtl->profile && frame_pointer_needed) - emit_use (hard_frame_pointer_rtx); - - /* Retain a map of the prologue insns. */ - record_insns (seq, NULL, &prologue_insn_hash); - emit_note (NOTE_INSN_PROLOGUE_END); - - /* Ensure that instructions are not moved into the prologue when - profiling is on. The call to the profiling routine can be - emitted within the live range of a call-clobbered register. */ - if (!targetm.profile_before_prologue () && crtl->profile) - emit_insn (gen_blockage ()); - - prologue_seq = get_insns (); - end_sequence (); - set_insn_locations (prologue_seq, prologue_location); - } + rtx_insn *split_prologue_seq = make_split_prologue_seq (); + rtx_insn *prologue_seq = make_prologue_seq (); + rtx_insn *epilogue_seq = make_epilogue_seq (&epilogue_end); bitmap_initialize (&bb_flags, &bitmap_default_obstack); @@ -5915,7 +5952,9 @@ thread_prologue_and_epilogue_insns (void) exit_fallthru_edge = find_fallthru_edge (EXIT_BLOCK_PTR_FOR_FN (cfun)->preds); - if (targetm.have_return () && exit_fallthru_edge == NULL) + /* If nothing falls through into the exit block, we don't need an + epilogue. */ + if (exit_fallthru_edge == NULL) goto epilogue_done; /* A small fib -- epilogue is not yet completed, but we wish to re-use @@ -5947,33 +5986,10 @@ thread_prologue_and_epilogue_insns (void) emit_note_after (NOTE_INSN_EPILOGUE_BEG, prev); } - /* If nothing falls through into the exit block, we don't need an - epilogue. */ - - if (exit_fallthru_edge == NULL) - goto epilogue_done; - - if (targetm.have_epilogue ()) + if (epilogue_seq) { - start_sequence (); - epilogue_end = emit_note (NOTE_INSN_EPILOGUE_BEG); - rtx_insn *seq = targetm.gen_epilogue (); - if (seq) - emit_jump_insn (seq); - - /* Retain a map of the epilogue insns. */ - record_insns (seq, NULL, &epilogue_insn_hash); - set_insn_locations (seq, epilogue_location); - - seq = get_insns (); - returnjump = get_last_insn (); - end_sequence (); - - insert_insn_on_edge (seq, exit_fallthru_edge); + insert_insn_on_edge (epilogue_seq, exit_fallthru_edge); inserted = true; - - if (JUMP_P (returnjump)) - set_return_jump_label (returnjump); } else { -- 1.9.3