diff options
author | Jim Kingdon <jkingdon@engr.sgi.com> | 1994-01-27 00:36:05 +0000 |
---|---|---|
committer | Jim Kingdon <jkingdon@engr.sgi.com> | 1994-01-27 00:36:05 +0000 |
commit | 833e0d94ccb34e8ac566a574fd5a75fb967434a5 (patch) | |
tree | 52a27d6ecae0b66b7f3125460fd8d57ae689ac85 /gdb/symmisc.c | |
parent | 9a27b06e9823be3f762f9b87bd936e5e22359e9b (diff) | |
download | fsf-binutils-gdb-833e0d94ccb34e8ac566a574fd5a75fb967434a5.zip fsf-binutils-gdb-833e0d94ccb34e8ac566a574fd5a75fb967434a5.tar.gz fsf-binutils-gdb-833e0d94ccb34e8ac566a574fd5a75fb967434a5.tar.bz2 |
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
Diffstat (limited to 'gdb/symmisc.c')
-rw-r--r-- | gdb/symmisc.c | 232 |
1 files changed, 140 insertions, 92 deletions
diff --git a/gdb/symmisc.c b/gdb/symmisc.c index f81fcdc..bfc8dc5 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -47,13 +47,13 @@ FILE *std_err; /* Prototypes for local functions */ static void -dump_symtab PARAMS ((struct objfile *, struct symtab *, FILE *)); +dump_symtab PARAMS ((struct objfile *, struct symtab *, GDB_FILE *)); static void -dump_psymtab PARAMS ((struct objfile *, struct partial_symtab *, FILE *)); +dump_psymtab PARAMS ((struct objfile *, struct partial_symtab *, GDB_FILE *)); static void -dump_msymbols PARAMS ((struct objfile *, FILE *)); +dump_msymbols PARAMS ((struct objfile *, GDB_FILE *)); static void dump_objfile PARAMS ((struct objfile *)); @@ -62,12 +62,12 @@ static int block_depth PARAMS ((struct block *)); static void -print_partial_symbol PARAMS ((struct partial_symbol *, int, char *, FILE *)); +print_partial_symbol PARAMS ((struct partial_symbol *, int, char *, GDB_FILE *)); struct print_symbol_args { struct symbol *symbol; int depth; - FILE *outfile; + GDB_FILE *outfile; }; static int print_symbol PARAMS ((char *)); @@ -159,8 +159,12 @@ dump_objfile (objfile) struct partial_symtab *psymtab; printf_filtered ("\nObject file %s: ", objfile -> name); - printf_filtered ("Objfile at %x, bfd at %x, %d minsyms\n\n", - objfile, objfile -> obfd, objfile->minimal_symbol_count); + printf_filtered ("Objfile at "); + gdb_print_address (objfile, gdb_stdout); + printf_filtered (", bfd at "); + gdb_print_address (objfile->obfd, gdb_stdout); + printf_filtered (", %d minsyms\n\n", + objfile->minimal_symbol_count); if (objfile -> psymtabs) { @@ -169,7 +173,10 @@ dump_objfile (objfile) psymtab != NULL; psymtab = psymtab -> next) { - printf_filtered ("%s at %x, ", psymtab -> filename, psymtab); + printf_filtered ("%s at ", + psymtab -> filename); + gdb_print_address (psymtab); + printf_filtered (", "); if (psymtab -> objfile != objfile) { printf_filtered ("NOT ON CHAIN! "); @@ -186,7 +193,9 @@ dump_objfile (objfile) symtab != NULL; symtab = symtab->next) { - printf_filtered ("%s at %x, ", symtab -> filename, symtab); + printf_filtered ("%s at ", symtab -> filename); + gdb_print_address (symtab); + printf_filtered (", "); if (symtab -> objfile != objfile) { printf_filtered ("NOT ON CHAIN! "); @@ -202,7 +211,7 @@ dump_objfile (objfile) static void dump_msymbols (objfile, outfile) struct objfile *objfile; - FILE *outfile; + GDB_FILE *outfile; { struct minimal_symbol *msymbol; int index; @@ -247,7 +256,7 @@ dump_msymbols (objfile, outfile) ms_type = '?'; break; } - fprintf_filtered (outfile, "[%2d] %c %#10x %s", index, ms_type, + fprintf_filtered (outfile, "[%2d] %c %#10lx %s", index, ms_type, SYMBOL_VALUE_ADDRESS (msymbol), SYMBOL_NAME (msymbol)); if (SYMBOL_DEMANGLED_NAME (msymbol) != NULL) { @@ -267,40 +276,50 @@ static void dump_psymtab (objfile, psymtab, outfile) struct objfile *objfile; struct partial_symtab *psymtab; - FILE *outfile; + GDB_FILE *outfile; { int i; fprintf_filtered (outfile, "\nPartial symtab for source file %s ", psymtab -> filename); - fprintf_filtered (outfile, "(object 0x%x)\n\n", psymtab); - fprintf (outfile, " Read from object file %s (0x%x)\n", - objfile -> name, (unsigned int) objfile); - + fprintf_filtered (outfile, "(object )"); + gdb_print_address (psymtab, outfile); + fprintf_filtered (outfile, ")\n\n"); + fprintf_unfiltered (outfile, " Read from object file %s (", + objfile -> name); + gdb_print_address (objfile, outfile); + fprintf_unfiltered (outfile, ")\n"); + if (psymtab -> readin) { fprintf_filtered (outfile, - " Full symtab was read (at 0x%x by function at 0x%x)\n", - psymtab -> symtab, psymtab -> read_symtab); + " Full symtab was read (at "); + gdb_print_address (psymtab->symtab, outfile); + fprintf_filtered (outfile, " by function at "); + gdb_print_address (psymtab->read_symtab, outfile); + fprintf_filtered (outfile, ")\n"); + } + + fprintf_filtered (outfile, " Relocate symbols by "); + for (i = 0; i < psymtab->objfile->num_sections; ++i) + { + wrap_here (" "); + print_address_numeric (ANOFFSET (psymtab->section_offsets, i), outfile); + fprintf_filtered (outfile, ", "); } - /* FIXME, we need to be able to print the relocation stuff. */ - /* This prints some garbage for anything but stabs right now. FIXME. */ - if (psymtab->section_offsets) - fprintf_filtered (outfile, " Relocate symbols by 0x%x, 0x%x, 0x%x, 0x%x.\n", - ANOFFSET (psymtab->section_offsets, 0), - ANOFFSET (psymtab->section_offsets, 1), - ANOFFSET (psymtab->section_offsets, 2), - ANOFFSET (psymtab->section_offsets, 3)); - - fprintf_filtered (outfile, " Symbols cover text addresses 0x%x-0x%x\n", - psymtab -> textlow, psymtab -> texthigh); + fprintf_filtered (outfile, " Symbols cover text addresses "); + print_address_numeric (psymtab->textlow, outfile); + fprintf_filtered (outfile, "-"); + print_address_numeric (psymtab->texthigh, 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++) { - fprintf_filtered (outfile, " %d 0x%lx %s\n", i, - (unsigned long) psymtab -> dependencies[i], + fprintf_filtered (outfile, " %d ", i); + gdb_print_address (psymtab -> dependencies[i], outfile); + fprintf_filtered (outfile, " %s\n", psymtab -> dependencies[i] -> filename); } if (psymtab -> n_global_syms > 0) @@ -322,7 +341,7 @@ static void dump_symtab (objfile, symtab, outfile) struct objfile *objfile; struct symtab *symtab; - FILE *outfile; + GDB_FILE *outfile; { register int i, j; int len, blen; @@ -331,22 +350,27 @@ dump_symtab (objfile, symtab, outfile) register struct block *b; int depth; - fprintf (outfile, "\nSymtab for file %s\n", symtab->filename); - fprintf (outfile, "Read from object file %s (%x)\n", objfile->name, - (unsigned int) objfile); - fprintf (outfile, "Language: %s\n", language_str (symtab -> language)); - + fprintf_filtered (outfile, "\nSymtab for file %s\n", symtab->filename); + fprintf_filtered (outfile, "Read from object file %s (", objfile->name); + gdb_print_address (objfile, outfile); + fprintf_filtered (outfile, ")\n"); + fprintf_filtered (outfile, "Language: %s\n", language_str (symtab -> language)); + /* First print the line table. */ l = LINETABLE (symtab); - if (l) { - fprintf (outfile, "\nLine table:\n\n"); - len = l->nitems; - for (i = 0; i < len; i++) - fprintf (outfile, " line %d at %x\n", l->item[i].line, - l->item[i].pc); - } + if (l) + { + fprintf_filtered (outfile, "\nLine table:\n\n"); + len = l->nitems; + for (i = 0; i < len; i++) + { + fprintf_filtered (outfile, " line %d at ", l->item[i].line); + print_address_numeric (l->item[i].pc, outfile); + fprintf_filtered (outfile, "\n"); + } + } /* Now print the block info. */ - fprintf (outfile, "\nBlockvector:\n\n"); + fprintf_filtered (outfile, "\nBlockvector:\n\n"); bv = BLOCKVECTOR (symtab); len = BLOCKVECTOR_NBLOCKS (bv); for (i = 0; i < len; i++) @@ -354,22 +378,32 @@ dump_symtab (objfile, symtab, outfile) b = BLOCKVECTOR_BLOCK (bv, i); depth = block_depth (b) * 2; print_spaces (depth, outfile); - fprintf (outfile, "block #%03d (object 0x%x) ", i, (unsigned int) b); - fprintf (outfile, "[0x%x..0x%x]", BLOCK_START (b), BLOCK_END (b)); + fprintf_filtered (outfile, "block #%03d (object ", i); + gdb_print_address (b, outfile); + fprintf_filtered (outfile, ") "); + fprintf_filtered (outfile, "["); + print_address_numeric (BLOCK_START (b), outfile); + fprintf_filtered (outfile, ".."); + print_address_numeric (BLOCK_END (b), outfile); + fprintf_filtered (outfile, "]"); if (BLOCK_SUPERBLOCK (b)) - fprintf (outfile, " (under 0x%x)", (unsigned int) BLOCK_SUPERBLOCK (b)); + { + fprintf_filtered (outfile, " (under "); + gdb_print_address (BLOCK_SUPERBLOCK (b), outfile); + fprintf_filtered (outfile, ")"); + } if (BLOCK_FUNCTION (b)) { - fprintf (outfile, " %s", SYMBOL_NAME (BLOCK_FUNCTION (b))); + fprintf_filtered (outfile, " %s", SYMBOL_NAME (BLOCK_FUNCTION (b))); if (SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b)) != NULL) { - fprintf (outfile, " %s", + fprintf_filtered (outfile, " %s", SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b))); } } if (BLOCK_GCC_COMPILED(b)) - fprintf (outfile, " gcc%d compiled", BLOCK_GCC_COMPILED(b)); - fputc ('\n', outfile); + fprintf_filtered (outfile, " gcc%d compiled", BLOCK_GCC_COMPILED(b)); + fputc_filtered ('\n', outfile); blen = BLOCK_NSYMS (b); for (j = 0; j < blen; j++) { @@ -381,7 +415,7 @@ dump_symtab (objfile, symtab, outfile) RETURN_MASK_ERROR); } } - fprintf (outfile, "\n"); + fprintf_filtered (outfile, "\n"); } void @@ -390,7 +424,7 @@ maintenance_print_symbols (args, from_tty) int from_tty; { char **argv; - FILE *outfile; + GDB_FILE *outfile; struct cleanup *cleanups; char *symname = NULL; char *filename = DEV_TTY; @@ -422,7 +456,7 @@ maintenance_print_symbols (args, from_tty) filename = tilde_expand (filename); make_cleanup (free, filename); - outfile = fopen (filename, FOPEN_WT); + outfile = gdb_fopen (filename, FOPEN_WT); if (outfile == 0) perror_with_name (filename); make_cleanup (fclose, (char *) outfile); @@ -446,24 +480,25 @@ print_symbol (args) { struct symbol *symbol = ((struct print_symbol_args *)args)->symbol; int depth = ((struct print_symbol_args *)args)->depth; - FILE *outfile = ((struct print_symbol_args *)args)->outfile; + GDB_FILE *outfile = ((struct print_symbol_args *)args)->outfile; print_spaces (depth, outfile); if (SYMBOL_NAMESPACE (symbol) == LABEL_NAMESPACE) { - fprintf (outfile, "label %s at 0x%x\n", SYMBOL_SOURCE_NAME (symbol), - SYMBOL_VALUE_ADDRESS (symbol)); + fprintf_filtered (outfile, "label %s at ", SYMBOL_SOURCE_NAME (symbol)); + print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), outfile); + fprintf_filtered (outfile, "\n"); return 1; } if (SYMBOL_NAMESPACE (symbol) == STRUCT_NAMESPACE) { - if (TYPE_NAME (SYMBOL_TYPE (symbol))) + if (TYPE_TAG_NAME (SYMBOL_TYPE (symbol))) { LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth); } else { - fprintf (outfile, "%s %s = ", + fprintf_filtered (outfile, "%s %s = ", (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_ENUM ? "enum" : (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT @@ -471,12 +506,12 @@ print_symbol (args) SYMBOL_NAME (symbol)); LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth); } - fprintf (outfile, ";\n"); + fprintf_filtered (outfile, ";\n"); } else { if (SYMBOL_CLASS (symbol) == LOC_TYPEDEF) - fprintf (outfile, "typedef "); + fprintf_filtered (outfile, "typedef "); if (SYMBOL_TYPE (symbol)) { /* Print details of types, except for enums where it's clutter. */ @@ -484,70 +519,75 @@ print_symbol (args) outfile, TYPE_CODE (SYMBOL_TYPE (symbol)) != TYPE_CODE_ENUM, depth); - fprintf (outfile, "; "); + fprintf_filtered (outfile, "; "); } else - fprintf (outfile, "%s ", SYMBOL_SOURCE_NAME (symbol)); + fprintf_filtered (outfile, "%s ", SYMBOL_SOURCE_NAME (symbol)); switch (SYMBOL_CLASS (symbol)) { case LOC_CONST: - fprintf (outfile, "const %ld (0x%lx),", - SYMBOL_VALUE (symbol), SYMBOL_VALUE (symbol)); + fprintf_filtered (outfile, "const %ld (0x%lx),", + SYMBOL_VALUE (symbol), + SYMBOL_VALUE (symbol)); break; case LOC_CONST_BYTES: - fprintf (outfile, "const %u hex bytes:", + fprintf_filtered (outfile, "const %u hex bytes:", TYPE_LENGTH (SYMBOL_TYPE (symbol))); { unsigned i; for (i = 0; i < TYPE_LENGTH (SYMBOL_TYPE (symbol)); i++) - fprintf (outfile, " %2x", + fprintf_filtered (outfile, " %02x", (unsigned)SYMBOL_VALUE_BYTES (symbol) [i]); - fprintf (outfile, ","); + fprintf_filtered (outfile, ","); } break; case LOC_STATIC: - fprintf (outfile, "static at 0x%x,", SYMBOL_VALUE_ADDRESS (symbol)); + fprintf_filtered (outfile, "static at "); + print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), outfile); + fprintf_filtered (outfile, ","); break; case LOC_REGISTER: - fprintf (outfile, "register %ld,", SYMBOL_VALUE (symbol)); + fprintf_filtered (outfile, "register %ld,", SYMBOL_VALUE (symbol)); break; case LOC_ARG: - fprintf (outfile, "arg at 0x%lx,", SYMBOL_VALUE (symbol)); + fprintf_filtered (outfile, "arg at offset 0x%lx,", + SYMBOL_VALUE (symbol)); break; case LOC_LOCAL_ARG: - fprintf (outfile, "arg at offset 0x%lx from fp,", + fprintf_filtered (outfile, "arg at offset 0x%lx from fp,", SYMBOL_VALUE (symbol)); break; case LOC_REF_ARG: - fprintf (outfile, "reference arg at 0x%lx,", SYMBOL_VALUE (symbol)); + fprintf_filtered (outfile, "reference arg at 0x%lx,", SYMBOL_VALUE (symbol)); break; case LOC_REGPARM: - fprintf (outfile, "parameter register %ld,", SYMBOL_VALUE (symbol)); + fprintf_filtered (outfile, "parameter register %ld,", SYMBOL_VALUE (symbol)); break; case LOC_REGPARM_ADDR: - fprintf (outfile, "address parameter register %ld,", SYMBOL_VALUE (symbol)); + fprintf_filtered (outfile, "address parameter register %ld,", SYMBOL_VALUE (symbol)); break; case LOC_LOCAL: - fprintf (outfile, "local at 0x%lx,", SYMBOL_VALUE (symbol)); + fprintf_filtered (outfile, "local at offset 0x%lx,", + SYMBOL_VALUE (symbol)); break; case LOC_BASEREG: - fprintf (outfile, "local at 0x%lx from register %d", + fprintf_filtered (outfile, "local at 0x%lx from register %d", SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol)); break; case LOC_BASEREG_ARG: - fprintf (outfile, "arg at 0x%lx from register %d,", + fprintf_filtered (outfile, "arg at 0x%lx from register %d,", SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol)); break; @@ -555,25 +595,30 @@ print_symbol (args) break; case LOC_LABEL: - fprintf (outfile, "label at 0x%lx", SYMBOL_VALUE_ADDRESS (symbol)); + fprintf_filtered (outfile, "label at "); + print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), outfile); break; case LOC_BLOCK: - fprintf (outfile, "block (object 0x%x) starting at 0x%x,", - (unsigned int) SYMBOL_BLOCK_VALUE (symbol), - BLOCK_START (SYMBOL_BLOCK_VALUE (symbol))); + fprintf_filtered (outfile, "block (object "); + gdb_print_address (SYMBOL_BLOCK_VALUE (symbol), outfile); + fprintf_filtered (outfile, ") starting at "); + print_address_numeric (BLOCK_START (SYMBOL_BLOCK_VALUE (symbol)), + outfile); + fprintf_filtered (outfile, ","); break; case LOC_OPTIMIZED_OUT: - fprintf (outfile, "optimized out"); + fprintf_filtered (outfile, "optimized out"); break; default: - fprintf (outfile, "botched symbol class %x", SYMBOL_CLASS (symbol)); + fprintf_filtered (outfile, "botched symbol class %x", + SYMBOL_CLASS (symbol)); break; } } - fprintf (outfile, "\n"); + fprintf_filtered (outfile, "\n"); return 1; } @@ -583,7 +628,7 @@ maintenance_print_psymbols (args, from_tty) int from_tty; { char **argv; - FILE *outfile; + GDB_FILE *outfile; struct cleanup *cleanups; char *symname = NULL; char *filename = DEV_TTY; @@ -615,7 +660,7 @@ maintenance_print_psymbols (args, from_tty) filename = tilde_expand (filename); make_cleanup (free, filename); - outfile = fopen (filename, FOPEN_WT); + outfile = gdb_fopen (filename, FOPEN_WT); if (outfile == 0) perror_with_name (filename); make_cleanup (fclose, outfile); @@ -633,7 +678,7 @@ print_partial_symbol (p, count, what, outfile) struct partial_symbol *p; int count; char *what; - FILE *outfile; + GDB_FILE *outfile; { fprintf_filtered (outfile, " %s partial symbols:\n", what); @@ -715,7 +760,10 @@ print_partial_symbol (p, count, what, outfile) break; } fputs_filtered (", ", outfile); - fprintf_filtered (outfile, "0x%x\n", SYMBOL_VALUE (p)); + /* FIXME-32x64: Need to use SYMBOL_VALUE_ADDRESS, etc.; this + could be 32 bits when some of the other fields in the union + are 64. */ + fprintf_filtered (outfile, "0x%lx\n", SYMBOL_VALUE (p)); p++; } } @@ -726,7 +774,7 @@ maintenance_print_msymbols (args, from_tty) int from_tty; { char **argv; - FILE *outfile; + GDB_FILE *outfile; struct cleanup *cleanups; char *filename = DEV_TTY; char *symname = NULL; @@ -757,7 +805,7 @@ maintenance_print_msymbols (args, from_tty) filename = tilde_expand (filename); make_cleanup (free, filename); - outfile = fopen (filename, FOPEN_WT); + outfile = gdb_fopen (filename, FOPEN_WT); if (outfile == 0) perror_with_name (filename); make_cleanup (fclose, outfile); |