2e4964adfc
* defs.h (demangle_and_match): Remove prototype. * dwarfread.c (STREQ, STREQN): Remove macros, replaced with STREQ and STREQN defined in defs.h. * dwarfread.c (set_cu_language): For completely unknown languages, try to deduce the language from the filename. Retain behavior that for known languages we don't know how to handle, we use language_unknown. * dwarfread.c (enum_type, symthesize_typedef): Initialize language and demangled name fields in symbol. * dwarfread.c, mipsread.c, partial-stab.h: For all usages of ADD_PSYMBOL_TO_LIST, add language and objfile parameters. * dwarfread.c (new_symbol): Attempt to demangle C++ symbol names and cache the results in SYMBOL_DEMANGLED_NAME for the symbol. * elfread.c (STREQ): Remove macro, use STREQ defined in defs.h. Replace usages throughout. * elfread.c (demangle.h): Include. * elfread.c (record_minimal_symbol): Remove prototype and function. * gdbtypes.h, symtab.h (B_SET, B_CLR, B_TST, B_TYPE, B_BYTES, B_CLRALL): Moved from symtab.h to gdbtypes.h. * infcmd.c (jump_command): Remove code to demangle name and add it to a cleanup list. Now just use SYMBOL_DEMANGLED_NAME. * minsyms.c (demangle.h): Include. * minsyms.c (lookup_minimal_symbol): Indent comment to match code. * minsyms.c (install_minimal_symbols): Attempt to demangle symbol names as C++ names, and cache them in SYMBOL_DEMANGLED_NAME. * mipsread.c (psymtab_language): Add static variable. * stabsread.c (demangle.h): Include. * stabsread.c (define_symbol): Attempt to demangle C++ symbol names and cache them in the SYMBOL_DEMANGLED_NAME field. * stack.c (return_command): Remove explicit demangling of name and use of cleanups. Just use SYMBOL_DEMANGLED_NAME. * symfile.c (demangle.h): Include. * symfile.c (add_psymbol_to_list, add_psymbol_addr_to_list): Fix to match macros in symfile.h and allow them to be compiled if INLINE_ADD_PSYMBOL is not true. * symfile.h (INLINE_ADD_PSYMBOL): Default to true if not set. * symfile.h (ADD_PSYMBOL_*): Add language and objfile parameters. Add code to demangle and cache C++ symbol names. Use macro form if INLINE_ADD_PSYMBOL is true, otherwise use C function form. * symmisc.c (add_psymbol_to_list, add_psymbol_addr_to_list): Remove, also defined in symfile.c, which we already fixed. * symtab.c (expensive_mangler): Remove prototype and function. * symtab.c (find_methods): Remove physnames parameter and fix prototype to match. * symtab.c (completion_list_add_symbol): Name changed to completion_list_add_name. * symtab.c (COMPLETION_LIST_ADD_SYMBOL): New macro, adds both the normal symbol name and the cached C++ demangled name. * symtab.c (lookup_demangled_partial_symbol, lookup_demangled_block_symbol): Remove prototypes and functions. * symtab.c (lookup_symbol): Remove use of expensive_mangler, use lookup_block_symbol instead of lookup_demangled_block_symbol. Remove code to try demangling names and matching them. * symtab.c (lookup_partial_symbol, lookup_block_symbol): Fix to try matching the cached demangled name if no match is found using the regular symbol name. * symtab.c (find_methods): Remove unused physnames array. * symtab.c (name_match, NAME_MATCH): Remove function and macro, replaced with SYMBOL_MATCHES_REGEXP from symtab.h. * symtab.c (completion_list_add_symbol): Rewrite to use cached C++ demangled symbol names. * symtab.h: Much reformatting of structures and such to add whitespace to make them more readable, and make them more consistent with other gdb structure definitions. * symtab.h (general_symbol_info): New struct containing fields common to all symbols. * symtab.h (SYMBOL_LANGUAGE, SYMBOL_DEMANGLED_NAME, SYMBOL_SOURCE_NAME, SYMBOL_LINKAGE_NAME, SYMBOL_MATCHES_NAME, SYMBOL_MATCHES_REGEXP, MSYMBOL_INFO, MSYMBOL_TYPE): New macros. * symtab. (struct minimal_symbol, struct partial_symbol, struct symbol): Use general_symbol_info struct. * utils.c (demangle_and_match): Remove, no longer used. * valops.c (demangle.h): Include. * xcoffexec.c (eq): Remove macro, replace usages with STREQ. * blockframe.c, breakpoint.c, c-exp.y, c-valprint.c, dbxread.c, infcmd.c, m2-exp.y, minsyms.c, objfiles.h, solib.c, stack.c, symmisc.c, symtab.c, valops.c: Replace references to minimal symbol fields with appropriate macros. * breakpoint.c, buildsym.c, c-exp.y, c-typeprint.c, c-valprint.c, coffread.c, command.c, convex-tdep.c, cp-valprint.c, dbxread.c, demangle.c, elfread.c, energize.c, environ.c, exec.c, gdbtypes.c, i960-tdep.c, infrun.c, infrun-hacked.c, language.c, main.c, minsyms.c, mipsread.c, partial-stab.h, remote-es1800.c, remote-nindy.c, remote-udi.c, rs6000-tdep.c, solib.c, source.c, sparc-pinsn.c, stabsread.c, standalone.c, state.c, stuff.c, symfile.c, symmisc.c, symtab.c, symtab.h, tm-sysv4.h, tm-ultra3.h, values.c, xcoffexec.c, xcoffread.c: Replace strcmp and strncmp usages with STREQ, STREQN, or STRCMP as appropriate. * breakpoint.c, buildsym.c, c-typeprint.c, expprint.c, findvar.c, mipsread.c, printcmd.c, source.c, stabsread.c, stack.c, symmisc.c, tm-29k.h, valops.c, values.c: Replace SYMBOL_NAME references with SYMBOL_SOURCE_NAME or SYMBOL_LINKAGE_NAME as appropriate. * buildsym.c (start_subfile, patch_subfile_names): Default the source language to what can be deduced from the filename. * buildsym.c (end_symtab): Update the source language in the allocated symtab to match what we have been using. * buildsym.h (struct subfile): Add a language field. * c-typeprint.c (c_print_type): Remove code to do explicit demangling. * dbxread.c (psymtab_language): Add static variable. * dbxread.c (start_psymtab): Initialize psymtab_language using deduce_language_from_filename.
369 lines
10 KiB
C
369 lines
10 KiB
C
/* Support for printing C++ values for GDB, the GNU debugger.
|
|
Copyright 1986, 1988, 1989, 1991 Free Software Foundation, Inc.
|
|
|
|
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 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., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
#include "defs.h"
|
|
#include "obstack.h"
|
|
#include "symtab.h"
|
|
#include "gdbtypes.h"
|
|
#include "expression.h"
|
|
#include "value.h"
|
|
#include "command.h"
|
|
#include "gdbcmd.h"
|
|
|
|
int vtblprint; /* Controls printing of vtbl's */
|
|
int objectprint; /* Controls looking up an object's derived type
|
|
using what we find in its vtables. */
|
|
struct obstack dont_print_obstack;
|
|
|
|
static void
|
|
cplus_print_value PARAMS ((struct type *, char *, FILE *, int, int,
|
|
enum val_prettyprint, struct type **));
|
|
|
|
/* BEGIN-FIXME: Hooks into typeprint.c, find a better home for prototypes. */
|
|
|
|
extern void
|
|
c_type_print_base PARAMS ((struct type *, FILE *, int, int));
|
|
|
|
extern void
|
|
c_type_print_varspec_prefix PARAMS ((struct type *, FILE *, int, int));
|
|
|
|
extern void
|
|
cp_type_print_method_args PARAMS ((struct type **, char *, char *, int,
|
|
FILE *));
|
|
|
|
extern struct obstack dont_print_obstack;
|
|
|
|
/* END-FIXME */
|
|
|
|
|
|
/* BEGIN-FIXME: Hooks into c-valprint.c */
|
|
|
|
extern int
|
|
c_val_print PARAMS ((struct type *, char *, CORE_ADDR, FILE *, int, int, int,
|
|
enum val_prettyprint));
|
|
/* END-FIXME */
|
|
|
|
|
|
/* Return truth value for assertion that TYPE is of the type
|
|
"pointer to virtual function". */
|
|
|
|
int
|
|
cp_is_vtbl_ptr_type(type)
|
|
struct type *type;
|
|
{
|
|
char *typename = type_name_no_tag (type);
|
|
static const char vtbl_ptr_name[] =
|
|
{ CPLUS_MARKER,'v','t','b','l','_','p','t','r','_','t','y','p','e', 0 };
|
|
|
|
return (typename != NULL && STREQ(typename, vtbl_ptr_name));
|
|
}
|
|
|
|
/* Return truth value for the assertion that TYPE is of the type
|
|
"pointer to virtual function table". */
|
|
|
|
int
|
|
cp_is_vtbl_member(type)
|
|
struct type *type;
|
|
{
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
|
type = TYPE_TARGET_TYPE (type);
|
|
else
|
|
return 0;
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_ARRAY
|
|
&& TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_STRUCT)
|
|
/* Virtual functions tables are full of pointers to virtual functions. */
|
|
return cp_is_vtbl_ptr_type (TYPE_TARGET_TYPE (type));
|
|
return 0;
|
|
}
|
|
|
|
/* Mutually recursive subroutines of cplus_print_value and c_val_print to
|
|
print out a structure's fields: cp_print_value_fields and cplus_print_value.
|
|
|
|
TYPE, VALADDR, STREAM, RECURSE, and PRETTY have the
|
|
same meanings as in cplus_print_value and c_val_print.
|
|
|
|
DONT_PRINT is an array of baseclass types that we
|
|
should not print, or zero if called from top level. */
|
|
|
|
void
|
|
cp_print_value_fields (type, valaddr, stream, format, recurse, pretty,
|
|
dont_print)
|
|
struct type *type;
|
|
char *valaddr;
|
|
FILE *stream;
|
|
int format;
|
|
int recurse;
|
|
enum val_prettyprint pretty;
|
|
struct type **dont_print;
|
|
{
|
|
int i, len, n_baseclasses;
|
|
|
|
check_stub_type (type);
|
|
|
|
fprintf_filtered (stream, "{");
|
|
len = TYPE_NFIELDS (type);
|
|
n_baseclasses = TYPE_N_BASECLASSES (type);
|
|
|
|
/* Print out baseclasses such that we don't print
|
|
duplicates of virtual baseclasses. */
|
|
if (n_baseclasses > 0)
|
|
cplus_print_value (type, valaddr, stream, format, recurse+1, pretty,
|
|
dont_print);
|
|
|
|
if (!len && n_baseclasses == 1)
|
|
fprintf_filtered (stream, "<No data fields>");
|
|
else
|
|
{
|
|
extern int inspect_it;
|
|
int fields_seen = 0;
|
|
|
|
for (i = n_baseclasses; i < len; i++)
|
|
{
|
|
/* Check if static field */
|
|
if (TYPE_FIELD_STATIC (type, i))
|
|
continue;
|
|
if (fields_seen)
|
|
fprintf_filtered (stream, ", ");
|
|
else if (n_baseclasses > 0)
|
|
{
|
|
if (pretty)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
fputs_filtered ("members of ", stream);
|
|
fputs_filtered (type_name_no_tag (type), stream);
|
|
fputs_filtered (": ", stream);
|
|
}
|
|
}
|
|
fields_seen = 1;
|
|
|
|
if (pretty)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
}
|
|
else
|
|
{
|
|
wrap_here (n_spaces (2 + 2 * recurse));
|
|
}
|
|
if (inspect_it)
|
|
{
|
|
if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
|
|
fputs_filtered ("\"( ptr \"", stream);
|
|
else
|
|
fputs_filtered ("\"( nodef \"", stream);
|
|
fprint_symbol (stream, TYPE_FIELD_NAME (type, i));
|
|
fputs_filtered ("\" \"", stream);
|
|
fprint_symbol (stream, TYPE_FIELD_NAME (type, i));
|
|
fputs_filtered ("\") \"", stream);
|
|
}
|
|
else
|
|
{
|
|
fprint_symbol (stream, TYPE_FIELD_NAME (type, i));
|
|
fputs_filtered (" = ", stream);
|
|
}
|
|
if (TYPE_FIELD_PACKED (type, i))
|
|
{
|
|
value v;
|
|
|
|
/* Bitfields require special handling, especially due to byte
|
|
order problems. */
|
|
v = value_from_longest (TYPE_FIELD_TYPE (type, i),
|
|
unpack_field_as_long (type, valaddr, i));
|
|
|
|
c_val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0,
|
|
stream, format, 0, recurse + 1, pretty);
|
|
}
|
|
else
|
|
{
|
|
c_val_print (TYPE_FIELD_TYPE (type, i),
|
|
valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
|
|
0, stream, format, 0, recurse + 1, pretty);
|
|
}
|
|
}
|
|
if (pretty)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 * recurse, stream);
|
|
}
|
|
}
|
|
fprintf_filtered (stream, "}");
|
|
}
|
|
|
|
/* Special val_print routine to avoid printing multiple copies of virtual
|
|
baseclasses. */
|
|
|
|
static void
|
|
cplus_print_value (type, valaddr, stream, format, recurse, pretty, dont_print)
|
|
struct type *type;
|
|
char *valaddr;
|
|
FILE *stream;
|
|
int format;
|
|
int recurse;
|
|
enum val_prettyprint pretty;
|
|
struct type **dont_print;
|
|
{
|
|
struct obstack tmp_obstack;
|
|
struct type **last_dont_print
|
|
= (struct type **)obstack_next_free (&dont_print_obstack);
|
|
int i, n_baseclasses = TYPE_N_BASECLASSES (type);
|
|
|
|
if (dont_print == 0)
|
|
{
|
|
/* If we're at top level, carve out a completely fresh
|
|
chunk of the obstack and use that until this particular
|
|
invocation returns. */
|
|
tmp_obstack = dont_print_obstack;
|
|
/* Bump up the high-water mark. Now alpha is omega. */
|
|
obstack_finish (&dont_print_obstack);
|
|
}
|
|
|
|
for (i = 0; i < n_baseclasses; i++)
|
|
{
|
|
char *baddr;
|
|
int err;
|
|
|
|
if (BASETYPE_VIA_VIRTUAL (type, i))
|
|
{
|
|
struct type **first_dont_print
|
|
= (struct type **)obstack_base (&dont_print_obstack);
|
|
|
|
int j = (struct type **)obstack_next_free (&dont_print_obstack)
|
|
- first_dont_print;
|
|
|
|
while (--j >= 0)
|
|
if (TYPE_BASECLASS (type, i) == first_dont_print[j])
|
|
goto flush_it;
|
|
|
|
obstack_ptr_grow (&dont_print_obstack, TYPE_BASECLASS (type, i));
|
|
}
|
|
|
|
/* Fix to use baseclass_offset instead. FIXME */
|
|
baddr = baseclass_addr (type, i, valaddr, 0, &err);
|
|
if (err == 0 && baddr == 0)
|
|
error ("could not find virtual baseclass `%s'\n",
|
|
type_name_no_tag (TYPE_BASECLASS (type, i)));
|
|
|
|
if (pretty)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 * recurse, stream);
|
|
}
|
|
fputs_filtered ("<", stream);
|
|
fputs_filtered (type_name_no_tag (TYPE_BASECLASS (type, i)), stream);
|
|
fputs_filtered ("> = ", stream);
|
|
if (err != 0)
|
|
fprintf_filtered (stream, "<invalid address 0x%x>", baddr);
|
|
else
|
|
cp_print_value_fields (TYPE_BASECLASS (type, i), baddr, stream, format,
|
|
recurse, pretty,
|
|
(struct type **) obstack_base (&dont_print_obstack));
|
|
fputs_filtered (", ", stream);
|
|
|
|
flush_it:
|
|
;
|
|
}
|
|
|
|
if (dont_print == 0)
|
|
{
|
|
/* Free the space used to deal with the printing
|
|
of this type from top level. */
|
|
obstack_free (&dont_print_obstack, last_dont_print);
|
|
/* Reset watermark so that we can continue protecting
|
|
ourselves from whatever we were protecting ourselves. */
|
|
dont_print_obstack = tmp_obstack;
|
|
}
|
|
}
|
|
|
|
void
|
|
cp_print_class_member (valaddr, domain, stream, prefix)
|
|
char *valaddr;
|
|
struct type *domain;
|
|
FILE *stream;
|
|
char *prefix;
|
|
{
|
|
|
|
/* VAL is a byte offset into the structure type DOMAIN.
|
|
Find the name of the field for that offset and
|
|
print it. */
|
|
int extra = 0;
|
|
int bits = 0;
|
|
register unsigned int i;
|
|
unsigned len = TYPE_NFIELDS (domain);
|
|
/* @@ Make VAL into bit offset */
|
|
LONGEST val = unpack_long (builtin_type_int, valaddr) << 3;
|
|
for (i = TYPE_N_BASECLASSES (domain); i < len; i++)
|
|
{
|
|
int bitpos = TYPE_FIELD_BITPOS (domain, i);
|
|
QUIT;
|
|
if (val == bitpos)
|
|
break;
|
|
if (val < bitpos && i != 0)
|
|
{
|
|
/* Somehow pointing into a field. */
|
|
i -= 1;
|
|
extra = (val - TYPE_FIELD_BITPOS (domain, i));
|
|
if (extra & 0x7)
|
|
bits = 1;
|
|
else
|
|
extra >>= 3;
|
|
break;
|
|
}
|
|
}
|
|
if (i < len)
|
|
{
|
|
char *name;
|
|
fprintf_filtered (stream, prefix);
|
|
name = type_name_no_tag (domain);
|
|
if (name)
|
|
fputs_filtered (name, stream);
|
|
else
|
|
c_type_print_base (domain, stream, 0, 0);
|
|
fprintf_filtered (stream, "::");
|
|
fputs_filtered (TYPE_FIELD_NAME (domain, i), stream);
|
|
if (extra)
|
|
fprintf_filtered (stream, " + %d bytes", extra);
|
|
if (bits)
|
|
fprintf_filtered (stream, " (offset in bits)");
|
|
}
|
|
else
|
|
fprintf_filtered (stream, "%d", val >> 3);
|
|
}
|
|
|
|
void
|
|
_initialize_cp_valprint ()
|
|
{
|
|
add_show_from_set
|
|
(add_set_cmd ("vtbl", class_support, var_boolean, (char *)&vtblprint,
|
|
"Set printing of C++ virtual function tables.",
|
|
&setprintlist),
|
|
&showprintlist);
|
|
|
|
add_show_from_set
|
|
(add_set_cmd ("object", class_support, var_boolean, (char *)&objectprint,
|
|
"Set printing of object's derived type based on vtable info.",
|
|
&setprintlist),
|
|
&showprintlist);
|
|
|
|
/* Give people the defaults which they are used to. */
|
|
objectprint = 0;
|
|
vtblprint = 0;
|
|
obstack_begin (&dont_print_obstack, 32 * sizeof (struct type *));
|
|
}
|