X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fdbxout.c;h=d257729d8f8ed2e9505e0c1e7aa5efd901797365;hb=11a8ca07364cc782101c13138a71707359bc229b;hp=58208fffad2e8d1a5568b193574b84d6de635e85;hpb=bdeba923ca1bac9d42860835ee76dc764c56db29;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/dbxout.c b/gcc/dbxout.c index 58208fffad2..d257729d8f8 100644 --- a/gcc/dbxout.c +++ b/gcc/dbxout.c @@ -93,6 +93,15 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "xcoffout.h" #endif +#undef DBXOUT_DECR_NESTING +#define DBXOUT_DECR_NESTING \ + if (--debug_nesting == 0 && symbol_queue_index > 0) \ + { emit_pending_bincls_if_required (); debug_flush_symbol_queue (); } + +#undef DBXOUT_DECR_NESTING_AND_RETURN +#define DBXOUT_DECR_NESTING_AND_RETURN(x) \ + do {--debug_nesting; return (x);} while (0) + #ifndef ASM_STABS_OP #define ASM_STABS_OP "\t.stabs\t" #endif @@ -170,6 +179,8 @@ static GTY(()) int typevec_len; static GTY(()) int next_type_number; +enum binclstatus {BINCL_NOT_REQUIRED, BINCL_PENDING, BINCL_PROCESSED}; + /* When using N_BINCL in dbx output, each type number is actually a pair of the file number and the type number within the file. This is a stack of input files. */ @@ -179,6 +190,9 @@ struct dbx_file GTY(()) struct dbx_file *next; int file_number; int next_type_number; + enum binclstatus bincl_status; /* Keep track of lazy bincl. */ + const char *pending_bincl_name; /* Name of bincl. */ + struct dbx_file *prev; /* Chain to traverse all pending bincls. */ }; /* This is the top of the stack. */ @@ -189,33 +203,51 @@ static GTY(()) struct dbx_file *current_file; static GTY(()) int next_file_number; -/* Typical USG systems don't have stab.h, and they also have - no use for DBX-format debugging info. */ +/* A counter for dbxout_function_end. */ -#if defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO) - -/* Last source file name mentioned in a NOTE insn. */ +static GTY(()) int scope_labelno; -static const char *lastfile; +/* A counter for dbxout_source_line. */ -/* Current working directory. */ - -static const char *cwd; +static GTY(()) int dbxout_source_line_counter; /* Nonzero if we have actually used any of the GDB extensions to the debugging format. The idea is that we use them for the first time only if there's a strong reason, but once we have done that, we use them whenever convenient. */ -static int have_used_extensions = 0; +static GTY(()) int have_used_extensions = 0; /* Number for the next N_SOL filename stabs label. The number 0 is reserved for the N_SO filename stabs label. */ -#if defined (DBX_DEBUGGING_INFO) && !defined (DBX_OUTPUT_SOURCE_FILENAME) -static int source_label_number = 1; +static GTY(()) int source_label_number = 1; + +/* Last source file name mentioned in a NOTE insn. */ + +static GTY(()) const char *lastfile; + +/* Used by PCH machinery to detect if 'lastfile' should be reset to + base_input_file. */ +static GTY(()) int lastfile_is_base; + +/* Typical USG systems don't have stab.h, and they also have + no use for DBX-format debugging info. */ + +#if defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO) + +#ifdef DBX_USE_BINCL +/* If zero then there is no pending BINCL. */ +static int pending_bincls = 0; #endif +/* The original input file name. */ +static const char *base_input_file; + +/* Current working directory. */ + +static const char *cwd; + #ifdef DEBUG_SYMS_TEXT #define FORCE_TEXT function_section (current_function_decl); #else @@ -285,44 +317,52 @@ static int current_sym_nchars; #define CONTIN do { } while (0) #endif -static void dbxout_init PARAMS ((const char *)); -static void dbxout_finish PARAMS ((const char *)); -static void dbxout_start_source_file PARAMS ((unsigned, const char *)); -static void dbxout_end_source_file PARAMS ((unsigned)); -static void dbxout_typedefs PARAMS ((tree)); -static void dbxout_fptype_value PARAMS ((tree)); -static void dbxout_type_index PARAMS ((tree)); +#ifdef DBX_USE_BINCL +static void emit_bincl_stab (const char *c); +static void emit_pending_bincls (void); +#endif +static inline void emit_pending_bincls_if_required (void); + +static void dbxout_init (const char *); +static void dbxout_finish (const char *); +static void dbxout_start_source_file (unsigned, const char *); +static void dbxout_end_source_file (unsigned); +static void dbxout_typedefs (tree); +static void dbxout_fptype_value (tree); +static void dbxout_type_index (tree); #if DBX_CONTIN_LENGTH > 0 -static void dbxout_continue PARAMS ((void)); +static void dbxout_continue (void); #endif -static void dbxout_args PARAMS ((tree)); -static void dbxout_type_fields PARAMS ((tree)); -static void dbxout_type_method_1 PARAMS ((tree, const char *)); -static void dbxout_type_methods PARAMS ((tree)); -static void dbxout_range_type PARAMS ((tree)); -static void dbxout_type PARAMS ((tree, int)); -static void print_int_cst_octal PARAMS ((tree)); -static void print_octal PARAMS ((unsigned HOST_WIDE_INT, int)); -static void print_wide_int PARAMS ((HOST_WIDE_INT)); -static void dbxout_type_name PARAMS ((tree)); -static void dbxout_class_name_qualifiers PARAMS ((tree)); -static int dbxout_symbol_location PARAMS ((tree, tree, const char *, rtx)); -static void dbxout_symbol_name PARAMS ((tree, const char *, int)); -static void dbxout_prepare_symbol PARAMS ((tree)); -static void dbxout_finish_symbol PARAMS ((tree)); -static void dbxout_block PARAMS ((tree, int, tree)); -static void dbxout_global_decl PARAMS ((tree)); +static void dbxout_args (tree); +static void dbxout_type_fields (tree); +static void dbxout_type_method_1 (tree, const char *); +static void dbxout_type_methods (tree); +static void dbxout_range_type (tree); +static void dbxout_type (tree, int); +static bool print_int_cst_bounds_in_octal_p (tree); +static void print_int_cst_octal (tree); +static void print_octal (unsigned HOST_WIDE_INT, int); +static void print_wide_int (HOST_WIDE_INT); +static void dbxout_type_name (tree); +static void dbxout_class_name_qualifiers (tree); +static int dbxout_symbol_location (tree, tree, const char *, rtx); +static void dbxout_symbol_name (tree, const char *, int); +static void dbxout_prepare_symbol (tree); +static void dbxout_finish_symbol (tree); +static void dbxout_block (tree, int, tree); +static void dbxout_global_decl (tree); +static void dbxout_handle_pch (unsigned); /* The debug hooks structure. */ #if defined (DBX_DEBUGGING_INFO) -static void dbxout_source_line PARAMS ((unsigned int, const char *)); -static void dbxout_source_file PARAMS ((FILE *, const char *)); -static void dbxout_function_end PARAMS ((void)); -static void dbxout_begin_function PARAMS ((tree)); -static void dbxout_begin_block PARAMS ((unsigned, unsigned)); -static void dbxout_end_block PARAMS ((unsigned, unsigned)); -static void dbxout_function_decl PARAMS ((tree)); +static void dbxout_source_line (unsigned int, const char *); +static void dbxout_source_file (FILE *, const char *); +static void dbxout_function_end (void); +static void dbxout_begin_function (tree); +static void dbxout_begin_block (unsigned, unsigned); +static void dbxout_end_block (unsigned, unsigned); +static void dbxout_function_decl (tree); const struct gcc_debug_hooks dbx_debug_hooks = { @@ -349,7 +389,8 @@ const struct gcc_debug_hooks dbx_debug_hooks = dbxout_global_decl, /* global_decl */ debug_nothing_tree, /* deferred_inline_function */ debug_nothing_tree, /* outlining_inline_function */ - debug_nothing_rtx /* label */ + debug_nothing_rtx, /* label */ + dbxout_handle_pch /* handle_pch */ }; #endif /* DBX_DEBUGGING_INFO */ @@ -375,15 +416,15 @@ const struct gcc_debug_hooks xcoff_debug_hooks = dbxout_global_decl, /* global_decl */ debug_nothing_tree, /* deferred_inline_function */ debug_nothing_tree, /* outlining_inline_function */ - debug_nothing_rtx /* label */ + debug_nothing_rtx, /* label */ + dbxout_handle_pch /* handle_pch */ }; #endif /* XCOFF_DEBUGGING_INFO */ #if defined (DBX_DEBUGGING_INFO) static void -dbxout_function_end () +dbxout_function_end (void) { - static int scope_labelno = 0; char lscope_label_name[100]; /* Convert Ltext into the appropriate format for local labels in case the system doesn't insert underscores in front of user generated @@ -410,8 +451,7 @@ dbxout_function_end () Initialize `typevec' and output the standard data types of C. */ static void -dbxout_init (input_file_name) - const char *input_file_name; +dbxout_init (const char *input_file_name) { char ltext_label_name[100]; tree syms = (*lang_hooks.decls.getdecls) (); @@ -419,7 +459,7 @@ dbxout_init (input_file_name) asmfile = asm_out_file; typevec_len = 100; - typevec = (struct typeinfo *) ggc_calloc (typevec_len, sizeof typevec[0]); + typevec = ggc_calloc (typevec_len, sizeof typevec[0]); /* Convert Ltext into the appropriate format for local labels in case the system doesn't insert underscores in front of user generated @@ -427,12 +467,10 @@ dbxout_init (input_file_name) ASM_GENERATE_INTERNAL_LABEL (ltext_label_name, "Ltext", 0); /* Put the current working directory in an N_SO symbol. */ -#ifndef DBX_WORKING_DIRECTORY /* Only some versions of DBX want this, - but GDB always does. */ if (use_gnu_debug_info_extensions) -#endif { - if (!cwd && (cwd = getpwd ()) && (!*cwd || cwd[strlen (cwd) - 1] != '/')) + if (!cwd && (cwd = get_src_pwd ()) + && (!*cwd || cwd[strlen (cwd) - 1] != '/')) cwd = concat (cwd, FILE_NAME_JOINER, NULL); if (cwd) { @@ -449,8 +487,6 @@ dbxout_init (input_file_name) } #ifdef DBX_OUTPUT_MAIN_SOURCE_FILENAME - /* This should NOT be DBX_OUTPUT_SOURCE_FILENAME. That - would give us an N_SOL, and we want an N_SO. */ DBX_OUTPUT_MAIN_SOURCE_FILENAME (asmfile, input_file_name); #else /* no DBX_OUTPUT_MAIN_SOURCE_FILENAME */ /* We include outputting `Ltext:' here, @@ -473,16 +509,19 @@ dbxout_init (input_file_name) ASM_STABS_OP, STABS_GCC_MARKER, N_OPT); #endif - lastfile = input_file_name; + base_input_file = lastfile = input_file_name; next_type_number = 1; #ifdef DBX_USE_BINCL - current_file = (struct dbx_file *) ggc_alloc (sizeof *current_file); + current_file = ggc_alloc (sizeof *current_file); current_file->next = NULL; current_file->file_number = 0; current_file->next_type_number = 1; next_file_number = 1; + current_file->prev = NULL; + current_file->bincl_status = BINCL_NOT_REQUIRED; + current_file->pending_bincl_name = NULL; #endif /* Make sure that types `int' and `char' have numbers 1 and 2. @@ -494,9 +533,6 @@ dbxout_init (input_file_name) #ifdef DBX_OUTPUT_STANDARD_TYPES DBX_OUTPUT_STANDARD_TYPES (syms); -#else - dbxout_symbol (TYPE_NAME (integer_type_node), 0); - dbxout_symbol (TYPE_NAME (char_type_node), 0); #endif /* Get all permanent types that have typedef names, @@ -509,8 +545,7 @@ dbxout_init (input_file_name) in the reverse order from that which is found in SYMS. */ static void -dbxout_typedefs (syms) - tree syms; +dbxout_typedefs (tree syms) { if (syms) { @@ -527,51 +562,140 @@ dbxout_typedefs (syms) } } +#ifdef DBX_USE_BINCL +/* Emit BINCL stab using given name. */ +static void +emit_bincl_stab (const char *name) +{ + fprintf (asmfile, "%s", ASM_STABS_OP); + output_quoted_string (asmfile, name); + fprintf (asmfile, ",%d,0,0,0\n", N_BINCL); +} + +/* If there are pending bincls then it is time to emit all of them. */ + +static inline void +emit_pending_bincls_if_required (void) +{ + if (pending_bincls) + emit_pending_bincls (); +} + +/* Emit all pending bincls. */ + +static void +emit_pending_bincls (void) +{ + struct dbx_file *f = current_file; + + /* Find first pending bincl. */ + while (f->bincl_status == BINCL_PENDING) + f = f->next; + + /* Now emit all bincls. */ + f = f->prev; + + while (f) + { + if (f->bincl_status == BINCL_PENDING) + { + emit_bincl_stab (f->pending_bincl_name); + + /* Update file number and status. */ + f->file_number = next_file_number++; + f->bincl_status = BINCL_PROCESSED; + } + if (f == current_file) + break; + f = f->prev; + } + + /* All pending bincls have been emitted. */ + pending_bincls = 0; +} + +#else + +static inline void +emit_pending_bincls_if_required (void) {} +#endif + /* Change to reading from a new source file. Generate a N_BINCL stab. */ static void -dbxout_start_source_file (line, filename) - unsigned int line ATTRIBUTE_UNUSED; - const char *filename ATTRIBUTE_UNUSED; +dbxout_start_source_file (unsigned int line ATTRIBUTE_UNUSED, + const char *filename ATTRIBUTE_UNUSED) { #ifdef DBX_USE_BINCL - struct dbx_file *n = (struct dbx_file *) ggc_alloc (sizeof *n); + struct dbx_file *n = ggc_alloc (sizeof *n); n->next = current_file; - n->file_number = next_file_number++; n->next_type_number = 1; + /* Do not assign file number now. + Delay it until we actually emit BINCL. */ + n->file_number = 0; + n->prev = NULL; + current_file->prev = n; + n->bincl_status = BINCL_PENDING; + n->pending_bincl_name = filename; + pending_bincls = 1; current_file = n; - fprintf (asmfile, "%s", ASM_STABS_OP); - output_quoted_string (asmfile, filename); - fprintf (asmfile, ",%d,0,0,0\n", N_BINCL); #endif } /* Revert to reading a previous source file. Generate a N_EINCL stab. */ static void -dbxout_end_source_file (line) - unsigned int line ATTRIBUTE_UNUSED; +dbxout_end_source_file (unsigned int line ATTRIBUTE_UNUSED) { #ifdef DBX_USE_BINCL - fprintf (asmfile, "%s%d,0,0,0\n", ASM_STABN_OP, N_EINCL); + /* Emit EINCL stab only if BINCL is not pending. */ + if (current_file->bincl_status == BINCL_PROCESSED) + fprintf (asmfile, "%s%d,0,0,0\n", ASM_STABN_OP, N_EINCL); + current_file->bincl_status = BINCL_NOT_REQUIRED; current_file = current_file->next; #endif } +/* Handle a few odd cases that occur when trying to make PCH files work. */ + +static void +dbxout_handle_pch (unsigned at_end) +{ + if (! at_end) + { + /* When using the PCH, this file will be included, so we need to output + a BINCL. */ + dbxout_start_source_file (0, lastfile); + + /* The base file when using the PCH won't be the same as + the base file when it's being generated. */ + lastfile = NULL; + } + else + { + /* ... and an EINCL. */ + dbxout_end_source_file (0); + + /* Deal with cases where 'lastfile' was never actually changed. */ + lastfile_is_base = lastfile == NULL; + } +} + #if defined (DBX_DEBUGGING_INFO) /* Output debugging info to FILE to switch to sourcefile FILENAME. */ static void -dbxout_source_file (file, filename) - FILE *file; - const char *filename; +dbxout_source_file (FILE *file, const char *filename) { + if (lastfile == 0 && lastfile_is_base) + { + lastfile = base_input_file; + lastfile_is_base = 0; + } + if (filename && (lastfile == 0 || strcmp (filename, lastfile))) { -#ifdef DBX_OUTPUT_SOURCE_FILENAME - DBX_OUTPUT_SOURCE_FILENAME (file, filename); -#else char ltext_label_name[100]; ASM_GENERATE_INTERNAL_LABEL (ltext_label_name, "Ltext", @@ -588,7 +712,6 @@ dbxout_source_file (file, filename) text_section (); (*targetm.asm_out.internal_label) (file, "Ltext", source_label_number); source_label_number++; -#endif lastfile = filename; } } @@ -597,14 +720,13 @@ dbxout_source_file (file, filename) number LINENO. */ static void -dbxout_source_line (lineno, filename) - unsigned int lineno; - const char *filename; +dbxout_source_line (unsigned int lineno, const char *filename) { dbxout_source_file (asmfile, filename); #ifdef ASM_OUTPUT_SOURCE_LINE - ASM_OUTPUT_SOURCE_LINE (asmfile, lineno); + dbxout_source_line_counter += 1; + ASM_OUTPUT_SOURCE_LINE (asmfile, lineno, dbxout_source_line_counter); #else fprintf (asmfile, "%s%d,0,%d\n", ASM_STABD_OP, N_SLINE, lineno); #endif @@ -613,20 +735,18 @@ dbxout_source_line (lineno, filename) /* Describe the beginning of an internal block within a function. */ static void -dbxout_begin_block (line, n) - unsigned int line ATTRIBUTE_UNUSED; - unsigned int n; +dbxout_begin_block (unsigned int line ATTRIBUTE_UNUSED, unsigned int n) { + emit_pending_bincls_if_required (); (*targetm.asm_out.internal_label) (asmfile, "LBB", n); } /* Describe the end line-number of an internal block within a function. */ static void -dbxout_end_block (line, n) - unsigned int line ATTRIBUTE_UNUSED; - unsigned int n; +dbxout_end_block (unsigned int line ATTRIBUTE_UNUSED, unsigned int n) { + emit_pending_bincls_if_required (); (*targetm.asm_out.internal_label) (asmfile, "LBE", n); } @@ -637,9 +757,9 @@ dbxout_end_block (line, n) (including all the auto variables of the function). */ static void -dbxout_function_decl (decl) - tree decl; +dbxout_function_decl (tree decl) { + emit_pending_bincls_if_required (); #ifndef DBX_FUNCTION_FIRST dbxout_begin_function (decl); #endif @@ -660,13 +780,17 @@ dbxout_function_decl (decl) /* Debug information for a global DECL. Called from toplev.c after compilation proper has finished. */ static void -dbxout_global_decl (decl) - tree decl; +dbxout_global_decl (tree decl) { if (TREE_CODE (decl) == VAR_DECL && ! DECL_EXTERNAL (decl) && DECL_RTL_SET_P (decl)) /* Not necessary? */ - dbxout_symbol (decl, 0); + { + int saved_tree_used = TREE_USED (decl); + TREE_USED (decl) = 1; + dbxout_symbol (decl, 0); + TREE_USED (decl) = saved_tree_used; + } } /* At the end of compilation, finish writing the symbol table. @@ -674,12 +798,13 @@ dbxout_global_decl (decl) to do nothing. */ static void -dbxout_finish (filename) - const char *filename ATTRIBUTE_UNUSED; +dbxout_finish (const char *filename ATTRIBUTE_UNUSED) { #ifdef DBX_OUTPUT_MAIN_SOURCE_FILE_END DBX_OUTPUT_MAIN_SOURCE_FILE_END (asmfile, filename); #endif /* DBX_OUTPUT_MAIN_SOURCE_FILE_END */ + + debug_free_queue (); } /* Output floating point type values used by the 'R' stab letter. @@ -700,8 +825,7 @@ dbxout_finish (filename) them. */ static void -dbxout_fptype_value (type) - tree type; +dbxout_fptype_value (tree type) { char value = '0'; enum machine_mode mode = TYPE_MODE (type); @@ -740,8 +864,7 @@ dbxout_fptype_value (type) /* Output the index of a type. */ static void -dbxout_type_index (type) - tree type; +dbxout_type_index (tree type) { #ifndef DBX_USE_BINCL fprintf (asmfile, "%d", TYPE_SYMTAB_ADDRESS (type)); @@ -761,8 +884,9 @@ dbxout_type_index (type) .stabs "...rest",code,0,value */ static void -dbxout_continue () +dbxout_continue (void) { + emit_pending_bincls_if_required (); #ifdef DBX_CONTIN_CHAR fprintf (asmfile, "%c", DBX_CONTIN_CHAR); #else @@ -779,8 +903,7 @@ dbxout_continue () recursive calls. */ static void -dbxout_type_fields (type) - tree type; +dbxout_type_fields (tree type) { tree tem; @@ -870,9 +993,7 @@ dbxout_type_fields (type) now. */ static void -dbxout_type_method_1 (decl, debug_name) - tree decl; - const char *debug_name; +dbxout_type_method_1 (tree decl, const char *debug_name) { char c1 = 'A', c2; @@ -917,8 +1038,7 @@ dbxout_type_method_1 (decl, debug_name) in TYPE. */ static void -dbxout_type_methods (type) - tree type; +dbxout_type_methods (tree type) { /* C++: put out the method names and their parameter lists */ tree methods = TYPE_METHODS (type); @@ -1023,8 +1143,7 @@ dbxout_type_methods (type) TYPE is an INTEGER_TYPE. */ static void -dbxout_range_type (type) - tree type; +dbxout_range_type (tree type) { fprintf (asmfile, "r"); if (TREE_TYPE (type)) @@ -1056,7 +1175,10 @@ dbxout_range_type (type) { putc (';', asmfile); CHARS (1); - print_wide_int (tree_low_cst (TYPE_MIN_VALUE (type), 0)); + if (print_int_cst_bounds_in_octal_p (type)) + print_int_cst_octal (TYPE_MIN_VALUE (type)); + else + print_wide_int (tree_low_cst (TYPE_MIN_VALUE (type), 0)); } else { @@ -1069,7 +1191,10 @@ dbxout_range_type (type) { putc (';', asmfile); CHARS (1); - print_wide_int (tree_low_cst (TYPE_MAX_VALUE (type), 0)); + if (print_int_cst_bounds_in_octal_p (type)) + print_int_cst_octal (TYPE_MAX_VALUE (type)); + else + print_wide_int (tree_low_cst (TYPE_MAX_VALUE (type), 0)); putc (';', asmfile); CHARS (1); } @@ -1080,6 +1205,7 @@ dbxout_range_type (type) } } + /* Output a reference to a type. If the type has not yet been described in the dbx output, output its definition now. For a type already defined, just refer to its definition @@ -1091,9 +1217,7 @@ dbxout_range_type (type) using the number previously allocated. */ static void -dbxout_type (type, full) - tree type; - int full; +dbxout_type (tree type, int full) { tree tem; tree main_variant; @@ -1139,15 +1263,13 @@ dbxout_type (type, full) if (next_type_number == typevec_len) { typevec - = (struct typeinfo *) ggc_realloc (typevec, - (typevec_len * 2 - * sizeof typevec[0])); - memset ((char *) (typevec + typevec_len), 0, - typevec_len * sizeof typevec[0]); + = ggc_realloc (typevec, (typevec_len * 2 * sizeof typevec[0])); + memset (typevec + typevec_len, 0, typevec_len * sizeof typevec[0]); typevec_len *= 2; } #ifdef DBX_USE_BINCL + emit_pending_bincls_if_required (); typevec[TYPE_SYMTAB_ADDRESS (type)].file_number = current_file->file_number; typevec[TYPE_SYMTAB_ADDRESS (type)].type_number @@ -1155,6 +1277,21 @@ dbxout_type (type, full) #endif } + if (flag_debug_only_used_symbols) + { + if ((TREE_CODE (type) == RECORD_TYPE + || TREE_CODE (type) == UNION_TYPE + || TREE_CODE (type) == QUAL_UNION_TYPE + || TREE_CODE (type) == ENUMERAL_TYPE) + && TYPE_STUB_DECL (type) + && TREE_CODE_CLASS (TREE_CODE (TYPE_STUB_DECL (type))) == 'd' + && ! DECL_IGNORED_P (TYPE_STUB_DECL (type))) + debug_queue_symbol (TYPE_STUB_DECL (type)); + else if (TYPE_NAME (type) + && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL) + debug_queue_symbol (TYPE_NAME (type)); + } + /* Output the number of this type, to refer to it. */ dbxout_type_index (type); @@ -1238,6 +1375,18 @@ dbxout_type (type, full) } else if (main_variant != TYPE_MAIN_VARIANT (type)) { + if (flag_debug_only_used_symbols) + { + tree orig_type = DECL_ORIGINAL_TYPE (TYPE_NAME (type)); + + if ((TREE_CODE (orig_type) == RECORD_TYPE + || TREE_CODE (orig_type) == UNION_TYPE + || TREE_CODE (orig_type) == QUAL_UNION_TYPE + || TREE_CODE (orig_type) == ENUMERAL_TYPE) + && TYPE_STUB_DECL (orig_type) + && ! DECL_IGNORED_P (TYPE_STUB_DECL (orig_type))) + debug_queue_symbol (TYPE_STUB_DECL (orig_type)); + } /* 'type' is a typedef; output the type it refers to. */ dbxout_type (DECL_ORIGINAL_TYPE (TYPE_NAME (type)), 0); return; @@ -1303,30 +1452,7 @@ dbxout_type (type, full) CHARS (5); } - /* If we can use GDB extensions and the size is wider than a - long (the size used by GDB to read them) or we may have - trouble writing the bounds the usual way, write them in - octal. Note the test is for the *target's* size of "long", - not that of the host. The host test is just to make sure we - can write it out in case the host wide int is narrower than the - target "long". */ - - /* For unsigned types, we use octal if they are the same size or - larger. This is because we print the bounds as signed decimal, - and hence they can't span same size unsigned types. */ - - if (use_gnu_debug_info_extensions - && TYPE_MIN_VALUE (type) != 0 - && TREE_CODE (TYPE_MIN_VALUE (type)) == INTEGER_CST - && TYPE_MAX_VALUE (type) != 0 - && TREE_CODE (TYPE_MAX_VALUE (type)) == INTEGER_CST - && (TYPE_PRECISION (type) > TYPE_PRECISION (integer_type_node) - || ((TYPE_PRECISION (type) - == TYPE_PRECISION (integer_type_node)) - && TREE_UNSIGNED (type)) - || TYPE_PRECISION (type) > HOST_BITS_PER_WIDE_INT - || (TYPE_PRECISION (type) == HOST_BITS_PER_WIDE_INT - && TREE_UNSIGNED (type)))) + if (print_int_cst_bounds_in_octal_p (type)) { fprintf (asmfile, "r"); CHARS (1); @@ -1591,7 +1717,7 @@ dbxout_type (type, full) tree child = BINFO_BASETYPE (binfo, i); tree access = (BINFO_BASEACCESSES (binfo) ? BINFO_BASEACCESS (binfo, i) : access_public_node); - + if (use_gnu_debug_info_extensions) { have_used_extensions = 1; @@ -1628,9 +1754,7 @@ dbxout_type (type, full) * BITS_PER_UNIT); putc (',', asmfile); CHARS (1); - print_wide_int (tree_low_cst (DECL_SIZE - (TYPE_NAME - (BINFO_TYPE (child))), + print_wide_int (tree_low_cst (TYPE_SIZE (BINFO_TYPE (child)), 0) * BITS_PER_UNIT); putc (';', asmfile); @@ -1694,9 +1818,6 @@ dbxout_type (type, full) CHARS (1); return; } -#ifdef DBX_OUTPUT_ENUM - DBX_OUTPUT_ENUM (asmfile, type); -#else if (use_gnu_debug_info_extensions && TYPE_PRECISION (type) != TYPE_PRECISION (integer_type_node)) { @@ -1726,7 +1847,6 @@ dbxout_type (type, full) putc (';', asmfile); CHARS (1); -#endif break; case POINTER_TYPE: @@ -1791,12 +1911,44 @@ dbxout_type (type, full) } } +/* Return nonzero if the given type represents an integer whose bounds + should be printed in octal format. */ + +static bool +print_int_cst_bounds_in_octal_p (tree type) +{ + /* If we can use GDB extensions and the size is wider than a long + (the size used by GDB to read them) or we may have trouble writing + the bounds the usual way, write them in octal. Note the test is for + the *target's* size of "long", not that of the host. The host test + is just to make sure we can write it out in case the host wide int + is narrower than the target "long". + + For unsigned types, we use octal if they are the same size or larger. + This is because we print the bounds as signed decimal, and hence they + can't span same size unsigned types. */ + + if (use_gnu_debug_info_extensions + && TYPE_MIN_VALUE (type) != 0 + && TREE_CODE (TYPE_MIN_VALUE (type)) == INTEGER_CST + && TYPE_MAX_VALUE (type) != 0 + && TREE_CODE (TYPE_MAX_VALUE (type)) == INTEGER_CST + && (TYPE_PRECISION (type) > TYPE_PRECISION (integer_type_node) + || ((TYPE_PRECISION (type) == TYPE_PRECISION (integer_type_node)) + && TREE_UNSIGNED (type)) + || TYPE_PRECISION (type) > HOST_BITS_PER_WIDE_INT + || (TYPE_PRECISION (type) == HOST_BITS_PER_WIDE_INT + && TREE_UNSIGNED (type)))) + return TRUE; + else + return FALSE; +} + /* Print the value of integer constant C, in octal, handling double precision. */ static void -print_int_cst_octal (c) - tree c; +print_int_cst_octal (tree c) { unsigned HOST_WIDE_INT high = TREE_INT_CST_HIGH (c); unsigned HOST_WIDE_INT low = TREE_INT_CST_LOW (c); @@ -1841,9 +1993,7 @@ print_int_cst_octal (c) } static void -print_octal (value, digits) - unsigned HOST_WIDE_INT value; - int digits; +print_octal (unsigned HOST_WIDE_INT value, int digits) { int i; @@ -1856,8 +2006,7 @@ print_octal (value, digits) /* Output C in decimal while adjusting the number of digits written. */ static void -print_wide_int (c) - HOST_WIDE_INT c; +print_wide_int (HOST_WIDE_INT c) { int digs = 0; @@ -1877,8 +2026,7 @@ print_wide_int (c) or by struct, enum and union tags. */ static void -dbxout_type_name (type) - tree type; +dbxout_type_name (tree type) { tree t; if (TYPE_NAME (type) == 0) @@ -1902,19 +2050,20 @@ dbxout_type_name (type) type whose scope is limited to a struct or class. */ static void -dbxout_class_name_qualifiers (decl) - tree decl; +dbxout_class_name_qualifiers (tree decl) { tree context = decl_type_context (decl); - if (context != NULL_TREE + if (context != NULL_TREE && TREE_CODE(context) == RECORD_TYPE - && TYPE_NAME (context) != 0 + && TYPE_NAME (context) != 0 && (TREE_CODE (TYPE_NAME (context)) == IDENTIFIER_NODE || (DECL_NAME (TYPE_NAME (context)) != 0))) { tree name = TYPE_NAME (context); + emit_pending_bincls_if_required (); + if (TREE_CODE (name) == TYPE_DECL) { dbxout_class_name_qualifiers (name); @@ -1932,14 +2081,15 @@ dbxout_class_name_qualifiers (decl) Return 1 if a stabs might have been emitted. */ int -dbxout_symbol (decl, local) - tree decl; - int local ATTRIBUTE_UNUSED; +dbxout_symbol (tree decl, int local ATTRIBUTE_UNUSED) { tree type = TREE_TYPE (decl); tree context = NULL_TREE; int result = 0; + /* "Intercept" dbxout_symbol() calls like we do all debug_hooks. */ + ++debug_nesting; + /* Cast avoids warning in old compilers. */ current_sym_code = (STAB_CODE_TYPE) 0; current_sym_value = 0; @@ -1949,7 +2099,64 @@ dbxout_symbol (decl, local) if ((DECL_NAME (decl) == 0 && TREE_CODE (decl) != TYPE_DECL) || DECL_IGNORED_P (decl)) - return 0; + DBXOUT_DECR_NESTING_AND_RETURN (0); + + /* If we are to generate only the symbols actually used then such + symbol nodees are flagged with TREE_USED. Ignore any that + aren't flaged as TREE_USED. */ + + if (flag_debug_only_used_symbols) + { + tree t; + + if (!TREE_USED (decl) + && (TREE_CODE (decl) != VAR_DECL || !DECL_INITIAL (decl))) + DBXOUT_DECR_NESTING_AND_RETURN (0); + + /* We now have a used symbol. We need to generate the info for + the symbol's type in addition to the symbol itself. These + type symbols are queued to be generated after were done with + the symbol itself (done because the symbol's info is generated + with fprintf's, etc. as it determines what's needed). + + Note, because the TREE_TYPE(type) might be something like a + pointer to a named type we need to look for the first name + we see following the TREE_TYPE chain. */ + + t = type; + while (POINTER_TYPE_P (t)) + t = TREE_TYPE (t); + + /* RECORD_TYPE, UNION_TYPE, QUAL_UNION_TYPE, and ENUMERAL_TYPE + need special treatment. The TYPE_STUB_DECL field in these + types generally represents the tag name type we want to + output. In addition there could be a typedef type with + a different name. In that case we also want to output + that. */ + + if ((TREE_CODE (t) == RECORD_TYPE + || TREE_CODE (t) == UNION_TYPE + || TREE_CODE (t) == QUAL_UNION_TYPE + || TREE_CODE (t) == ENUMERAL_TYPE) + && TYPE_STUB_DECL (t) + && TYPE_STUB_DECL (t) != decl + && TREE_CODE_CLASS (TREE_CODE (TYPE_STUB_DECL (t))) == 'd' + && ! DECL_IGNORED_P (TYPE_STUB_DECL (t))) + { + debug_queue_symbol (TYPE_STUB_DECL (t)); + if (TYPE_NAME (t) + && TYPE_NAME (t) != TYPE_STUB_DECL (t) + && TYPE_NAME (t) != decl + && TREE_CODE_CLASS (TREE_CODE (TYPE_NAME (t))) == 'd') + debug_queue_symbol (TYPE_NAME (t)); + } + else if (TYPE_NAME (t) + && TYPE_NAME (t) != decl + && TREE_CODE_CLASS (TREE_CODE (TYPE_NAME (t))) == 'd') + debug_queue_symbol (TYPE_NAME (t)); + } + + emit_pending_bincls_if_required (); dbxout_prepare_symbol (decl); @@ -1967,7 +2174,7 @@ dbxout_symbol (decl, local) case FUNCTION_DECL: if (DECL_RTL (decl) == 0) - return 0; + DBXOUT_DECR_NESTING_AND_RETURN (0); if (DECL_EXTERNAL (decl)) break; /* Don't mention a nested function under its parent. */ @@ -2004,22 +2211,10 @@ dbxout_symbol (decl, local) break; case TYPE_DECL: -#if 0 - /* This seems all wrong. Outputting most kinds of types gives no name - at all. A true definition gives no name; a cross-ref for a - structure can give the tag name, but not a type name. - It seems that no typedef name is defined by outputting a type. */ - - /* If this typedef name was defined by outputting the type, - don't duplicate it. */ - if (typevec[TYPE_SYMTAB_ADDRESS (type)].status == TYPE_DEFINED - && TYPE_NAME (TREE_TYPE (decl)) == decl) - return 0; -#endif /* Don't output the same typedef twice. And don't output what language-specific stuff doesn't want output. */ if (TREE_ASM_WRITTEN (decl) || TYPE_DECL_SUPPRESS_DEBUG (decl)) - return 0; + DBXOUT_DECR_NESTING_AND_RETURN (0); FORCE_TEXT; result = 1; @@ -2045,6 +2240,8 @@ dbxout_symbol (decl, local) /* Distinguish the implicit typedefs of C++ from explicit ones that might be found in C. */ && DECL_ARTIFICIAL (decl) + /* Do not generate a tag for incomplete records. */ + && COMPLETE_TYPE_P (type) /* Do not generate a tag for records of variable size, since this type can not be properly described in the DBX format, and it confuses some tools such as objdump. */ @@ -2166,7 +2363,7 @@ dbxout_symbol (decl, local) /* Named return value, treat like a VAR_DECL. */ case VAR_DECL: if (! DECL_RTL_SET_P (decl)) - return 0; + DBXOUT_DECR_NESTING_AND_RETURN (0); /* Don't mention a variable that is external. Let the file that defines it describe it. */ if (DECL_EXTERNAL (decl)) @@ -2190,14 +2387,10 @@ dbxout_symbol (decl, local) || TREE_CODE (TREE_TYPE (decl)) == ENUMERAL_TYPE) { HOST_WIDE_INT ival = tree_low_cst (DECL_INITIAL (decl), 0); -#ifdef DBX_OUTPUT_CONSTANT_SYMBOL - DBX_OUTPUT_CONSTANT_SYMBOL (asmfile, name, ival); -#else - fprintf (asmfile, "%s\"%s:c=i", ASM_STABS_OP, name); - - fprintf (asmfile, HOST_WIDE_INT_PRINT_DEC, ival); - fprintf (asmfile, "\",0x%x,0,0,0\n", N_LSYM); -#endif + fprintf (asmfile, "%s\"%s:c=i" HOST_WIDE_INT_PRINT_DEC + "\",0x%x,0,0,0\n", + ASM_STABS_OP, name, ival, N_LSYM); + DBXOUT_DECR_NESTING; return 1; } else if (TREE_CODE (TREE_TYPE (decl)) == REAL_TYPE) @@ -2221,6 +2414,7 @@ dbxout_symbol (decl, local) default: break; } + DBXOUT_DECR_NESTING; return result; } @@ -2231,14 +2425,13 @@ dbxout_symbol (decl, local) Returns 1 if the stab was really emitted. */ static int -dbxout_symbol_location (decl, type, suffix, home) - tree decl, type; - const char *suffix; - rtx home; +dbxout_symbol_location (tree decl, tree type, const char *suffix, rtx home) { int letter = 0; int regno = -1; + emit_pending_bincls_if_required (); + /* Don't mention a variable at all if it was completely optimized into nothingness. @@ -2467,10 +2660,7 @@ dbxout_symbol_location (decl, type, suffix, home) Then output LETTER to indicate the kind of location the symbol has. */ static void -dbxout_symbol_name (decl, suffix, letter) - tree decl; - const char *suffix; - int letter; +dbxout_symbol_name (tree decl, const char *suffix, int letter) { const char *name; @@ -2495,8 +2685,7 @@ dbxout_symbol_name (decl, suffix, letter) } static void -dbxout_prepare_symbol (decl) - tree decl ATTRIBUTE_UNUSED; +dbxout_prepare_symbol (tree decl ATTRIBUTE_UNUSED) { #ifdef WINNING_GDB const char *filename = DECL_SOURCE_FILE (decl); @@ -2506,8 +2695,7 @@ dbxout_prepare_symbol (decl) } static void -dbxout_finish_symbol (sym) - tree sym; +dbxout_finish_symbol (tree sym) { #ifdef DBX_FINISH_SYMBOL DBX_FINISH_SYMBOL (sym); @@ -2529,8 +2717,7 @@ dbxout_finish_symbol (sym) anything was output */ int -dbxout_syms (syms) - tree syms; +dbxout_syms (tree syms) { int result = 0; while (syms) @@ -2554,9 +2741,12 @@ dbxout_syms (syms) of all the parms in PARMS, which is a chain of PARM_DECL nodes. */ void -dbxout_parms (parms) - tree parms; +dbxout_parms (tree parms) { + ++debug_nesting; + + emit_pending_bincls_if_required (); + for (; parms; parms = TREE_CHAIN (parms)) if (DECL_NAME (parms) && TREE_TYPE (parms) != error_mark_node) { @@ -2814,6 +3004,7 @@ dbxout_parms (parms) dbxout_finish_symbol (parms); } } + DBXOUT_DECR_NESTING; } /* Output definitions for the places where parms live during the function, @@ -2828,9 +3019,10 @@ dbxout_parms (parms) PARMS is a chain of PARM_DECL nodes. */ void -dbxout_reg_parms (parms) - tree parms; +dbxout_reg_parms (tree parms) { + ++debug_nesting; + for (; parms; parms = TREE_CHAIN (parms)) if (DECL_NAME (parms) && PARM_PASSED_IN_MEMORY (parms)) { @@ -2851,14 +3043,14 @@ dbxout_reg_parms (parms) dbxout_symbol_location (parms, TREE_TYPE (parms), 0, DECL_RTL (parms)); } + DBXOUT_DECR_NESTING; } /* Given a chain of ..._TYPE nodes (as come in a parameter list), output definitions of those names, in raw form */ static void -dbxout_args (args) - tree args; +dbxout_args (tree args) { while (args) { @@ -2887,10 +3079,7 @@ dbxout_args (args) We handle them all in sequence. */ static void -dbxout_block (block, depth, args) - tree block; - int depth; - tree args; +dbxout_block (tree block, int depth, tree args) { int blocknum = -1; @@ -2909,9 +3098,6 @@ dbxout_block (block, depth, args) { int did_output; -#ifdef DBX_LBRAC_FIRST - did_output = 1; -#else /* In dbx format, the syms of a block come before the N_LBRAC. If nothing is output, we don't need the N_LBRAC, either. */ did_output = 0; @@ -2919,7 +3105,6 @@ dbxout_block (block, depth, args) did_output = dbxout_syms (BLOCK_VARS (block)); if (args) dbxout_reg_parms (args); -#endif /* Now output an N_LBRAC symbol to represent the beginning of the block. Use the block's tree-walk order to generate @@ -2937,14 +3122,10 @@ dbxout_block (block, depth, args) tree decl = BLOCK_VARS (block); while (decl) { -#ifdef DBX_OUTPUT_CATCH - DBX_OUTPUT_CATCH (asmfile, decl, buf); -#else fprintf (asmfile, "%s\"%s:C1\",%d,0,0,", ASM_STABS_OP, IDENTIFIER_POINTER (DECL_NAME (decl)), N_CATCH); assemble_name (asmfile, buf); fprintf (asmfile, "\n"); -#endif decl = TREE_CHAIN (decl); } } @@ -2962,15 +3143,6 @@ dbxout_block (block, depth, args) #endif } -#ifdef DBX_LBRAC_FIRST - /* On some weird machines, the syms of a block - come after the N_LBRAC. */ - if (debug_info_level != DINFO_LEVEL_TERSE || depth == 0) - dbxout_syms (BLOCK_VARS (block)); - if (args) - dbxout_reg_parms (args); -#endif - /* Output the subblocks. */ dbxout_block (BLOCK_SUBBLOCKS (block), depth + 1, NULL_TREE); @@ -3002,10 +3174,21 @@ dbxout_block (block, depth, args) #if defined (DBX_DEBUGGING_INFO) static void -dbxout_begin_function (decl) - tree decl; +dbxout_begin_function (tree decl) { - dbxout_symbol (decl, 0); + int saved_tree_used1 = TREE_USED (decl); + TREE_USED (decl) = 1; + if (DECL_NAME (DECL_RESULT (decl)) != 0) + { + int saved_tree_used2 = TREE_USED (DECL_RESULT (decl)); + TREE_USED (DECL_RESULT (decl)) = 1; + dbxout_symbol (decl, 0); + TREE_USED (DECL_RESULT (decl)) = saved_tree_used2; + } + else + dbxout_symbol (decl, 0); + TREE_USED (decl) = saved_tree_used1; + dbxout_parms (DECL_ARGUMENTS (decl)); if (DECL_NAME (DECL_RESULT (decl)) != 0) dbxout_symbol (DECL_RESULT (decl), 1);