X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fsymmisc.c;h=af654978017616d35f803af857db7e7f50d26cf6;hb=714835d5a63b86bb0e82c13d2a4840d8b5e633d3;hp=5c5950a82a0d204aea5b307b8fa8e43aee6c1d5e;hpb=9b254dd1ce46c19dde1dde5b8d1e22e862dfacce;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/symmisc.c b/gdb/symmisc.c index 5c5950a82a..af65497801 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -70,8 +70,6 @@ static int block_depth (struct block *); static void print_partial_symbols (struct partial_symbol **, int, char *, struct ui_file *); -static void free_symtab_block (struct objfile *, struct block *); - void _initialize_symmisc (void); struct print_symbol_args @@ -82,37 +80,12 @@ struct print_symbol_args }; static int print_symbol (void *); - -static void free_symtab_block (struct objfile *, struct block *); - -/* Free a struct block <- B and all the symbols defined in that block. */ - -/* FIXME: carlton/2003-04-28: I don't believe this is currently ever - used. */ - -static void -free_symtab_block (struct objfile *objfile, struct block *b) -{ - struct dict_iterator iter; - struct symbol *sym; - - ALL_BLOCK_SYMBOLS (b, iter, sym) - { - xfree (DEPRECATED_SYMBOL_NAME (sym)); - xfree (sym); - } - - dict_free (BLOCK_DICT (b)); - xfree (b); -} - /* Free all the storage associated with the struct symtab <- S. - Note that some symtabs have contents malloc'ed structure by structure, - while some have contents that all live inside one big block of memory, - and some share the contents of another symbol table and so you should - not free the contents on their behalf (except sometimes the linetable, - which maybe per symtab even when the rest is not). + Note that some symtabs have contents that all live inside one big block of + memory, and some share the contents of another symbol table and so you + should not free the contents on their behalf (except sometimes the + linetable, which maybe per symtab even when the rest is not). It is s->free_code that says which alternative to use. */ void @@ -129,18 +102,6 @@ free_symtab (struct symtab *s) Therefore, do nothing. */ break; - case free_contents: - /* Here all the contents were malloc'ed structure by structure - and must be freed that way. */ - /* First free the blocks (and their symbols. */ - bv = BLOCKVECTOR (s); - n = BLOCKVECTOR_NBLOCKS (bv); - for (i = 0; i < n; i++) - free_symtab_block (s->objfile, BLOCKVECTOR_BLOCK (bv, i)); - /* Free the blockvector itself. */ - xfree (bv); - /* Also free the linetable. */ - case free_linetable: /* Everything will be freed either by our `free_func' or by some other symtab, except for our linetable. @@ -174,6 +135,7 @@ print_symbol_bcache_statistics (void) { printf_filtered (_("Byte cache statistics for '%s':\n"), objfile->name); print_bcache_statistics (objfile->psymbol_cache, "partial symbol cache"); + print_bcache_statistics (objfile->macro_cache, "preprocessor macro cache"); } immediate_quit--; } @@ -309,9 +271,11 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile) fprintf_filtered (outfile, "No minimal symbols found.\n"); return; } - for (index = 0, msymbol = objfile->msymbols; - DEPRECATED_SYMBOL_NAME (msymbol) != NULL; msymbol++, index++) + index = 0; + ALL_OBJFILE_MSYMBOLS (objfile, msymbol) { + struct obj_section *section = SYMBOL_OBJ_SECTION (msymbol); + switch (msymbol->type) { case mst_unknown: @@ -346,12 +310,12 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile) break; } fprintf_filtered (outfile, "[%2d] %c ", index, ms_type); - deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (msymbol), 1, outfile); - fprintf_filtered (outfile, " %s", DEPRECATED_SYMBOL_NAME (msymbol)); - if (SYMBOL_BFD_SECTION (msymbol)) + fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (msymbol)), outfile); + fprintf_filtered (outfile, " %s", SYMBOL_LINKAGE_NAME (msymbol)); + if (section) fprintf_filtered (outfile, " section %s", bfd_section_name (objfile->obfd, - SYMBOL_BFD_SECTION (msymbol))); + section->the_bfd_section)); if (SYMBOL_DEMANGLED_NAME (msymbol) != NULL) { fprintf_filtered (outfile, " %s", SYMBOL_DEMANGLED_NAME (msymbol)); @@ -359,6 +323,7 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile) if (msymbol->filename) fprintf_filtered (outfile, " %s", msymbol->filename); fputs_filtered ("\n", outfile); + index++; } if (objfile->minimal_symbol_count != index) { @@ -400,16 +365,15 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab, if (i != 0) fprintf_filtered (outfile, ", "); wrap_here (" "); - deprecated_print_address_numeric (ANOFFSET (psymtab->section_offsets, i), - 1, - outfile); + fputs_filtered (paddress (ANOFFSET (psymtab->section_offsets, i)), + outfile); } fprintf_filtered (outfile, "\n"); fprintf_filtered (outfile, " Symbols cover text addresses "); - deprecated_print_address_numeric (psymtab->textlow, 1, outfile); + fputs_filtered (paddress (psymtab->textlow), outfile); fprintf_filtered (outfile, "-"); - deprecated_print_address_numeric (psymtab->texthigh, 1, outfile); + fputs_filtered (paddress (psymtab->texthigh), outfile); fprintf_filtered (outfile, "\n"); fprintf_filtered (outfile, " Depends on %d other partial symtabs.\n", psymtab->number_of_dependencies); @@ -466,7 +430,7 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, for (i = 0; i < len; i++) { fprintf_filtered (outfile, " line %d at ", l->item[i].line); - deprecated_print_address_numeric (l->item[i].pc, 1, outfile); + fputs_filtered (paddress (l->item[i].pc), outfile); fprintf_filtered (outfile, "\n"); } } @@ -494,12 +458,13 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, wants it. */ fprintf_filtered (outfile, ", %d syms/buckets in ", dict_size (BLOCK_DICT (b))); - deprecated_print_address_numeric (BLOCK_START (b), 1, outfile); + fputs_filtered (paddress (BLOCK_START (b)), outfile); fprintf_filtered (outfile, ".."); - deprecated_print_address_numeric (BLOCK_END (b), 1, outfile); + fputs_filtered (paddress (BLOCK_END (b)), outfile); if (BLOCK_FUNCTION (b)) { - fprintf_filtered (outfile, ", function %s", DEPRECATED_SYMBOL_NAME (BLOCK_FUNCTION (b))); + fprintf_filtered (outfile, ", function %s", + SYMBOL_LINKAGE_NAME (BLOCK_FUNCTION (b))); if (SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b)) != NULL) { fprintf_filtered (outfile, ", %s", @@ -516,7 +481,7 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, s.depth = depth + 1; s.outfile = outfile; catch_errors (print_symbol, &s, "Error printing symbol:\n", - RETURN_MASK_ALL); + RETURN_MASK_ERROR); } } fprintf_filtered (outfile, "\n"); @@ -604,16 +569,17 @@ print_symbol (void *args) struct symbol *symbol = ((struct print_symbol_args *) args)->symbol; int depth = ((struct print_symbol_args *) args)->depth; struct ui_file *outfile = ((struct print_symbol_args *) args)->outfile; + struct obj_section *section = SYMBOL_OBJ_SECTION (symbol); print_spaces (depth, outfile); if (SYMBOL_DOMAIN (symbol) == LABEL_DOMAIN) { fprintf_filtered (outfile, "label %s at ", SYMBOL_PRINT_NAME (symbol)); - deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile); - if (SYMBOL_BFD_SECTION (symbol)) + fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (symbol)), outfile); + if (section) fprintf_filtered (outfile, " section %s\n", - bfd_section_name (SYMBOL_BFD_SECTION (symbol)->owner, - SYMBOL_BFD_SECTION (symbol))); + bfd_section_name (section->the_bfd_section->owner, + section->the_bfd_section)); else fprintf_filtered (outfile, "\n"); return 1; @@ -631,7 +597,7 @@ print_symbol (void *args) ? "enum" : (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT ? "struct" : "union")), - DEPRECATED_SYMBOL_NAME (symbol)); + SYMBOL_LINKAGE_NAME (symbol)); LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth); } fprintf_filtered (outfile, ";\n"); @@ -674,22 +640,19 @@ print_symbol (void *args) case LOC_STATIC: fprintf_filtered (outfile, "static at "); - deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile); - if (SYMBOL_BFD_SECTION (symbol)) + fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (symbol)), outfile); + if (section) fprintf_filtered (outfile, " section %s", - bfd_section_name - (SYMBOL_BFD_SECTION (symbol)->owner, - SYMBOL_BFD_SECTION (symbol))); - break; - - case LOC_INDIRECT: - fprintf_filtered (outfile, "extern global at *("); - deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile); - fprintf_filtered (outfile, "),"); + bfd_section_name (section->the_bfd_section->owner, + section->the_bfd_section)); break; case LOC_REGISTER: - fprintf_filtered (outfile, "register %ld", SYMBOL_VALUE (symbol)); + if (SYMBOL_IS_ARGUMENT (symbol)) + fprintf_filtered (outfile, "parameter register %ld", + SYMBOL_VALUE (symbol)); + else + fprintf_filtered (outfile, "register %ld", SYMBOL_VALUE (symbol)); break; case LOC_ARG: @@ -697,19 +660,10 @@ print_symbol (void *args) SYMBOL_VALUE (symbol)); break; - case LOC_LOCAL_ARG: - fprintf_filtered (outfile, "arg at offset 0x%lx from fp", - SYMBOL_VALUE (symbol)); - break; - case LOC_REF_ARG: fprintf_filtered (outfile, "reference arg at 0x%lx", SYMBOL_VALUE (symbol)); break; - case LOC_REGPARM: - fprintf_filtered (outfile, "parameter register %ld", SYMBOL_VALUE (symbol)); - break; - case LOC_REGPARM_ADDR: fprintf_filtered (outfile, "address parameter register %ld", SYMBOL_VALUE (symbol)); break; @@ -719,49 +673,34 @@ print_symbol (void *args) SYMBOL_VALUE (symbol)); break; - case LOC_BASEREG: - fprintf_filtered (outfile, "local at 0x%lx from register %d", - SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol)); - break; - - case LOC_BASEREG_ARG: - fprintf_filtered (outfile, "arg at 0x%lx from register %d", - SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol)); - break; - case LOC_TYPEDEF: break; case LOC_LABEL: fprintf_filtered (outfile, "label at "); - deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile); - if (SYMBOL_BFD_SECTION (symbol)) + fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (symbol)), outfile); + if (section) fprintf_filtered (outfile, " section %s", - bfd_section_name - (SYMBOL_BFD_SECTION (symbol)->owner, - SYMBOL_BFD_SECTION (symbol))); + bfd_section_name (section->the_bfd_section->owner, + section->the_bfd_section)); break; case LOC_BLOCK: fprintf_filtered (outfile, "block object "); gdb_print_host_address (SYMBOL_BLOCK_VALUE (symbol), outfile); fprintf_filtered (outfile, ", "); - deprecated_print_address_numeric (BLOCK_START (SYMBOL_BLOCK_VALUE (symbol)), - 1, - outfile); + fputs_filtered (paddress (BLOCK_START (SYMBOL_BLOCK_VALUE (symbol))), + outfile); fprintf_filtered (outfile, ".."); - deprecated_print_address_numeric (BLOCK_END (SYMBOL_BLOCK_VALUE (symbol)), - 1, - outfile); - if (SYMBOL_BFD_SECTION (symbol)) + fputs_filtered (paddress (BLOCK_END (SYMBOL_BLOCK_VALUE (symbol))), + outfile); + if (section) fprintf_filtered (outfile, " section %s", - bfd_section_name - (SYMBOL_BFD_SECTION (symbol)->owner, - SYMBOL_BFD_SECTION (symbol))); + bfd_section_name (section->the_bfd_section->owner, + section->the_bfd_section)); break; case LOC_COMPUTED: - case LOC_COMPUTED_ARG: fprintf_filtered (outfile, "computed at runtime"); break; @@ -839,7 +778,7 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what, fprintf_filtered (outfile, " %s partial symbols:\n", what); while (count-- > 0) { - fprintf_filtered (outfile, " `%s'", DEPRECATED_SYMBOL_NAME (*p)); + fprintf_filtered (outfile, " `%s'", SYMBOL_LINKAGE_NAME (*p)); if (SYMBOL_DEMANGLED_NAME (*p) != NULL) { fprintf_filtered (outfile, " `%s'", SYMBOL_DEMANGLED_NAME (*p)); @@ -874,9 +813,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what, case LOC_STATIC: fputs_filtered ("static", outfile); break; - case LOC_INDIRECT: - fputs_filtered ("extern global", outfile); - break; case LOC_REGISTER: fputs_filtered ("register", outfile); break; @@ -886,9 +822,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what, case LOC_REF_ARG: fputs_filtered ("pass by reference", outfile); break; - case LOC_REGPARM: - fputs_filtered ("register parameter", outfile); - break; case LOC_REGPARM_ADDR: fputs_filtered ("register address parameter", outfile); break; @@ -907,9 +840,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what, case LOC_CONST_BYTES: fputs_filtered ("constant bytes", outfile); break; - case LOC_LOCAL_ARG: - fputs_filtered ("shuffled arg", outfile); - break; case LOC_UNRESOLVED: fputs_filtered ("unresolved", outfile); break; @@ -917,7 +847,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what, fputs_filtered ("optimized out", outfile); break; case LOC_COMPUTED: - case LOC_COMPUTED_ARG: fputs_filtered ("computed at runtime", outfile); break; default: @@ -925,7 +854,7 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what, break; } fputs_filtered (", ", outfile); - deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (*p), 1, outfile); + fputs_filtered (paddress (SYMBOL_VALUE_ADDRESS (*p)), outfile); fprintf_filtered (outfile, "\n"); p++; } @@ -1088,9 +1017,9 @@ maintenance_info_psymtabs (char *regexp, int from_tty) printf_filtered (" fullname %s\n", psymtab->fullname ? psymtab->fullname : "(null)"); printf_filtered (" text addresses "); - deprecated_print_address_numeric (psymtab->textlow, 1, gdb_stdout); + fputs_filtered (paddress (psymtab->textlow), gdb_stdout); printf_filtered (" -- "); - deprecated_print_address_numeric (psymtab->texthigh, 1, gdb_stdout); + fputs_filtered (paddress (psymtab->texthigh), gdb_stdout); printf_filtered ("\n"); printf_filtered (" globals "); if (psymtab->n_global_syms) @@ -1165,12 +1094,12 @@ maintenance_check_symtabs (char *ignore, int from_tty) length = ps->n_static_syms; while (length--) { - sym = lookup_block_symbol (b, DEPRECATED_SYMBOL_NAME (*psym), + sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym), NULL, SYMBOL_DOMAIN (*psym)); if (!sym) { printf_filtered ("Static symbol `"); - puts_filtered (DEPRECATED_SYMBOL_NAME (*psym)); + puts_filtered (SYMBOL_LINKAGE_NAME (*psym)); printf_filtered ("' only found in "); puts_filtered (ps->filename); printf_filtered (" psymtab\n"); @@ -1182,12 +1111,12 @@ maintenance_check_symtabs (char *ignore, int from_tty) length = ps->n_global_syms; while (length--) { - sym = lookup_block_symbol (b, DEPRECATED_SYMBOL_NAME (*psym), + sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym), NULL, SYMBOL_DOMAIN (*psym)); if (!sym) { printf_filtered ("Global symbol `"); - puts_filtered (DEPRECATED_SYMBOL_NAME (*psym)); + puts_filtered (SYMBOL_LINKAGE_NAME (*psym)); printf_filtered ("' only found in "); puts_filtered (ps->filename); printf_filtered (" psymtab\n"); @@ -1199,9 +1128,9 @@ maintenance_check_symtabs (char *ignore, int from_tty) printf_filtered ("Psymtab "); puts_filtered (ps->filename); printf_filtered (" covers bad range "); - deprecated_print_address_numeric (ps->textlow, 1, gdb_stdout); + fputs_filtered (paddress (ps->textlow), gdb_stdout); printf_filtered (" - "); - deprecated_print_address_numeric (ps->texthigh, 1, gdb_stdout); + fputs_filtered (paddress (ps->texthigh), gdb_stdout); printf_filtered ("\n"); continue; } @@ -1212,13 +1141,13 @@ maintenance_check_symtabs (char *ignore, int from_tty) printf_filtered ("Psymtab "); puts_filtered (ps->filename); printf_filtered (" covers "); - deprecated_print_address_numeric (ps->textlow, 1, gdb_stdout); + fputs_filtered (paddress (ps->textlow), gdb_stdout); printf_filtered (" - "); - deprecated_print_address_numeric (ps->texthigh, 1, gdb_stdout); + fputs_filtered (paddress (ps->texthigh), gdb_stdout); printf_filtered (" but symtab covers only "); - deprecated_print_address_numeric (BLOCK_START (b), 1, gdb_stdout); + fputs_filtered (paddress (BLOCK_START (b)), gdb_stdout); printf_filtered (" - "); - deprecated_print_address_numeric (BLOCK_END (b), 1, gdb_stdout); + fputs_filtered (paddress (BLOCK_END (b)), gdb_stdout); printf_filtered ("\n"); } }