public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Richard Henderson <rth@redhat.com>
To: gcc-patches@gcc.gnu.org
Cc: richard.earnshaw@arm.com,	sje@cup.hp.com,	ubizjak@gmail.com,
	matt@3am-software.com
Subject: [PATCH 10/12] ia64: Remove TARGET_DWARF_HANDLE_FRAME_UNSPEC hook.
Date: Wed, 29 Jun 2011 21:50:00 -0000	[thread overview]
Message-ID: <1309384152-25027-11-git-send-email-rth@redhat.com> (raw)
In-Reply-To: <1309384152-25027-1-git-send-email-rth@redhat.com>

Use an empty REG_FRAME_RELATED_EXPR instead.
---
 gcc/config/ia64/ia64.c |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index bdabe82..2ebb225 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -319,7 +319,6 @@ static enum machine_mode ia64_promote_function_mode (const_tree,
 static void ia64_trampoline_init (rtx, tree, rtx);
 static void ia64_override_options_after_change (void);
 
-static void ia64_dwarf_handle_frame_unspec (const char *, rtx, int);
 static tree ia64_builtin_decl (unsigned, bool);
 
 static reg_class_t ia64_preferred_reload_class (rtx, reg_class_t);
@@ -551,8 +550,6 @@ static const struct attribute_spec ia64_attribute_table[] =
 #undef TARGET_GIMPLIFY_VA_ARG_EXPR
 #define TARGET_GIMPLIFY_VA_ARG_EXPR ia64_gimplify_va_arg
 
-#undef TARGET_DWARF_HANDLE_FRAME_UNSPEC
-#define TARGET_DWARF_HANDLE_FRAME_UNSPEC  ia64_dwarf_handle_frame_unspec
 #undef TARGET_ASM_UNWIND_EMIT
 #define TARGET_ASM_UNWIND_EMIT ia64_asm_unwind_emit
 #undef TARGET_ASM_EMIT_EXCEPT_PERSONALITY
@@ -3793,10 +3790,19 @@ ia64_expand_epilogue (int sibcall_p)
       if (current_frame_info.n_input_regs != 0)
 	{
 	  rtx n_inputs = GEN_INT (current_frame_info.n_input_regs);
+
 	  insn = emit_insn (gen_alloc (gen_rtx_REG (DImode, fp),
 				const0_rtx, const0_rtx,
 				n_inputs, const0_rtx));
 	  RTX_FRAME_RELATED_P (insn) = 1;
+
+	  /* ??? We need to mark the alloc as frame-related so that it gets
+	     passed into ia64_asm_unwind_emit for ia64-specific unwinding.
+	     But there's nothing dwarf2 related to be done wrt the register
+	     windows.  If we do nothing, dwarf2out will abort on the UNSPEC;
+	     the empty parallel means dwarf2out will not see anything.  */
+	  add_reg_note (insn, REG_FRAME_RELATED_EXPR,
+			gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (0)));
 	}
     }
 }
@@ -9620,17 +9626,6 @@ static bool need_copy_state;
 # define MAX_ARTIFICIAL_LABEL_BYTES 30
 #endif
 
-/* All we need to do here is avoid a crash in the generic dwarf2
-   processing.  The real CFA definition is set up above.  */
-
-static void
-ia64_dwarf_handle_frame_unspec (const char * ARG_UNUSED (label),
-				rtx ARG_UNUSED (pattern),
-				int index)
-{
-  gcc_assert (index == UNSPECV_ALLOC);
-}
-
 /* The function emits unwind directives for the start of an epilogue.  */
 
 static void
-- 
1.7.5.4

  parent reply	other threads:[~2011-06-29 21:50 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-29 21:50 [PATCH 00/12] Eliminate the text-based dwarf2out interface Richard Henderson
2011-06-29 21:50 ` [PATCH 07/12] ia64: Remove ia64_dwarf2out_def_steady_cfa Richard Henderson
2011-06-29 21:50 ` Richard Henderson [this message]
2011-06-29 21:50 ` [PATCH 12/12] dwarf2out: Remove unused text-based unwind entry points Richard Henderson
2011-06-29 21:50 ` [PATCH 05/12] arm: Use REG_CFA_REGISTER instead of UNSPEC_STACK_ALIGN Richard Henderson
2011-06-29 21:51 ` [PATCH 09/12] ia64: Remove dead code in process_epilogue Richard Henderson
2011-06-29 21:51 ` [PATCH 01/12] dwarf2out: Convert regs_saved_in_regs to VEC Richard Henderson
2011-06-29 21:51 ` [PATCH 02/12] dwarf2out: Handle pc_rtx as return column in REG_CFA_OFFSET too Richard Henderson
2011-06-29 21:54 ` [PATCH 11/12] i386: Always use TARGET_DEEP_BRANCH_PREDICTION Richard Henderson
2011-09-02 11:17   ` Jan Hubicka
2011-06-29 22:26 ` [PATCH 04/12] vax: Emit prologue as rtl Richard Henderson
2011-06-29 23:19   ` Steven Bosscher
2011-06-29 23:34     ` Richard Henderson
2011-06-30 17:41     ` Richard Henderson
2011-06-30 17:47       ` Paul Koning
2011-06-29 22:27 ` [PATCH 08/12] ia64: Use pc_rtx to save the return address Richard Henderson
2011-06-29 22:27 ` [PATCH 06/12] ia64: Issue REG_CFA_REGISTER for ar.pfs at alloc insn Richard Henderson
2011-06-29 22:33 ` [PATCH 03/12] dwarf2out: Add REG_CFA_FLUSH_QUEUE Richard Henderson
2011-06-30 13:20 ` [PATCH 00/12] Eliminate the text-based dwarf2out interface Bernd Schmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1309384152-25027-11-git-send-email-rth@redhat.com \
    --to=rth@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=matt@3am-software.com \
    --cc=richard.earnshaw@arm.com \
    --cc=sje@cup.hp.com \
    --cc=ubizjak@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).