X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcp-valprint.c;h=fff41d80f087cbb39ff2b4caeccda928dd08ccbb;hb=585fdaa10662a5a89a0de0dcfa076378df05a67b;hp=f4edef80439dcf4bdc8e8d03b4644354002cb295;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index f4edef8043..fff41d80f0 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -1,25 +1,26 @@ /* Support for printing C++ values for GDB, the GNU debugger. - Copyright 1986, 1988, 1989, 1991, 1994, 1995, 1996 + + Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 3 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, see . */ #include "defs.h" -#include "obstack.h" +#include "gdb_obstack.h" #include "symtab.h" #include "gdbtypes.h" #include "expression.h" @@ -31,231 +32,211 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "gdb_string.h" #include "c-lang.h" #include "target.h" +#include "cp-abi.h" +#include "valprint.h" +#include "cp-support.h" +#include "language.h" +#include "python/python.h" + +/* Controls printing of vtbl's. */ +static void +show_vtblprint (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + fprintf_filtered (file, _("\ +Printing of C++ virtual function tables is %s.\n"), + value); +} + +/* Controls looking up an object's derived type using what we find in + its vtables. */ +static void +show_objectprint (struct ui_file *file, int from_tty, + struct cmd_list_element *c, + const char *value) +{ + fprintf_filtered (file, _("\ +Printing of object's derived type based on vtable info is %s.\n"), + value); +} + +static void +show_static_field_print (struct ui_file *file, int from_tty, + struct cmd_list_element *c, + const char *value) +{ + fprintf_filtered (file, + _("Printing of C++ static members is %s.\n"), + value); +} -int vtblprint; /* Controls printing of vtbl's */ -int objectprint; /* Controls looking up an object's derived type - using what we find in its vtables. */ -int static_field_print; /* Controls printing of static fields. */ static struct obstack dont_print_vb_obstack; static struct obstack dont_print_statmem_obstack; +static struct obstack dont_print_stat_array_obstack; -static void -cp_print_static_field PARAMS ((struct type *, value_ptr, GDB_FILE *, int, int, - enum val_prettyprint)); +extern void _initialize_cp_valprint (void); -static void -cp_print_value PARAMS ((struct type *, char *, CORE_ADDR, GDB_FILE *, - int, int, enum val_prettyprint, struct type **)); +static void cp_print_static_field (struct type *, struct value *, + struct ui_file *, int, + const struct value_print_options *); -void -cp_print_class_method (valaddr, type, stream) - char *valaddr; - struct type *type; - GDB_FILE *stream; -{ - struct type *domain; - struct fn_field *f = NULL; - int j = 0; - int len2; - int offset; - char *kind = ""; - CORE_ADDR addr; - struct symbol *sym; - unsigned len; - unsigned int i; - struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type)); +static void cp_print_value (struct type *, struct type *, + const gdb_byte *, int, + CORE_ADDR, struct ui_file *, + int, const struct value *, + const struct value_print_options *, + struct type **); - domain = TYPE_DOMAIN_TYPE (target_type); - if (domain == (struct type *)NULL) - { - fprintf_filtered (stream, ""); - return; - } - addr = unpack_pointer (lookup_pointer_type (builtin_type_void), valaddr); - if (METHOD_PTR_IS_VIRTUAL (addr)) - { - offset = METHOD_PTR_TO_VOFFSET (addr); - len = TYPE_NFN_FIELDS (domain); - for (i = 0; i < len; i++) - { - f = TYPE_FN_FIELDLIST1 (domain, i); - len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i); - - for (j = 0; j < len2; j++) - { - QUIT; - if (TYPE_FN_FIELD_VOFFSET (f, j) == offset) - { - if (TYPE_FN_FIELD_STUB (f, j)) - check_stub_method (domain, i, j); - kind = "virtual "; - goto common; - } - } - } - } - else - { - sym = find_pc_function (addr); - if (sym == 0) - { - error ("invalid pointer to member function"); - } - len = TYPE_NFN_FIELDS (domain); - for (i = 0; i < len; i++) - { - f = TYPE_FN_FIELDLIST1 (domain, i); - len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i); - - for (j = 0; j < len2; j++) - { - QUIT; - if (TYPE_FN_FIELD_STUB (f, j)) - check_stub_method (domain, i, j); - if (STREQ (SYMBOL_NAME (sym), TYPE_FN_FIELD_PHYSNAME (f, j))) - { - goto common; - } - } - } - } - common: - if (i < len) - { - char *demangled_name; - - fprintf_filtered (stream, "&"); - fprintf_filtered (stream, kind); - demangled_name = cplus_demangle (TYPE_FN_FIELD_PHYSNAME (f, j), - DMGL_ANSI | DMGL_PARAMS); - if (demangled_name == NULL) - fprintf_filtered (stream, "", - TYPE_FN_FIELD_PHYSNAME (f, j)); - else - { - fputs_filtered (demangled_name, stream); - free (demangled_name); - } - } - else - { - fprintf_filtered (stream, "("); - type_print (type, "", stream, -1); - fprintf_filtered (stream, ") %d", (int) addr >> 3); - } -} -/* This was what it was for gcc 2.4.5 and earlier. */ -static const char vtbl_ptr_name_old[] = - { CPLUS_MARKER,'v','t','b','l','_','p','t','r','_','t','y','p','e', 0 }; -/* It was changed to this after 2.4.5. */ -const char vtbl_ptr_name[] = - { '_','_','v','t','b','l','_','p','t','r','_','t','y','p','e', 0 }; +/* GCC versions after 2.4.5 use this. */ +const char vtbl_ptr_name[] = "__vtbl_ptr_type"; /* 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; +cp_is_vtbl_ptr_type (struct type *type) { char *typename = type_name_no_tag (type); - return (typename != NULL - && (STREQ (typename, vtbl_ptr_name) - || STREQ (typename, vtbl_ptr_name_old))); + return (typename != NULL && !strcmp (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; +cp_is_vtbl_member (struct type *type) { + /* With older versions of g++, the vtbl field pointed to an array of + structures. Nowadays it points directly to the structure. */ if (TYPE_CODE (type) == TYPE_CODE_PTR) { type = TYPE_TARGET_TYPE (type); if (TYPE_CODE (type) == TYPE_CODE_ARRAY) { type = TYPE_TARGET_TYPE (type); - if (TYPE_CODE (type) == TYPE_CODE_STRUCT /* if not using thunks */ - || TYPE_CODE (type) == TYPE_CODE_PTR) /* if using thunks */ + if (TYPE_CODE (type) == TYPE_CODE_STRUCT /* if not using thunks */ + || TYPE_CODE (type) == TYPE_CODE_PTR) /* if using thunks */ { /* Virtual functions tables are full of pointers - to virtual functions. */ + to virtual functions. */ return cp_is_vtbl_ptr_type (type); } } + else if (TYPE_CODE (type) == TYPE_CODE_STRUCT) /* if not using thunks */ + { + return cp_is_vtbl_ptr_type (type); + } + else if (TYPE_CODE (type) == TYPE_CODE_PTR) /* if using thunks */ + { + /* The type name of the thunk pointer is NULL when using + dwarf2. We could test for a pointer to a function, but + there is no type info for the virtual table either, so it + wont help. */ + return cp_is_vtbl_ptr_type (type); + } } return 0; } /* Mutually recursive subroutines of cp_print_value and c_val_print to - print out a structure's fields: cp_print_value_fields and cp_print_value. - - TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and PRETTY have the - same meanings as in cp_print_value and c_val_print. + print out a structure's fields: cp_print_value_fields and + cp_print_value. + + TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the same + meanings as in cp_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. */ + 2nd argument REAL_TYPE is used to carry over the type of the + derived class across the recursion to base classes. + + 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, address, stream, format, recurse, pretty, - dont_print_vb, dont_print_statmem) - struct type *type; - char *valaddr; - CORE_ADDR address; - GDB_FILE *stream; - int format; - int recurse; - enum val_prettyprint pretty; - struct type **dont_print_vb; - int dont_print_statmem; +cp_print_value_fields (struct type *type, struct type *real_type, + const gdb_byte *valaddr, int offset, + CORE_ADDR address, struct ui_file *stream, + int recurse, const struct value *val, + const struct value_print_options *options, + struct type **dont_print_vb, + int dont_print_statmem) { int i, len, n_baseclasses; - struct obstack tmp_obstack; - char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack); + int fields_seen = 0; + static int last_set_recurse = -1; CHECK_TYPEDEF (type); + + if (recurse == 0) + { + /* Any object can be left on obstacks only during an unexpected + error. */ + + if (obstack_object_size (&dont_print_statmem_obstack) > 0) + { + obstack_free (&dont_print_statmem_obstack, NULL); + obstack_begin (&dont_print_statmem_obstack, + 32 * sizeof (CORE_ADDR)); + } + if (obstack_object_size (&dont_print_stat_array_obstack) > 0) + { + obstack_free (&dont_print_stat_array_obstack, NULL); + obstack_begin (&dont_print_stat_array_obstack, + 32 * sizeof (struct type *)); + } + } fprintf_filtered (stream, "{"); len = TYPE_NFIELDS (type); n_baseclasses = TYPE_N_BASECLASSES (type); - /* Print out baseclasses such that we don't print + /* First, print out baseclasses such that we don't print duplicates of virtual baseclasses. */ + if (n_baseclasses > 0) - cp_print_value (type, valaddr, address, stream, - format, recurse+1, pretty, dont_print_vb); + cp_print_value (type, real_type, valaddr, + offset, address, stream, + recurse + 1, val, options, + dont_print_vb); + + /* Second, print out data fields */ - if (!len && n_baseclasses == 1) + /* If there are no data fields, skip this part */ + if (len == n_baseclasses || !len) fprintf_filtered (stream, ""); else { - extern int inspect_it; - int fields_seen = 0; - + int statmem_obstack_initial_size = 0; + int stat_array_obstack_initial_size = 0; + if (dont_print_statmem == 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_statmem_obstack; - obstack_finish (&dont_print_statmem_obstack); + statmem_obstack_initial_size = + obstack_object_size (&dont_print_statmem_obstack); + + if (last_set_recurse != recurse) + { + stat_array_obstack_initial_size = + obstack_object_size (&dont_print_stat_array_obstack); + + last_set_recurse = recurse; + } } for (i = n_baseclasses; i < len; i++) { /* If requested, skip printing of static fields. */ - if (!static_field_print && TYPE_FIELD_STATIC (type, i)) + if (!options->static_field_print + && field_is_static (&TYPE_FIELD (type, i))) continue; + if (fields_seen) fprintf_filtered (stream, ", "); else if (n_baseclasses > 0) { - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); @@ -266,29 +247,31 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty, } fields_seen = 1; - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); } - else + else { wrap_here (n_spaces (2 + 2 * recurse)); } - if (inspect_it) + if (options->inspect_it) { if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR) fputs_filtered ("\"( ptr \"", stream); else fputs_filtered ("\"( nodef \"", stream); - if (TYPE_FIELD_STATIC (type, i)) + if (field_is_static (&TYPE_FIELD (type, i))) fputs_filtered ("static ", stream); - fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), - language_cplus, + fprintf_symbol_filtered (stream, + TYPE_FIELD_NAME (type, i), + current_language->la_language, DMGL_PARAMS | DMGL_ANSI); fputs_filtered ("\" \"", stream); - fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), - language_cplus, + fprintf_symbol_filtered (stream, + TYPE_FIELD_NAME (type, i), + current_language->la_language, DMGL_PARAMS | DMGL_ANSI); fputs_filtered ("\") \"", stream); } @@ -296,57 +279,87 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty, { annotate_field_begin (TYPE_FIELD_TYPE (type, i)); - if (TYPE_FIELD_STATIC (type, i)) + if (field_is_static (&TYPE_FIELD (type, i))) fputs_filtered ("static ", stream); - fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), - language_cplus, + fprintf_symbol_filtered (stream, + TYPE_FIELD_NAME (type, i), + current_language->la_language, DMGL_PARAMS | DMGL_ANSI); annotate_field_name_end (); - fputs_filtered (" = ", stream); + /* Do not print leading '=' in case of anonymous + unions. */ + if (strcmp (TYPE_FIELD_NAME (type, i), "")) + fputs_filtered (" = ", stream); annotate_field_value (); } - if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i)) + if (!field_is_static (&TYPE_FIELD (type, i)) + && TYPE_FIELD_PACKED (type, i)) { - value_ptr v; + struct value *v; - /* Bitfields require special handling, especially due to byte - order problems. */ + /* Bitfields require special handling, especially due to + byte order problems. */ if (TYPE_FIELD_IGNORE (type, i)) { - fputs_filtered ("", stream); + fputs_filtered ("", stream); + } + else if (value_bits_synthetic_pointer (val, + TYPE_FIELD_BITPOS (type, + i), + TYPE_FIELD_BITSIZE (type, + i))) + { + fputs_filtered (_(""), stream); + } + else if (!value_bits_valid (val, + TYPE_FIELD_BITPOS (type, i), + TYPE_FIELD_BITSIZE (type, i))) + { + val_print_optimized_out (stream); } else { - v = value_from_longest (TYPE_FIELD_TYPE (type, i), - unpack_field_as_long (type, valaddr, i)); + struct value_print_options opts = *options; - val_print (TYPE_FIELD_TYPE(type, i), VALUE_CONTENTS (v), 0, - stream, format, 0, recurse + 1, pretty); + opts.deref_ref = 0; + v = value_from_longest + (TYPE_FIELD_TYPE (type, i), + unpack_field_as_long (type, valaddr + offset, i)); + + common_val_print (v, stream, recurse + 1, &opts, + current_language); } } else { if (TYPE_FIELD_IGNORE (type, i)) { - fputs_filtered ("", stream); + fputs_filtered ("", + stream); } - else if (TYPE_FIELD_STATIC (type, i)) + else if (field_is_static (&TYPE_FIELD (type, i))) { - value_ptr v = value_static_field (type, i); + struct value *v = value_static_field (type, i); + if (v == NULL) - fputs_filtered ("", stream); + val_print_optimized_out (stream); else - cp_print_static_field (TYPE_FIELD_TYPE (type, i), v, - stream, format, recurse + 1, - pretty); + cp_print_static_field (TYPE_FIELD_TYPE (type, i), + v, stream, recurse + 1, + options); } else { - val_print (TYPE_FIELD_TYPE (type, i), - valaddr + TYPE_FIELD_BITPOS (type, i) / 8, - address + TYPE_FIELD_BITPOS (type, i) / 8, - stream, format, 0, recurse + 1, pretty); + struct value_print_options opts = *options; + + opts.deref_ref = 0; + val_print (TYPE_FIELD_TYPE (type, i), + valaddr, + offset + TYPE_FIELD_BITPOS (type, i) / 8, + address, + stream, recurse + 1, val, &opts, + current_language); } } annotate_field_end (); @@ -354,47 +367,116 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty, if (dont_print_statmem == 0) { - /* Free the space used to deal with the printing - of the members from top level. */ - obstack_free (&dont_print_statmem_obstack, last_dont_print); - dont_print_statmem_obstack = tmp_obstack; + int obstack_final_size = + obstack_object_size (&dont_print_statmem_obstack); + + if (obstack_final_size > statmem_obstack_initial_size) + { + /* In effect, a pop of the printed-statics stack. */ + + void *free_to_ptr = + obstack_next_free (&dont_print_statmem_obstack) - + (obstack_final_size - statmem_obstack_initial_size); + + obstack_free (&dont_print_statmem_obstack, + free_to_ptr); + } + + if (last_set_recurse != recurse) + { + int obstack_final_size = + obstack_object_size (&dont_print_stat_array_obstack); + + if (obstack_final_size > stat_array_obstack_initial_size) + { + void *free_to_ptr = + obstack_next_free (&dont_print_stat_array_obstack) + - (obstack_final_size + - stat_array_obstack_initial_size); + + obstack_free (&dont_print_stat_array_obstack, + free_to_ptr); + } + last_set_recurse = -1; + } } - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 * recurse, stream); } - } + } /* if there are data fields */ + fprintf_filtered (stream, "}"); } -/* Special val_print routine to avoid printing multiple copies of virtual - baseclasses. */ +/* Like cp_print_value_fields, but find the runtime type of the object + and pass it as the `real_type' argument to cp_print_value_fields. + This function is a hack to work around the fact that + common_val_print passes the embedded offset to val_print, but not + the enclosing type. */ + +void +cp_print_value_fields_rtti (struct type *type, + const gdb_byte *valaddr, int offset, + CORE_ADDR address, + struct ui_file *stream, int recurse, + const struct value *val, + const struct value_print_options *options, + struct type **dont_print_vb, + int dont_print_statmem) +{ + struct type *real_type = NULL; + + /* We require all bits to be valid in order to attempt a + conversion. */ + if (value_bits_valid (val, TARGET_CHAR_BIT * offset, + TARGET_CHAR_BIT * TYPE_LENGTH (type))) + { + struct value *value; + int full, top, using_enc; + + /* Ugh, we have to convert back to a value here. */ + value = value_from_contents_and_address (type, valaddr + offset, + address + offset); + /* We don't actually care about most of the result here -- just + the type. We already have the correct offset, due to how + val_print was initially called. */ + real_type = value_rtti_type (value, &full, &top, &using_enc); + } + + if (!real_type) + real_type = type; + + cp_print_value_fields (type, real_type, valaddr, offset, + address, stream, recurse, val, options, + dont_print_vb, dont_print_statmem); +} + +/* Special val_print routine to avoid printing multiple copies of + virtual baseclasses. */ static void -cp_print_value (type, valaddr, address, stream, format, recurse, pretty, - dont_print_vb) - struct type *type; - char *valaddr; - CORE_ADDR address; - GDB_FILE *stream; - int format; - int recurse; - enum val_prettyprint pretty; - struct type **dont_print_vb; +cp_print_value (struct type *type, struct type *real_type, + const gdb_byte *valaddr, int offset, + CORE_ADDR address, struct ui_file *stream, + int recurse, const struct value *val, + const struct value_print_options *options, + struct type **dont_print_vb) { - struct obstack tmp_obstack; struct type **last_dont_print - = (struct type **)obstack_next_free (&dont_print_vb_obstack); + = (struct type **) obstack_next_free (&dont_print_vb_obstack); + struct obstack tmp_obstack = dont_print_vb_obstack; int i, n_baseclasses = TYPE_N_BASECLASSES (type); + int thisoffset; + struct type *thistype; if (dont_print_vb == 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_vb_obstack; + /* If we're at top level, carve out a completely fresh chunk of + the obstack and use that until this particular invocation + returns. */ /* Bump up the high-water mark. Now alpha is omega. */ obstack_finish (&dont_print_vb_obstack); } @@ -402,17 +484,19 @@ cp_print_value (type, valaddr, address, stream, format, recurse, pretty, for (i = 0; i < n_baseclasses; i++) { int boffset; + int skip; struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i)); char *basename = TYPE_NAME (baseclass); - char *base_valaddr; + const gdb_byte *base_valaddr; + const struct value *base_val; if (BASETYPE_VIA_VIRTUAL (type, i)) { struct type **first_dont_print - = (struct type **)obstack_base (&dont_print_vb_obstack); + = (struct type **) obstack_base (&dont_print_vb_obstack); - int j = (struct type **)obstack_next_free (&dont_print_vb_obstack) - - first_dont_print; + int j = (struct type **) + obstack_next_free (&dont_print_vb_obstack) - first_dont_print; while (--j >= 0) if (baseclass == first_dont_print[j]) @@ -421,40 +505,89 @@ cp_print_value (type, valaddr, address, stream, format, recurse, pretty, obstack_ptr_grow (&dont_print_vb_obstack, baseclass); } - boffset = baseclass_offset (type, i , valaddr, address); + thisoffset = offset; + thistype = real_type; + + boffset = baseclass_offset (type, i, valaddr + offset, + address + offset); + skip = ((boffset == -1) || (boffset + offset) < 0); - if (pretty) + if (BASETYPE_VIA_VIRTUAL (type, i)) + { + /* The virtual base class pointer might have been clobbered + by the user program. Make sure that it still points to a + valid memory location. */ + + if (boffset != -1 + && ((boffset + offset) < 0 + || (boffset + offset) >= TYPE_LENGTH (real_type))) + { + /* FIXME (alloca): unsafe if baseclass is really really + large. */ + gdb_byte *buf = alloca (TYPE_LENGTH (baseclass)); + + if (target_read_memory (address + boffset, buf, + TYPE_LENGTH (baseclass)) != 0) + skip = 1; + base_val = value_from_contents_and_address (baseclass, + buf, + address + boffset); + thisoffset = 0; + boffset = 0; + thistype = baseclass; + base_valaddr = value_contents_for_printing_const (base_val); + } + else + { + base_valaddr = valaddr; + base_val = val; + } + } + else + { + base_valaddr = valaddr; + base_val = val; + } + + /* Now do the printing. */ + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 * recurse, stream); } fputs_filtered ("<", stream); - /* Not sure what the best notation is in the case where there is no - baseclass name. */ + /* Not sure what the best notation is in the case where there is + no baseclass name. */ fputs_filtered (basename ? basename : "", stream); fputs_filtered ("> = ", stream); - /* The virtual base class pointer might have been clobbered by the - user program. Make sure that it still points to a valid memory - location. */ - if (boffset != -1 && (boffset < 0 || boffset >= TYPE_LENGTH (type))) - { - base_valaddr = (char *) alloca (TYPE_LENGTH (baseclass)); - if (target_read_memory (address + boffset, base_valaddr, - TYPE_LENGTH (baseclass)) != 0) - boffset = -1; - } - else - base_valaddr = valaddr + boffset; - - if (boffset == -1) + if (skip) fprintf_filtered (stream, ""); else - cp_print_value_fields (baseclass, base_valaddr, address + boffset, - stream, format, recurse, pretty, - (struct type **) obstack_base (&dont_print_vb_obstack), - 0); + { + int result = 0; + + /* Attempt to run the Python pretty-printers on the + baseclass if possible. */ + if (!options->raw) + result = apply_val_pretty_printer (baseclass, base_valaddr, + thisoffset + boffset, + value_address (base_val), + stream, recurse, base_val, + options, current_language); + + + + if (!result) + cp_print_value_fields (baseclass, thistype, base_valaddr, + thisoffset + boffset, + value_address (base_val), + stream, recurse, base_val, options, + ((struct type **) + obstack_base (&dont_print_vb_obstack)), + 0); + } fputs_filtered (", ", stream); flush_it: @@ -464,148 +597,231 @@ cp_print_value (type, valaddr, address, stream, format, recurse, pretty, if (dont_print_vb == 0) { /* Free the space used to deal with the printing - of this type from top level. */ + of this type from top level. */ obstack_free (&dont_print_vb_obstack, last_dont_print); /* Reset watermark so that we can continue protecting - ourselves from whatever we were protecting ourselves. */ + ourselves from whatever we were protecting ourselves. */ dont_print_vb_obstack = tmp_obstack; } } -/* Print value of a static member. - To avoid infinite recursion when printing a class that contains - a static instance of the class, we keep the addresses of all printed - static member classes in an obstack and refuse to print them more - than once. +/* Print value of a static member. To avoid infinite recursion when + printing a class that contains a static instance of the class, we + keep the addresses of all printed static member classes in an + obstack and refuse to print them more than once. - VAL contains the value to print, TYPE, STREAM, RECURSE, and PRETTY + VAL contains the value to print, TYPE, STREAM, RECURSE, and OPTIONS have the same meanings as in c_val_print. */ static void -cp_print_static_field (type, val, stream, format, recurse, pretty) - struct type *type; - value_ptr val; - GDB_FILE *stream; - int format; - int recurse; - enum val_prettyprint pretty; +cp_print_static_field (struct type *type, + struct value *val, + struct ui_file *stream, + int recurse, + const struct value_print_options *options) { + struct value_print_options opts; + if (TYPE_CODE (type) == TYPE_CODE_STRUCT) { CORE_ADDR *first_dont_print; + CORE_ADDR addr; int i; first_dont_print - = (CORE_ADDR *)obstack_base (&dont_print_statmem_obstack); - i = (CORE_ADDR *)obstack_next_free (&dont_print_statmem_obstack) - - first_dont_print; + = (CORE_ADDR *) obstack_base (&dont_print_statmem_obstack); + i = obstack_object_size (&dont_print_statmem_obstack) + / sizeof (CORE_ADDR); while (--i >= 0) { - if (VALUE_ADDRESS (val) == first_dont_print[i]) + if (value_address (val) == first_dont_print[i]) { - fputs_filtered ("", + fputs_filtered ("", stream); return; } } - obstack_grow (&dont_print_statmem_obstack, (char *) &VALUE_ADDRESS (val), + addr = value_address (val); + obstack_grow (&dont_print_statmem_obstack, (char *) &addr, sizeof (CORE_ADDR)); - CHECK_TYPEDEF (type); - cp_print_value_fields (type, VALUE_CONTENTS (val), VALUE_ADDRESS (val), - stream, format, recurse, pretty, NULL, 1); + cp_print_value_fields (type, value_enclosing_type (val), + value_contents_for_printing (val), + value_embedded_offset (val), addr, + stream, recurse, val, + options, NULL, 1); return; } - val_print (type, VALUE_CONTENTS (val), VALUE_ADDRESS (val), - stream, format, 0, recurse, pretty); + + if (TYPE_CODE (type) == TYPE_CODE_ARRAY) + { + struct type **first_dont_print; + int i; + struct type *target_type = TYPE_TARGET_TYPE (type); + + first_dont_print + = (struct type **) obstack_base (&dont_print_stat_array_obstack); + i = obstack_object_size (&dont_print_stat_array_obstack) + / sizeof (struct type *); + + while (--i >= 0) + { + if (target_type == first_dont_print[i]) + { + fputs_filtered ("", + stream); + return; + } + } + + obstack_grow (&dont_print_stat_array_obstack, + (char *) &target_type, + sizeof (struct type *)); + } + + opts = *options; + opts.deref_ref = 0; + val_print (type, value_contents_for_printing (val), + value_embedded_offset (val), + value_address (val), + stream, recurse, val, + &opts, current_language); } -void -cp_print_class_member (valaddr, domain, stream, prefix) - char *valaddr; - struct type *domain; - GDB_FILE *stream; - char *prefix; + +/* Find the field in *DOMAIN, or its non-virtual base classes, with + bit offset OFFSET. Set *DOMAIN to the containing type and *FIELDNO + to the containing field number. If OFFSET is not exactly at the + start of some field, set *DOMAIN to NULL. */ + +static void +cp_find_class_member (struct type **domain_p, int *fieldno, + LONGEST offset) { - - /* 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; + struct type *domain; + unsigned int i; + unsigned len; + + *domain_p = check_typedef (*domain_p); + domain = *domain_p; + len = TYPE_NFIELDS (domain); + for (i = TYPE_N_BASECLASSES (domain); i < len; i++) { - int bitpos = TYPE_FIELD_BITPOS (domain, i); + LONGEST bitpos = TYPE_FIELD_BITPOS (domain, i); + QUIT; - if (val == bitpos) - break; - if (val < bitpos && i != 0) + if (offset == bitpos) { - /* Somehow pointing into a field. */ - i -= 1; - extra = (val - TYPE_FIELD_BITPOS (domain, i)); - if (extra & 0x7) - bits = 1; - else - extra >>= 3; - break; + *fieldno = i; + return; } } - if (i < len) + + for (i = 0; i < TYPE_N_BASECLASSES (domain); i++) + { + LONGEST bitpos = TYPE_FIELD_BITPOS (domain, i); + LONGEST bitsize = 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (domain, i)); + + if (offset >= bitpos && offset < bitpos + bitsize) + { + *domain_p = TYPE_FIELD_TYPE (domain, i); + cp_find_class_member (domain_p, fieldno, offset - bitpos); + return; + } + } + + *domain_p = NULL; +} + +void +cp_print_class_member (const gdb_byte *valaddr, struct type *type, + struct ui_file *stream, char *prefix) +{ + enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type)); + + /* VAL is a byte offset into the structure type DOMAIN. + Find the name of the field for that offset and + print it. */ + struct type *domain = TYPE_DOMAIN_TYPE (type); + LONGEST val; + unsigned int fieldno; + + val = extract_signed_integer (valaddr, + TYPE_LENGTH (type), + byte_order); + + /* Pointers to data members are usually byte offsets into an object. + Because a data member can have offset zero, and a NULL pointer to + member must be distinct from any valid non-NULL pointer to + member, either the value is biased or the NULL value has a + special representation; both are permitted by ISO C++. HP aCC + used a bias of 0x20000000; HP cfront used a bias of 1; g++ 3.x + and other compilers which use the Itanium ABI use -1 as the NULL + value. GDB only supports that last form; to add support for + another form, make this into a cp-abi hook. */ + + if (val == -1) + { + fprintf_filtered (stream, "NULL"); + return; + } + + cp_find_class_member (&domain, &fieldno, val << 3); + + if (domain != NULL) { char *name; - fprintf_filtered (stream, prefix); + + fputs_filtered (prefix, stream); name = type_name_no_tag (domain); if (name) - fputs_filtered (name, stream); + 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)"); + fputs_filtered (TYPE_FIELD_NAME (domain, fieldno), stream); } else - fprintf_filtered (stream, "%d", val >> 3); + fprintf_filtered (stream, "%ld", (long) val); } + void -_initialize_cp_valprint () +_initialize_cp_valprint (void) { - add_show_from_set - (add_set_cmd ("static-members", class_support, var_boolean, - (char *)&static_field_print, - "Set printing of C++ static members.", - &setprintlist), - &showprintlist); - /* Turn on printing of static fields. */ - static_field_print = 1; - - 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_vb_obstack, 32 * sizeof (struct type *)); - obstack_specify_allocation (&dont_print_statmem_obstack, - 32 * sizeof (CORE_ADDR), sizeof (CORE_ADDR), - xmalloc, free); + add_setshow_boolean_cmd ("static-members", class_support, + &user_print_options.static_field_print, _("\ +Set printing of C++ static members."), _("\ +Show printing of C++ static members."), NULL, + NULL, + show_static_field_print, + &setprintlist, &showprintlist); + + add_setshow_boolean_cmd ("vtbl", class_support, + &user_print_options.vtblprint, _("\ +Set printing of C++ virtual function tables."), _("\ +Show printing of C++ virtual function tables."), NULL, + NULL, + show_vtblprint, + &setprintlist, &showprintlist); + + add_setshow_boolean_cmd ("object", class_support, + &user_print_options.objectprint, _("\ +Set printing of object's derived type based on vtable info."), _("\ +Show printing of object's derived type based on vtable info."), NULL, + NULL, + show_objectprint, + &setprintlist, &showprintlist); + + obstack_begin (&dont_print_stat_array_obstack, + 32 * sizeof (struct type *)); + obstack_begin (&dont_print_statmem_obstack, + 32 * sizeof (CORE_ADDR)); + obstack_begin (&dont_print_vb_obstack, + 32 * sizeof (struct type *)); }