Skip to content

R
riscv-gcc-1
Commit 1553e85a by Jeff Law
Options

Remove previous dwarf2out.c change. It was incorrect according to Jim. 

From-SVN: r19637
parent 5b8ae21f
Showing with 16 additions and 62 deletions
gcc/ChangeLog
...@@ -57,26 +57,6 @@ Fri May 8 14:13:21 1998 H.J. Lu (hjl@gnu.org) ...@@ -57,26 +57,6 @@ Fri May 8 14:13:21 1998 H.J. Lu (hjl@gnu.org)
optimizations, do not output the last reload insn if OLD is optimizations, do not output the last reload insn if OLD is
not the dest of NSN and is in the src and is clobbered by INSN. not the dest of NSN and is in the src and is clobbered by INSN.
Fri May 8 13:59:31 1998 Paul Eggert <eggert@twinsun.com>
* dwarf2out.c: Don't assume that `.section ".text"' causes the
assembler to treat .text as a label for the start of that section,
as this assumption is false for Solaris 2.x `as'. Instead, output
`.section ".text"; .LLtext0:' and use .LLtext0 in label contexts.
(ABBREV_LABEL, DEBUG_INFO_LABEL, DEBUG_LINE_LABEL, TEXT_LABEL):
New macros.
(abbrev_label, debug_info_label, debug_line_label, text_label):
New vars.
(dwarf2out_init): Initialize the vars. Output defn for text_label.
(dwarf2out_finish): Output defns for the other 3 vars.
(dw_val_node): Rename val_section to val_section_label, as it's
now a label, not a section.
(add_AT_section_offset): Arg is now a label, not a section.
(print_die, output_die, output_compilation_unit_header,
output_pubnames, output_aranges, output_line_info,
dwarf2out_finish): In label contexts, output the section label,
not the section.
Fri May 8 09:47:29 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> Fri May 8 09:47:29 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Makefile.in (genrtl.o): Depend on system.h. * Makefile.in (genrtl.o): Depend on system.h.
......
gcc/dwarf2out.c
...@@ -2049,7 +2049,7 @@ typedef struct dw_val_struct ...@@ -2049,7 +2049,7 @@ typedef struct dw_val_struct
unsigned val_fde_index; unsigned val_fde_index;
char *val_str; char *val_str;
char *val_lbl_id; char *val_lbl_id;
char *val_section_label; char *val_section;
unsigned char val_flag; unsigned char val_flag;
} }
v; v;
...@@ -2582,24 +2582,8 @@ static unsigned lookup_filename PROTO((char *)); ...@@ -2582,24 +2582,8 @@ static unsigned lookup_filename PROTO((char *));
If necessary, these may be overridden from within the tm.h file, but If necessary, these may be overridden from within the tm.h file, but
typically, overriding these defaults is unnecessary. */ typically, overriding these defaults is unnecessary. */
static char abbrev_label[MAX_ARTIFICIAL_LABEL_BYTES];
static char debug_info_label[MAX_ARTIFICIAL_LABEL_BYTES];
static char debug_line_label[MAX_ARTIFICIAL_LABEL_BYTES];
static char text_label[MAX_ARTIFICIAL_LABEL_BYTES];
static char text_end_label[MAX_ARTIFICIAL_LABEL_BYTES]; static char text_end_label[MAX_ARTIFICIAL_LABEL_BYTES];
#ifndef ABBREV_LABEL
#define ABBREV_LABEL "Labbrev"
#endif
#ifndef DEBUG_INFO_LABEL
#define DEBUG_INFO_LABEL "Ldebug_info"
#endif
#ifndef DEBUG_LINE_LABEL
#define DEBUG_LINE_LABEL "Ldebug_line"
#endif
#ifndef TEXT_LABEL
#define TEXT_LABEL "Ltext"
#endif
#ifndef TEXT_END_LABEL #ifndef TEXT_END_LABEL
#define TEXT_END_LABEL "Letext" #define TEXT_END_LABEL "Letext"
#endif #endif
...@@ -3812,17 +3796,17 @@ add_AT_lbl_id (die, attr_kind, lbl_id) ...@@ -3812,17 +3796,17 @@ add_AT_lbl_id (die, attr_kind, lbl_id)
/* Add a section offset attribute value to a DIE. */ /* Add a section offset attribute value to a DIE. */
static inline void static inline void
add_AT_section_offset (die, attr_kind, section_label) add_AT_section_offset (die, attr_kind, section)
register dw_die_ref die; register dw_die_ref die;
register enum dwarf_attribute attr_kind; register enum dwarf_attribute attr_kind;
register char *section_label; register char *section;
{ {
register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node)); register dw_attr_ref attr = (dw_attr_ref) xmalloc (sizeof (dw_attr_node));
attr->dw_attr_next = NULL; attr->dw_attr_next = NULL;
attr->dw_attr = attr_kind; attr->dw_attr = attr_kind;
attr->dw_attr_val.val_class = dw_val_class_section_offset; attr->dw_attr_val.val_class = dw_val_class_section_offset;
attr->dw_attr_val.v.val_section_label = section_label; attr->dw_attr_val.v.val_section = section;
add_dwarf_attr (die, attr); add_dwarf_attr (die, attr);
} }
...@@ -4288,8 +4272,7 @@ print_die (die, outfile) ...@@ -4288,8 +4272,7 @@ print_die (die, outfile)
fprintf (outfile, "label: %s", a->dw_attr_val.v.val_lbl_id); fprintf (outfile, "label: %s", a->dw_attr_val.v.val_lbl_id);
break; break;
case dw_val_class_section_offset: case dw_val_class_section_offset:
fprintf (outfile, "section_label: %s", fprintf (outfile, "section: %s", a->dw_attr_val.v.val_section);
a->dw_attr_val.v.val_section_label);
break; break;
case dw_val_class_str: case dw_val_class_str:
if (a->dw_attr_val.v.val_str != NULL) if (a->dw_attr_val.v.val_str != NULL)
...@@ -5353,7 +5336,8 @@ output_die (die) ...@@ -5353,7 +5336,8 @@ output_die (die)
case dw_val_class_section_offset: case dw_val_class_section_offset:
ASM_OUTPUT_DWARF_OFFSET (asm_out_file, ASM_OUTPUT_DWARF_OFFSET (asm_out_file,
a->dw_attr_val.v.val_section_label); stripattributes
(a->dw_attr_val.v.val_section));
break; break;
case dw_val_class_str: case dw_val_class_str:
...@@ -5413,7 +5397,7 @@ output_compilation_unit_header () ...@@ -5413,7 +5397,7 @@ output_compilation_unit_header ()
fprintf (asm_out_file, "\t%s DWARF version number", ASM_COMMENT_START); fprintf (asm_out_file, "\t%s DWARF version number", ASM_COMMENT_START);
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_DWARF_OFFSET (asm_out_file, abbrev_label); ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (ABBREV_SECTION));
if (flag_debug_asm) if (flag_debug_asm)
fprintf (asm_out_file, "\t%s Offset Into Abbrev. Section", fprintf (asm_out_file, "\t%s Offset Into Abbrev. Section",
ASM_COMMENT_START); ASM_COMMENT_START);
...@@ -5486,7 +5470,7 @@ output_pubnames () ...@@ -5486,7 +5470,7 @@ output_pubnames ()
fprintf (asm_out_file, "\t%s DWARF Version", ASM_COMMENT_START); fprintf (asm_out_file, "\t%s DWARF Version", ASM_COMMENT_START);
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_DWARF_OFFSET (asm_out_file, debug_info_label); ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (DEBUG_INFO_SECTION));
if (flag_debug_asm) if (flag_debug_asm)
fprintf (asm_out_file, "\t%s Offset of Compilation Unit Info.", fprintf (asm_out_file, "\t%s Offset of Compilation Unit Info.",
ASM_COMMENT_START); ASM_COMMENT_START);
...@@ -5566,7 +5550,7 @@ output_aranges () ...@@ -5566,7 +5550,7 @@ output_aranges ()
fprintf (asm_out_file, "\t%s DWARF Version", ASM_COMMENT_START); fprintf (asm_out_file, "\t%s DWARF Version", ASM_COMMENT_START);
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_DWARF_OFFSET (asm_out_file, debug_info_label); ASM_OUTPUT_DWARF_OFFSET (asm_out_file, stripattributes (DEBUG_INFO_SECTION));
if (flag_debug_asm) if (flag_debug_asm)
fprintf (asm_out_file, "\t%s Offset of Compilation Unit Info.", fprintf (asm_out_file, "\t%s Offset of Compilation Unit Info.",
ASM_COMMENT_START); ASM_COMMENT_START);
...@@ -5592,12 +5576,12 @@ output_aranges () ...@@ -5592,12 +5576,12 @@ output_aranges ()
ASM_COMMENT_START, 2 * PTR_SIZE); ASM_COMMENT_START, 2 * PTR_SIZE);
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_DWARF_ADDR (asm_out_file, text_label); ASM_OUTPUT_DWARF_ADDR (asm_out_file, TEXT_SECTION);
if (flag_debug_asm) if (flag_debug_asm)
fprintf (asm_out_file, "\t%s Address", ASM_COMMENT_START); fprintf (asm_out_file, "\t%s Address", ASM_COMMENT_START);
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_DWARF_ADDR_DELTA (asm_out_file, text_end_label, text_label); ASM_OUTPUT_DWARF_ADDR_DELTA (asm_out_file, text_end_label, TEXT_SECTION);
if (flag_debug_asm) if (flag_debug_asm)
fprintf (asm_out_file, "%s Length", ASM_COMMENT_START); fprintf (asm_out_file, "%s Length", ASM_COMMENT_START);
...@@ -5782,14 +5766,14 @@ output_line_info () ...@@ -5782,14 +5766,14 @@ output_line_info ()
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNE_set_address); ASM_OUTPUT_DWARF_DATA1 (asm_out_file, DW_LNE_set_address);
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_DWARF_ADDR (asm_out_file, text_label); ASM_OUTPUT_DWARF_ADDR (asm_out_file, TEXT_SECTION);
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
/* Generate the line number to PC correspondence table, encoded as /* Generate the line number to PC correspondence table, encoded as
a series of state machine operations. */ a series of state machine operations. */
current_file = 1; current_file = 1;
current_line = 1; current_line = 1;
strcpy (prev_line_label, text_label); strcpy (prev_line_label, TEXT_SECTION);
for (lt_index = 1; lt_index < line_info_table_in_use; ++lt_index) for (lt_index = 1; lt_index < line_info_table_in_use; ++lt_index)
{ {
register dw_line_info_ref line_info; register dw_line_info_ref line_info;
...@@ -9787,14 +9771,7 @@ dwarf2out_init (asm_out_file, main_input_filename) ...@@ -9787,14 +9771,7 @@ dwarf2out_init (asm_out_file, main_input_filename)
invoked when the given (base) source file was compiled. */ invoked when the given (base) source file was compiled. */
gen_compile_unit_die (main_input_filename); gen_compile_unit_die (main_input_filename);
ASM_GENERATE_INTERNAL_LABEL (abbrev_label, ABBREV_LABEL, 0);
ASM_GENERATE_INTERNAL_LABEL (debug_info_label, DEBUG_INFO_LABEL, 0);
ASM_GENERATE_INTERNAL_LABEL (debug_line_label, DEBUG_LINE_LABEL, 0);
ASM_GENERATE_INTERNAL_LABEL (text_label, TEXT_LABEL, 0);
ASM_GENERATE_INTERNAL_LABEL (text_end_label, TEXT_END_LABEL, 0); ASM_GENERATE_INTERNAL_LABEL (text_end_label, TEXT_END_LABEL, 0);
text_section ();
ASM_OUTPUT_LABEL (asm_out_file, text_label);
} }
/* Output stuff that dwarf requires at the end of every file, /* Output stuff that dwarf requires at the end of every file,
...@@ -9856,24 +9833,22 @@ dwarf2out_finish () ...@@ -9856,24 +9833,22 @@ dwarf2out_finish ()
{ {
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_SECTION (asm_out_file, DEBUG_LINE_SECTION); ASM_OUTPUT_SECTION (asm_out_file, DEBUG_LINE_SECTION);
ASM_OUTPUT_LABEL (asm_out_file, debug_line_label);
output_line_info (); output_line_info ();
/* We can only use the low/high_pc attributes if all of the code /* We can only use the low/high_pc attributes if all of the code
was in .text. */ was in .text. */
if (separate_line_info_table_in_use == 0) if (separate_line_info_table_in_use == 0)
{ {
add_AT_lbl_id (comp_unit_die, DW_AT_low_pc, text_label); add_AT_lbl_id (comp_unit_die, DW_AT_low_pc, TEXT_SECTION);
add_AT_lbl_id (comp_unit_die, DW_AT_high_pc, text_end_label); add_AT_lbl_id (comp_unit_die, DW_AT_high_pc, text_end_label);
} }
add_AT_section_offset (comp_unit_die, DW_AT_stmt_list, debug_line_label); add_AT_section_offset (comp_unit_die, DW_AT_stmt_list, DEBUG_LINE_SECTION);
} }
/* Output the abbreviation table. */ /* Output the abbreviation table. */
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_SECTION (asm_out_file, ABBREV_SECTION); ASM_OUTPUT_SECTION (asm_out_file, ABBREV_SECTION);
ASM_OUTPUT_LABEL (asm_out_file, abbrev_label);
build_abbrev_table (comp_unit_die); build_abbrev_table (comp_unit_die);
output_abbrev_section (); output_abbrev_section ();
...@@ -9884,7 +9859,6 @@ dwarf2out_finish () ...@@ -9884,7 +9859,6 @@ dwarf2out_finish ()
/* Output debugging information. */ /* Output debugging information. */
fputc ('\n', asm_out_file); fputc ('\n', asm_out_file);
ASM_OUTPUT_SECTION (asm_out_file, DEBUG_INFO_SECTION); ASM_OUTPUT_SECTION (asm_out_file, DEBUG_INFO_SECTION);
ASM_OUTPUT_LABEL (asm_out_file, debug_info_label);
output_compilation_unit_header (); output_compilation_unit_header ();
output_die (comp_unit_die); output_die (comp_unit_die);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment