dwarfout.c (INSN_LABEL_FMT): Remove.

* dwarfout.c (INSN_LABEL_FMT): Remove.
        (output_label_die): Use ASM_GENERATE_INTERNAL_LABEL.
        (dwarfout_label): Remove.
        * dwarfout.h: Remove it's prototype.
        * dwarf2out.c (INSN_LABEL_FMT): Remove.
        (gen_label_die): Use ASM_GENERATE_INTERNAL_LABEL.
        (dwarf2out_label): Remove.
        * dwarf2out.h: Remove it's prototype.
        * final.c (final_scan_insn): Don't call dwarf[2]out_label.

From-SVN: r37310
This commit is contained in:
Richard Henderson 2000-11-07 18:18:00 -08:00 committed by Richard Henderson
parent cd5c4048b3
commit 6623457026
6 changed files with 14 additions and 76 deletions

View File

@ -1,3 +1,15 @@
2000-11-07 Richard Henderson <rth@redhat.com>
* dwarfout.c (INSN_LABEL_FMT): Remove.
(output_label_die): Use ASM_GENERATE_INTERNAL_LABEL.
(dwarfout_label): Remove.
* dwarfout.h: Remove it's prototype.
* dwarf2out.c (INSN_LABEL_FMT): Remove.
(gen_label_die): Use ASM_GENERATE_INTERNAL_LABEL.
(dwarf2out_label): Remove.
* dwarf2out.h: Remove it's prototype.
* final.c (final_scan_insn): Don't call dwarf[2]out_label.
2000-11-07 Richard Henderson <rth@redhat.com> 2000-11-07 Richard Henderson <rth@redhat.com>
* config/ia64/fde-glibc.c (find_fde_for_dso): Do a binary * config/ia64/fde-glibc.c (find_fde_for_dso): Do a binary

View File

@ -3594,9 +3594,6 @@ static char debug_line_section_label[MAX_ARTIFICIAL_LABEL_BYTES];
#ifndef BSS_END_LABEL #ifndef BSS_END_LABEL
#define BSS_END_LABEL "Lebss" #define BSS_END_LABEL "Lebss"
#endif #endif
#ifndef INSN_LABEL_FMT
#define INSN_LABEL_FMT "LI%u_"
#endif
#ifndef BLOCK_BEGIN_LABEL #ifndef BLOCK_BEGIN_LABEL
#define BLOCK_BEGIN_LABEL "LBB" #define BLOCK_BEGIN_LABEL "LBB"
#endif #endif
@ -9824,7 +9821,6 @@ gen_label_die (decl, context_die)
register dw_die_ref lbl_die = new_die (DW_TAG_label, context_die); register dw_die_ref lbl_die = new_die (DW_TAG_label, context_die);
register rtx insn; register rtx insn;
char label[MAX_ARTIFICIAL_LABEL_BYTES]; char label[MAX_ARTIFICIAL_LABEL_BYTES];
char label2[MAX_ARTIFICIAL_LABEL_BYTES];
if (origin != NULL) if (origin != NULL)
add_abstract_origin_attribute (lbl_die, origin); add_abstract_origin_attribute (lbl_die, origin);
@ -9852,9 +9848,7 @@ gen_label_die (decl, context_die)
if (INSN_DELETED_P (insn)) if (INSN_DELETED_P (insn))
abort (); abort ();
sprintf (label2, INSN_LABEL_FMT, current_funcdef_number); ASM_GENERATE_INTERNAL_LABEL (label, "L", CODE_LABEL_NUMBER (insn));
ASM_GENERATE_INTERNAL_LABEL (label, label2,
(unsigned) INSN_UID (insn));
add_AT_lbl_id (lbl_die, DW_AT_low_pc, label); add_AT_lbl_id (lbl_die, DW_AT_low_pc, label);
} }
} }
@ -10966,24 +10960,6 @@ dwarf2out_ignore_block (block)
return 1; return 1;
} }
/* Output a marker (i.e. a label) at a point in the assembly code which
corresponds to a given source level label. */
void
dwarf2out_label (insn)
register rtx insn;
{
char label[MAX_ARTIFICIAL_LABEL_BYTES];
if (debug_info_level >= DINFO_LEVEL_NORMAL)
{
function_section (current_function_decl);
sprintf (label, INSN_LABEL_FMT, current_funcdef_number);
ASM_OUTPUT_DEBUG_LABEL (asm_out_file, label,
(unsigned) INSN_UID (insn));
}
}
/* Lookup a filename (in the list of filenames that we know about here in /* Lookup a filename (in the list of filenames that we know about here in
dwarf2out.c) and return its "index". The index of each (known) filename is dwarf2out.c) and return its "index". The index of each (known) filename is
just a unique number which is associated with only that one filename. just a unique number which is associated with only that one filename.

View File

@ -29,7 +29,6 @@ extern void dwarf2out_end_source_file PARAMS ((void));
extern void dwarf2out_begin_block PARAMS ((unsigned)); extern void dwarf2out_begin_block PARAMS ((unsigned));
extern void dwarf2out_end_block PARAMS ((unsigned)); extern void dwarf2out_end_block PARAMS ((unsigned));
extern int dwarf2out_ignore_block PARAMS ((tree)); extern int dwarf2out_ignore_block PARAMS ((tree));
extern void dwarf2out_label PARAMS ((rtx));
extern void dwarf2out_decl PARAMS ((tree)); extern void dwarf2out_decl PARAMS ((tree));
extern void dwarf2out_line PARAMS ((const char *, unsigned)); extern void dwarf2out_line PARAMS ((const char *, unsigned));
extern void dwarf2out_frame_init PARAMS ((void)); extern void dwarf2out_frame_init PARAMS ((void));

View File

@ -561,9 +561,6 @@ static void retry_incomplete_types PARAMS ((void));
#ifndef PUB_DIE_LABEL_FMT #ifndef PUB_DIE_LABEL_FMT
#define PUB_DIE_LABEL_FMT "*.L_P%u" #define PUB_DIE_LABEL_FMT "*.L_P%u"
#endif #endif
#ifndef INSN_LABEL_FMT
#define INSN_LABEL_FMT "*.L_I%u_%u"
#endif
#ifndef BLOCK_BEGIN_LABEL_FMT #ifndef BLOCK_BEGIN_LABEL_FMT
#define BLOCK_BEGIN_LABEL_FMT "*.L_B%u" #define BLOCK_BEGIN_LABEL_FMT "*.L_B%u"
#endif #endif
@ -3485,8 +3482,7 @@ output_label_die (arg)
if (INSN_DELETED_P (insn)) if (INSN_DELETED_P (insn))
abort (); /* Should never happen. */ abort (); /* Should never happen. */
sprintf (label, INSN_LABEL_FMT, current_funcdef_number, ASM_GENERATE_INTERNAL_LABEL (label, "L", CODE_LABEL_NUMBER (insn));
(unsigned) INSN_UID (insn));
low_pc_attribute (label); low_pc_attribute (label);
} }
} }
@ -5294,24 +5290,6 @@ dwarfout_end_block (blocknum)
ASM_OUTPUT_LABEL (asm_out_file, label); ASM_OUTPUT_LABEL (asm_out_file, label);
} }
/* Output a marker (i.e. a label) at a point in the assembly code which
corresponds to a given source level label. */
void
dwarfout_label (insn)
register rtx insn;
{
if (debug_info_level >= DINFO_LEVEL_NORMAL)
{
char label[MAX_ARTIFICIAL_LABEL_BYTES];
function_section (current_function_decl);
sprintf (label, INSN_LABEL_FMT, current_funcdef_number,
(unsigned) INSN_UID (insn));
ASM_OUTPUT_LABEL (asm_out_file, label);
}
}
/* Output a marker (i.e. a label) for the point in the generated code where /* Output a marker (i.e. a label) for the point in the generated code where
the real body of the function begins (after parameters have been moved the real body of the function begins (after parameters have been moved
to their home locations). */ to their home locations). */

View File

@ -34,8 +34,4 @@ extern void dwarfout_end_epilogue PARAMS ((void));
extern void dwarfout_begin_block PARAMS ((unsigned)); extern void dwarfout_begin_block PARAMS ((unsigned));
extern void dwarfout_end_block PARAMS ((unsigned)); extern void dwarfout_end_block PARAMS ((unsigned));
#ifdef RTX_CODE
extern void dwarfout_label PARAMS ((rtx));
#endif
extern void dwarfout_line PARAMS ((const char *, unsigned)); extern void dwarfout_line PARAMS ((const char *, unsigned));

View File

@ -2268,22 +2268,7 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes)
/* Emit the label. We may have deleted the CODE_LABEL because /* Emit the label. We may have deleted the CODE_LABEL because
the label could be proved to be unreachable, though still the label could be proved to be unreachable, though still
referenced (in the form of having its address taken. */ referenced (in the form of having its address taken. */
/* ??? Figure out how not to do this unconditionally. This
interferes with bundling on LIW targets. */
ASM_OUTPUT_DEBUG_LABEL (file, "L", CODE_LABEL_NUMBER (insn)); ASM_OUTPUT_DEBUG_LABEL (file, "L", CODE_LABEL_NUMBER (insn));
if (debug_info_level == DINFO_LEVEL_NORMAL
|| debug_info_level == DINFO_LEVEL_VERBOSE)
{
#ifdef DWARF_DEBUGGING_INFO
if (write_symbols == DWARF_DEBUG)
dwarfout_label (insn);
#endif
#ifdef DWARF2_DEBUGGING_INFO
if (write_symbols == DWARF2_DEBUG)
dwarf2out_label (insn);
#endif
}
break; break;
case 0: case 0:
@ -2402,14 +2387,6 @@ final_scan_insn (insn, file, optimize, prescan, nopeepholes)
#ifdef SDB_DEBUGGING_INFO #ifdef SDB_DEBUGGING_INFO
if (write_symbols == SDB_DEBUG && LABEL_NAME (insn)) if (write_symbols == SDB_DEBUG && LABEL_NAME (insn))
sdbout_label (insn); sdbout_label (insn);
#endif
#ifdef DWARF_DEBUGGING_INFO
if (write_symbols == DWARF_DEBUG && LABEL_NAME (insn))
dwarfout_label (insn);
#endif
#ifdef DWARF2_DEBUGGING_INFO
if (write_symbols == DWARF2_DEBUG && LABEL_NAME (insn))
dwarf2out_label (insn);
#endif #endif
if (app_on) if (app_on)
{ {