From 3bc6b3e6fc40559519e7078c3f549d0e87bdf8be Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 7 Sep 2010 10:25:11 -0700 Subject: [PATCH] Define target hook TARGET_UNWIND_EMIT_BEFORE_INSN. From-SVN: r163961 --- gcc/ChangeLog | 11 +++++++++-- gcc/doc/tm.texi | 4 ++++ gcc/doc/tm.texi.in | 2 ++ gcc/final.c | 7 ++++++- gcc/target.def | 7 +++++++ 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 746b3fbdd76..f544f735769 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-09-07 Richard Henderson + + * target.def (unwind_emit_before_insn): New hook. + * doc/tm.texi.in: Add @hook marker for it. + * doc/tm.texi: Rebuild. + * final.c (final_scan_insn): Respect unwind_emit_before_insn. + 2010-09-07 Martin Jambor PR fortran/43665 @@ -6,8 +13,8 @@ 2010-09-07 Jan Hubicka - * tree-ssa-ccp.c (fold_const_aggregate_ref): Fix handling of array_ref_low_bound - in string access folding. + * tree-ssa-ccp.c (fold_const_aggregate_ref): Fix handling of + array_ref_low_bound in string access folding. 2010-09-07 Uros Bizjak diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index 5954ea38c24..a8db902db7a 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -8749,6 +8749,10 @@ This target hook emits assembly directives required to unwind the given instruction. This is only used when TARGET_UNWIND_INFO is set. @end deftypefn +@deftypevr {Target Hook} bool TARGET_ASM_UNWIND_EMIT_BEFORE_INSN +True if the @code{TARGET_ASM_UNWIND_EMIT} hook should be called before the assembly for @var{insn} has been emitted, false if the hook should be called afterward. +@end deftypevr + @node Exception Region Output @subsection Assembler Commands for Exception Regions diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in index 24f5c1b3a76..2efc1ae4eba 100644 --- a/gcc/doc/tm.texi.in +++ b/gcc/doc/tm.texi.in @@ -8739,6 +8739,8 @@ This target hook emits assembly directives required to unwind the given instruction. This is only used when TARGET_UNWIND_INFO is set. @end deftypefn +@hook TARGET_ASM_UNWIND_EMIT_BEFORE_INSN + @node Exception Region Output @subsection Assembler Commands for Exception Regions diff --git a/gcc/final.c b/gcc/final.c index 73c60691d27..06ebc17dade 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -2655,7 +2655,8 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, /* ??? This will put the directives in the wrong place if get_insn_template outputs assembly directly. However calling it before get_insn_template breaks if the insns is split. */ - if (targetm.asm_out.unwind_emit) + if (targetm.asm_out.unwind_emit_before_insn + && targetm.asm_out.unwind_emit) targetm.asm_out.unwind_emit (asm_out_file, insn); if (CALL_P (insn)) @@ -2713,6 +2714,10 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, dwarf2out_frame_debug (insn, true); #endif + if (!targetm.asm_out.unwind_emit_before_insn + && targetm.asm_out.unwind_emit) + targetm.asm_out.unwind_emit (asm_out_file, insn); + current_output_insn = debug_insn = 0; } } diff --git a/gcc/target.def b/gcc/target.def index f11328bc23d..e62a977182d 100644 --- a/gcc/target.def +++ b/gcc/target.def @@ -152,6 +152,13 @@ DEFHOOK void, (FILE *stream, rtx insn), NULL) +DEFHOOKPOD +(unwind_emit_before_insn, + "True if the @code{TARGET_ASM_UNWIND_EMIT} hook should be called before\ + the assembly for @var{insn} has been emitted, false if the hook should\ + be called afterward.", + bool, true) + /* Output an internal label. */ DEFHOOK (internal_label, -- 2.30.2