diff options
Diffstat (limited to 'gdb/symmisc.c')
| -rw-r--r-- | gdb/symmisc.c | 502 |
1 files changed, 252 insertions, 250 deletions
diff --git a/gdb/symmisc.c b/gdb/symmisc.c index c615bfcdea2..ca40a69f75a 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -2,21 +2,22 @@ Copyright 1986, 87, 89, 91, 92, 93, 94, 95, 96, 1998 Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "symtab.h" @@ -48,11 +49,11 @@ FILE *std_err; /* Prototypes for local functions */ -static void dump_symtab PARAMS ((struct objfile *, struct symtab *, - GDB_FILE *)); +static void dump_symtab PARAMS ((struct objfile *, struct symtab *, + GDB_FILE *)); -static void dump_psymtab PARAMS ((struct objfile *, struct partial_symtab *, - GDB_FILE *)); +static void dump_psymtab PARAMS ((struct objfile *, struct partial_symtab *, + GDB_FILE *)); static void dump_msymbols PARAMS ((struct objfile *, GDB_FILE *)); @@ -60,25 +61,26 @@ static void dump_objfile PARAMS ((struct objfile *)); static int block_depth PARAMS ((struct block *)); -static void print_partial_symbols PARAMS ((struct partial_symbol **, int, - char *, GDB_FILE *)); +static void print_partial_symbols PARAMS ((struct partial_symbol **, int, + char *, GDB_FILE *)); static void free_symtab_block PARAMS ((struct objfile *, struct block *)); void _initialize_symmisc PARAMS ((void)); -struct print_symbol_args { - struct symbol *symbol; - int depth; - GDB_FILE *outfile; -}; +struct print_symbol_args + { + struct symbol *symbol; + int depth; + GDB_FILE *outfile; + }; static int print_symbol PARAMS ((PTR)); static void free_symtab_block PARAMS ((struct objfile *, struct block *)); - + /* Free a struct block <- B and all the symbols defined in that block. */ static void @@ -90,10 +92,10 @@ free_symtab_block (objfile, b) n = BLOCK_NSYMS (b); for (i = 0; i < n; i++) { - mfree (objfile -> md, SYMBOL_NAME (BLOCK_SYM (b, i))); - mfree (objfile -> md, (PTR) BLOCK_SYM (b, i)); + mfree (objfile->md, SYMBOL_NAME (BLOCK_SYM (b, i))); + mfree (objfile->md, (PTR) BLOCK_SYM (b, i)); } - mfree (objfile -> md, (PTR) b); + mfree (objfile->md, (PTR) b); } /* Free all the storage associated with the struct symtab <- S. @@ -115,43 +117,43 @@ free_symtab (s) { case free_nothing: /* All the contents are part of a big block of memory (an obstack), - and some other symtab is in charge of freeing that block. - Therefore, do nothing. */ + and some other symtab is in charge of freeing that block. + Therefore, do nothing. */ break; case free_contents: /* Here all the contents were malloc'ed structure by structure - and must be freed that way. */ + 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_symtab_block (s->objfile, BLOCKVECTOR_BLOCK (bv, i)); /* Free the blockvector itself. */ - mfree (s -> objfile -> md, (PTR) bv); + mfree (s->objfile->md, (PTR) bv); /* Also free the linetable. */ - + case free_linetable: /* Everything will be freed either by our `free_ptr' - or by some other symtab, except for our linetable. - Free that now. */ + or by some other symtab, except for our linetable. + Free that now. */ if (LINETABLE (s)) - mfree (s -> objfile -> md, (PTR) LINETABLE (s)); + mfree (s->objfile->md, (PTR) LINETABLE (s)); break; } /* If there is a single block of memory to free, free it. */ - if (s -> free_ptr != NULL) - mfree (s -> objfile -> md, s -> free_ptr); + if (s->free_ptr != NULL) + mfree (s->objfile->md, s->free_ptr); /* Free source-related stuff */ - if (s -> line_charpos != NULL) - mfree (s -> objfile -> md, (PTR) s -> line_charpos); - if (s -> fullname != NULL) - mfree (s -> objfile -> md, s -> fullname); - if (s -> debugformat != NULL) - mfree (s -> objfile -> md, s -> debugformat); - mfree (s -> objfile -> md, (PTR) s); + if (s->line_charpos != NULL) + mfree (s->objfile->md, (PTR) s->line_charpos); + if (s->fullname != NULL) + mfree (s->objfile->md, s->fullname); + if (s->debugformat != NULL) + mfree (s->objfile->md, s->debugformat); + mfree (s->objfile->md, (PTR) s); } void @@ -161,10 +163,10 @@ print_symbol_bcache_statistics () immediate_quit++; ALL_OBJFILES (objfile) - { - printf_filtered ("Byte cache statistics for '%s':\n", objfile -> name); - print_bcache_statistics (&objfile -> psymbol_cache, "partial symbol cache"); - } + { + printf_filtered ("Byte cache statistics for '%s':\n", objfile->name); + print_bcache_statistics (&objfile->psymbol_cache, "partial symbol cache"); + } immediate_quit--; } @@ -175,46 +177,46 @@ print_objfile_statistics () immediate_quit++; ALL_OBJFILES (objfile) - { - printf_filtered ("Statistics for '%s':\n", objfile -> name); - if (OBJSTAT (objfile, n_stabs) > 0) - printf_filtered (" Number of \"stab\" symbols read: %d\n", - OBJSTAT (objfile, n_stabs)); - if (OBJSTAT (objfile, n_minsyms) > 0) - printf_filtered (" Number of \"minimal\" symbols read: %d\n", - OBJSTAT (objfile, n_minsyms)); - if (OBJSTAT (objfile, n_psyms) > 0) - printf_filtered (" Number of \"partial\" symbols read: %d\n", - OBJSTAT (objfile, n_psyms)); - if (OBJSTAT (objfile, n_syms) > 0) - printf_filtered (" Number of \"full\" symbols read: %d\n", - OBJSTAT (objfile, n_syms)); - if (OBJSTAT (objfile, n_types) > 0) - printf_filtered (" Number of \"types\" defined: %d\n", - OBJSTAT (objfile, n_types)); - if (OBJSTAT (objfile, sz_strtab) > 0) - printf_filtered (" Space used by a.out string tables: %d\n", - OBJSTAT (objfile, sz_strtab)); - printf_filtered (" Total memory used for psymbol obstack: %d\n", - obstack_memory_used (&objfile -> psymbol_obstack)); - printf_filtered (" Total memory used for psymbol cache: %d\n", - obstack_memory_used (&objfile -> psymbol_cache.cache)); - printf_filtered (" Total memory used for symbol obstack: %d\n", - obstack_memory_used (&objfile -> symbol_obstack)); - printf_filtered (" Total memory used for type obstack: %d\n", - obstack_memory_used (&objfile -> type_obstack)); - } + { + printf_filtered ("Statistics for '%s':\n", objfile->name); + if (OBJSTAT (objfile, n_stabs) > 0) + printf_filtered (" Number of \"stab\" symbols read: %d\n", + OBJSTAT (objfile, n_stabs)); + if (OBJSTAT (objfile, n_minsyms) > 0) + printf_filtered (" Number of \"minimal\" symbols read: %d\n", + OBJSTAT (objfile, n_minsyms)); + if (OBJSTAT (objfile, n_psyms) > 0) + printf_filtered (" Number of \"partial\" symbols read: %d\n", + OBJSTAT (objfile, n_psyms)); + if (OBJSTAT (objfile, n_syms) > 0) + printf_filtered (" Number of \"full\" symbols read: %d\n", + OBJSTAT (objfile, n_syms)); + if (OBJSTAT (objfile, n_types) > 0) + printf_filtered (" Number of \"types\" defined: %d\n", + OBJSTAT (objfile, n_types)); + if (OBJSTAT (objfile, sz_strtab) > 0) + printf_filtered (" Space used by a.out string tables: %d\n", + OBJSTAT (objfile, sz_strtab)); + printf_filtered (" Total memory used for psymbol obstack: %d\n", + obstack_memory_used (&objfile->psymbol_obstack)); + printf_filtered (" Total memory used for psymbol cache: %d\n", + obstack_memory_used (&objfile->psymbol_cache.cache)); + printf_filtered (" Total memory used for symbol obstack: %d\n", + obstack_memory_used (&objfile->symbol_obstack)); + printf_filtered (" Total memory used for type obstack: %d\n", + obstack_memory_used (&objfile->type_obstack)); + } immediate_quit--; } -static void +static void dump_objfile (objfile) struct objfile *objfile; { struct symtab *symtab; struct partial_symtab *psymtab; - printf_filtered ("\nObject file %s: ", objfile -> name); + printf_filtered ("\nObject file %s: ", objfile->name); printf_filtered ("Objfile at "); gdb_print_address (objfile, gdb_stdout); printf_filtered (", bfd at "); @@ -222,18 +224,18 @@ dump_objfile (objfile) printf_filtered (", %d minsyms\n\n", objfile->minimal_symbol_count); - if (objfile -> psymtabs) + if (objfile->psymtabs) { printf_filtered ("Psymtabs:\n"); - for (psymtab = objfile -> psymtabs; + for (psymtab = objfile->psymtabs; psymtab != NULL; - psymtab = psymtab -> next) + psymtab = psymtab->next) { printf_filtered ("%s at ", - psymtab -> filename); + psymtab->filename); gdb_print_address (psymtab, gdb_stdout); printf_filtered (", "); - if (psymtab -> objfile != objfile) + if (psymtab->objfile != objfile) { printf_filtered ("NOT ON CHAIN! "); } @@ -242,17 +244,17 @@ dump_objfile (objfile) printf_filtered ("\n\n"); } - if (objfile -> symtabs) + if (objfile->symtabs) { printf_filtered ("Symtabs:\n"); - for (symtab = objfile -> symtabs; + for (symtab = objfile->symtabs; symtab != NULL; symtab = symtab->next) { - printf_filtered ("%s at ", symtab -> filename); + printf_filtered ("%s at ", symtab->filename); gdb_print_address (symtab, gdb_stdout); printf_filtered (", "); - if (symtab -> objfile != objfile) + if (symtab->objfile != objfile) { printf_filtered ("NOT ON CHAIN! "); } @@ -263,8 +265,8 @@ dump_objfile (objfile) } /* Print minimal symbols from this objfile. */ - -static void + +static void dump_msymbols (objfile, outfile) struct objfile *objfile; GDB_FILE *outfile; @@ -272,48 +274,48 @@ dump_msymbols (objfile, outfile) struct minimal_symbol *msymbol; int index; char ms_type; - - fprintf_filtered (outfile, "\nObject file %s:\n\n", objfile -> name); - if (objfile -> minimal_symbol_count == 0) + + fprintf_filtered (outfile, "\nObject file %s:\n\n", objfile->name); + if (objfile->minimal_symbol_count == 0) { fprintf_filtered (outfile, "No minimal symbols found.\n"); return; } - for (index = 0, msymbol = objfile -> msymbols; + for (index = 0, msymbol = objfile->msymbols; SYMBOL_NAME (msymbol) != NULL; msymbol++, index++) { - switch (msymbol -> type) + switch (msymbol->type) { - case mst_unknown: - ms_type = 'u'; - break; - case mst_text: - ms_type = 'T'; - break; - case mst_solib_trampoline: - ms_type = 'S'; - break; - case mst_data: - ms_type = 'D'; - break; - case mst_bss: - ms_type = 'B'; - break; - case mst_abs: - ms_type = 'A'; - break; - case mst_file_text: - ms_type = 't'; - break; - case mst_file_data: - ms_type = 'd'; - break; - case mst_file_bss: - ms_type = 'b'; - break; - default: - ms_type = '?'; - break; + case mst_unknown: + ms_type = 'u'; + break; + case mst_text: + ms_type = 'T'; + break; + case mst_solib_trampoline: + ms_type = 'S'; + break; + case mst_data: + ms_type = 'D'; + break; + case mst_bss: + ms_type = 'B'; + break; + case mst_abs: + ms_type = 'A'; + break; + case mst_file_text: + ms_type = 't'; + break; + case mst_file_data: + ms_type = 'd'; + break; + case mst_file_bss: + ms_type = 'b'; + break; + default: + ms_type = '?'; + break; } fprintf_filtered (outfile, "[%2d] %c ", index, ms_type); print_address_numeric (SYMBOL_VALUE_ADDRESS (msymbol), 1, outfile); @@ -332,10 +334,10 @@ dump_msymbols (objfile, outfile) #endif fputs_filtered ("\n", outfile); } - if (objfile -> minimal_symbol_count != index) + if (objfile->minimal_symbol_count != index) { warning ("internal error: minimal symbol count %d != %d", - objfile -> minimal_symbol_count, index); + objfile->minimal_symbol_count, index); } fprintf_filtered (outfile, "\n"); } @@ -349,22 +351,22 @@ dump_psymtab (objfile, psymtab, outfile) int i; fprintf_filtered (outfile, "\nPartial symtab for source file %s ", - psymtab -> filename); + psymtab->filename); fprintf_filtered (outfile, "(object "); gdb_print_address (psymtab, outfile); fprintf_filtered (outfile, ")\n\n"); fprintf_unfiltered (outfile, " Read from object file %s (", - objfile -> name); + objfile->name); gdb_print_address (objfile, outfile); fprintf_unfiltered (outfile, ")\n"); - if (psymtab -> readin) + if (psymtab->readin) { fprintf_filtered (outfile, - " Full symtab was read (at "); + " Full symtab was read (at "); gdb_print_address (psymtab->symtab, outfile); fprintf_filtered (outfile, " by function at "); - gdb_print_address ((PTR)psymtab->read_symtab, outfile); + gdb_print_address ((PTR) psymtab->read_symtab, outfile); fprintf_filtered (outfile, ")\n"); } @@ -386,30 +388,30 @@ dump_psymtab (objfile, psymtab, outfile) print_address_numeric (psymtab->texthigh, 1, outfile); fprintf_filtered (outfile, "\n"); fprintf_filtered (outfile, " Depends on %d other partial symtabs.\n", - psymtab -> number_of_dependencies); - for (i = 0; i < psymtab -> number_of_dependencies; i++) + psymtab->number_of_dependencies); + for (i = 0; i < psymtab->number_of_dependencies; i++) { fprintf_filtered (outfile, " %d ", i); - gdb_print_address (psymtab -> dependencies[i], outfile); + gdb_print_address (psymtab->dependencies[i], outfile); fprintf_filtered (outfile, " %s\n", - psymtab -> dependencies[i] -> filename); + psymtab->dependencies[i]->filename); } - if (psymtab -> n_global_syms > 0) + if (psymtab->n_global_syms > 0) { - print_partial_symbols (objfile -> global_psymbols.list - + psymtab -> globals_offset, - psymtab -> n_global_syms, "Global", outfile); + print_partial_symbols (objfile->global_psymbols.list + + psymtab->globals_offset, + psymtab->n_global_syms, "Global", outfile); } - if (psymtab -> n_static_syms > 0) + if (psymtab->n_static_syms > 0) { - print_partial_symbols (objfile -> static_psymbols.list - + psymtab -> statics_offset, - psymtab -> n_static_syms, "Static", outfile); + print_partial_symbols (objfile->static_psymbols.list + + psymtab->statics_offset, + psymtab->n_static_syms, "Static", outfile); } fprintf_filtered (outfile, "\n"); } -static void +static void dump_symtab (objfile, symtab, outfile) struct objfile *objfile; struct symtab *symtab; @@ -446,7 +448,7 @@ dump_symtab (objfile, symtab, outfile) } /* Now print the block info, but only for primary symtabs since we will print lots of duplicate info otherwise. */ - if (symtab -> primary) + if (symtab->primary) { fprintf_filtered (outfile, "\nBlockvector:\n\n"); bv = BLOCKVECTOR (symtab); @@ -474,11 +476,11 @@ dump_symtab (objfile, symtab, outfile) if (SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b)) != NULL) { fprintf_filtered (outfile, ", %s", - SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b))); + SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b))); } } - if (BLOCK_GCC_COMPILED(b)) - fprintf_filtered (outfile, ", compiled with gcc%d", BLOCK_GCC_COMPILED(b)); + if (BLOCK_GCC_COMPILED (b)) + fprintf_filtered (outfile, ", compiled with gcc%d", BLOCK_GCC_COMPILED (b)); fprintf_filtered (outfile, "\n"); /* Now print each symbol in this block */ for (j = 0; j < blen; j++) @@ -537,7 +539,7 @@ Arguments missing: an output file name and an optional symbol file name"); filename = tilde_expand (filename); make_cleanup (free, filename); - + outfile = gdb_fopen (filename, FOPEN_WT); if (outfile == 0) perror_with_name (filename); @@ -545,8 +547,8 @@ Arguments missing: an output file name and an optional symbol file name"); immediate_quit++; ALL_SYMTABS (objfile, s) - if (symname == NULL || (STREQ (symname, s -> filename))) - dump_symtab (objfile, s, outfile); + if (symname == NULL || (STREQ (symname, s->filename))) + dump_symtab (objfile, s, outfile); immediate_quit--; do_cleanups (cleanups); } @@ -560,9 +562,9 @@ static int print_symbol (args) PTR args; { - struct symbol *symbol = ((struct print_symbol_args *)args)->symbol; - int depth = ((struct print_symbol_args *)args)->depth; - GDB_FILE *outfile = ((struct print_symbol_args *)args)->outfile; + struct symbol *symbol = ((struct print_symbol_args *) args)->symbol; + int depth = ((struct print_symbol_args *) args)->depth; + GDB_FILE *outfile = ((struct print_symbol_args *) args)->outfile; print_spaces (depth, outfile); if (SYMBOL_NAMESPACE (symbol) == LABEL_NAMESPACE) @@ -571,8 +573,8 @@ print_symbol (args) print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile); if (SYMBOL_BFD_SECTION (symbol)) fprintf_filtered (outfile, " section %s\n", - bfd_section_name (SYMBOL_BFD_SECTION (symbol)->owner, - SYMBOL_BFD_SECTION (symbol))); + bfd_section_name (SYMBOL_BFD_SECTION (symbol)->owner, + SYMBOL_BFD_SECTION (symbol))); else fprintf_filtered (outfile, "\n"); return 1; @@ -586,11 +588,11 @@ print_symbol (args) else { fprintf_filtered (outfile, "%s %s = ", - (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_ENUM - ? "enum" - : (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT - ? "struct" : "union")), - SYMBOL_NAME (symbol)); + (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_ENUM + ? "enum" + : (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT + ? "struct" : "union")), + SYMBOL_NAME (symbol)); LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth); } fprintf_filtered (outfile, ";\n"); @@ -627,13 +629,13 @@ print_symbol (args) TYPE_LENGTH (type)); for (i = 0; i < TYPE_LENGTH (type); i++) fprintf_filtered (outfile, " %02x", - (unsigned)SYMBOL_VALUE_BYTES (symbol) [i]); + (unsigned) SYMBOL_VALUE_BYTES (symbol)[i]); } break; case LOC_STATIC: fprintf_filtered (outfile, "static at "); - print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1,outfile); + print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile); if (SYMBOL_BFD_SECTION (symbol)) fprintf_filtered (outfile, " section %s", bfd_section_name @@ -643,7 +645,7 @@ print_symbol (args) case LOC_INDIRECT: fprintf_filtered (outfile, "extern global at *("); - print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1,outfile); + print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile); fprintf_filtered (outfile, "),"); break; @@ -658,7 +660,7 @@ print_symbol (args) case LOC_LOCAL_ARG: fprintf_filtered (outfile, "arg at offset 0x%lx from fp", - SYMBOL_VALUE (symbol)); + SYMBOL_VALUE (symbol)); break; case LOC_REF_ARG: @@ -680,12 +682,12 @@ print_symbol (args) case LOC_BASEREG: fprintf_filtered (outfile, "local at 0x%lx from register %d", - SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol)); + 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)); + SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol)); break; case LOC_TYPEDEF: @@ -727,7 +729,7 @@ print_symbol (args) fprintf_filtered (outfile, "optimized out"); break; - default: + default: fprintf_filtered (outfile, "botched symbol class %x", SYMBOL_CLASS (symbol)); break; @@ -743,7 +745,7 @@ maintenance_print_psymbols (args, from_tty) int from_tty; { char **argv; - GDB_FILE *outfile; + GDB_FILE *outfile; struct cleanup *cleanups; char *symname = NULL; char *filename = DEV_TTY; @@ -774,7 +776,7 @@ maintenance_print_psymbols (args, from_tty) filename = tilde_expand (filename); make_cleanup (free, filename); - + outfile = gdb_fopen (filename, FOPEN_WT); if (outfile == 0) perror_with_name (filename); @@ -782,8 +784,8 @@ maintenance_print_psymbols (args, from_tty) immediate_quit++; ALL_PSYMTABS (objfile, ps) - if (symname == NULL || (STREQ (symname, ps -> filename))) - dump_psymtab (objfile, ps, outfile); + if (symname == NULL || (STREQ (symname, ps->filename))) + dump_psymtab (objfile, ps, outfile); immediate_quit--; do_cleanups (cleanups); } @@ -798,7 +800,7 @@ print_partial_symbols (p, count, what, outfile) fprintf_filtered (outfile, " %s partial symbols:\n", what); while (count-- > 0) { - fprintf_filtered (outfile, " `%s'", SYMBOL_NAME(*p)); + fprintf_filtered (outfile, " `%s'", SYMBOL_NAME (*p)); if (SYMBOL_DEMANGLED_NAME (*p) != NULL) { fprintf_filtered (outfile, " `%s'", SYMBOL_DEMANGLED_NAME (*p)); @@ -922,7 +924,7 @@ maintenance_print_msymbols (args, from_tty) filename = tilde_expand (filename); make_cleanup (free, filename); - + outfile = gdb_fopen (filename, FOPEN_WT); if (outfile == 0) perror_with_name (filename); @@ -930,8 +932,8 @@ maintenance_print_msymbols (args, from_tty) immediate_quit++; ALL_OBJFILES (objfile) - if (symname == NULL || (STREQ (symname, objfile -> name))) - dump_msymbols (objfile, outfile); + if (symname == NULL || (STREQ (symname, objfile->name))) + dump_msymbols (objfile, outfile); immediate_quit--; fprintf_filtered (outfile, "\n\n"); do_cleanups (cleanups); @@ -969,76 +971,76 @@ maintenance_check_symtabs (ignore, from_tty) int length; ALL_PSYMTABS (objfile, ps) - { - s = PSYMTAB_TO_SYMTAB(ps); - if (s == NULL) - continue; - bv = BLOCKVECTOR (s); - b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); - psym = ps->objfile->static_psymbols.list + ps->statics_offset; - length = ps->n_static_syms; - while (length--) - { - sym = lookup_block_symbol (b, SYMBOL_NAME (*psym), - SYMBOL_NAMESPACE (*psym)); - if (!sym) - { - printf_filtered ("Static symbol `"); - puts_filtered (SYMBOL_NAME (*psym)); - printf_filtered ("' only found in "); - puts_filtered (ps->filename); - printf_filtered (" psymtab\n"); - } - psym++; - } - b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); - psym = ps->objfile->global_psymbols.list + ps->globals_offset; - length = ps->n_global_syms; - while (length--) - { - sym = lookup_block_symbol (b, SYMBOL_NAME (*psym), - SYMBOL_NAMESPACE (*psym)); - if (!sym) - { - printf_filtered ("Global symbol `"); - puts_filtered (SYMBOL_NAME (*psym)); - printf_filtered ("' only found in "); - puts_filtered (ps->filename); - printf_filtered (" psymtab\n"); - } - psym++; - } - if (ps->texthigh < ps->textlow) - { - printf_filtered ("Psymtab "); - puts_filtered (ps->filename); - printf_filtered (" covers bad range "); - print_address_numeric (ps->textlow, 1, gdb_stdout); - printf_filtered (" - "); - print_address_numeric (ps->texthigh, 1, gdb_stdout); - printf_filtered ("\n"); - continue; - } - if (ps->texthigh == 0) + { + s = PSYMTAB_TO_SYMTAB (ps); + if (s == NULL) + continue; + bv = BLOCKVECTOR (s); + b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); + psym = ps->objfile->static_psymbols.list + ps->statics_offset; + length = ps->n_static_syms; + while (length--) + { + sym = lookup_block_symbol (b, SYMBOL_NAME (*psym), + SYMBOL_NAMESPACE (*psym)); + if (!sym) + { + printf_filtered ("Static symbol `"); + puts_filtered (SYMBOL_NAME (*psym)); + printf_filtered ("' only found in "); + puts_filtered (ps->filename); + printf_filtered (" psymtab\n"); + } + psym++; + } + b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); + psym = ps->objfile->global_psymbols.list + ps->globals_offset; + length = ps->n_global_syms; + while (length--) + { + sym = lookup_block_symbol (b, SYMBOL_NAME (*psym), + SYMBOL_NAMESPACE (*psym)); + if (!sym) + { + printf_filtered ("Global symbol `"); + puts_filtered (SYMBOL_NAME (*psym)); + printf_filtered ("' only found in "); + puts_filtered (ps->filename); + printf_filtered (" psymtab\n"); + } + psym++; + } + if (ps->texthigh < ps->textlow) + { + printf_filtered ("Psymtab "); + puts_filtered (ps->filename); + printf_filtered (" covers bad range "); + print_address_numeric (ps->textlow, 1, gdb_stdout); + printf_filtered (" - "); + print_address_numeric (ps->texthigh, 1, gdb_stdout); + printf_filtered ("\n"); continue; - if (ps->textlow < BLOCK_START (b) || ps->texthigh > BLOCK_END (b)) - { - printf_filtered ("Psymtab "); - puts_filtered (ps->filename); - printf_filtered (" covers "); - print_address_numeric (ps->textlow, 1, gdb_stdout); - printf_filtered (" - "); - print_address_numeric (ps->texthigh, 1, gdb_stdout); - printf_filtered (" but symtab covers only "); - print_address_numeric (BLOCK_START (b), 1, gdb_stdout); - printf_filtered (" - "); - print_address_numeric (BLOCK_END (b), 1, gdb_stdout); - printf_filtered ("\n"); - } - } + } + if (ps->texthigh == 0) + continue; + if (ps->textlow < BLOCK_START (b) || ps->texthigh > BLOCK_END (b)) + { + printf_filtered ("Psymtab "); + puts_filtered (ps->filename); + printf_filtered (" covers "); + print_address_numeric (ps->textlow, 1, gdb_stdout); + printf_filtered (" - "); + print_address_numeric (ps->texthigh, 1, gdb_stdout); + printf_filtered (" but symtab covers only "); + print_address_numeric (BLOCK_START (b), 1, gdb_stdout); + printf_filtered (" - "); + print_address_numeric (BLOCK_END (b), 1, gdb_stdout); + printf_filtered ("\n"); + } + } } - + /* Return the nexting depth of a block within other blocks in its symtab. */ static int @@ -1046,14 +1048,14 @@ block_depth (block) struct block *block; { register int i = 0; - while ((block = BLOCK_SUPERBLOCK (block)) != NULL) + while ((block = BLOCK_SUPERBLOCK (block)) != NULL) { i++; } return i; } - + /* Increase the space allocated for LISTP, which is probably global_psymbols or static_psymbols. This space will eventually be freed in free_objfile(). */ @@ -1068,13 +1070,13 @@ extend_psymbol_list (listp, objfile) { new_size = 255; listp->list = (struct partial_symbol **) - xmmalloc (objfile -> md, new_size * sizeof (struct partial_symbol *)); + xmmalloc (objfile->md, new_size * sizeof (struct partial_symbol *)); } else { new_size = listp->size * 2; listp->list = (struct partial_symbol **) - xmrealloc (objfile -> md, (char *) listp->list, + xmrealloc (objfile->md, (char *) listp->list, new_size * sizeof (struct partial_symbol *)); } /* Next assumes we only went one over. Should be good if @@ -1088,7 +1090,7 @@ extend_psymbol_list (listp, objfile) void _initialize_symmisc () { - std_in = stdin; + std_in = stdin; std_out = stdout; std_err = stderr; } |