X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fcp-valprint.c;h=effce30cf85d96c1eae0dc2b33dcb9231eedaad6;hb=c5ac15402a894e87a118526a066880f596b3c78d;hp=2e3beeaf324cc939896a0be69b6099d90c1e559c;hpb=edf0c1b7caed4e2bfb9a84fd9c226c6720da1d97;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 2e3beeaf32..effce30cf8 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -1,7 +1,6 @@ /* Support for printing C++ values for GDB, the GNU debugger. - Copyright (C) 1986, 1988-1989, 1991-1997, 2000-2003, 2005-2012 Free - Software Foundation, Inc. + Copyright (C) 1986-2016 Free Software Foundation, Inc. This file is part of GDB. @@ -28,15 +27,14 @@ #include "gdbcmd.h" #include "demangle.h" #include "annotate.h" -#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" -#include "exceptions.h" +#include "extension.h" +#include "typeprint.h" /* Controls printing of vtbl's. */ static void @@ -90,7 +88,7 @@ static void cp_print_value (struct type *, struct type *, /* GCC versions after 2.4.5 use this. */ -const char vtbl_ptr_name[] = "__vtbl_ptr_type"; +EXPORTED_CONST char vtbl_ptr_name[] = "__vtbl_ptr_type"; /* Return truth value for assertion that TYPE is of the type "pointer to virtual function". */ @@ -98,9 +96,9 @@ const char vtbl_ptr_name[] = "__vtbl_ptr_type"; int cp_is_vtbl_ptr_type (struct type *type) { - const char *typename = type_name_no_tag (type); + const char *type_name = type_name_no_tag (type); - return (typename != NULL && !strcmp (typename, vtbl_ptr_name)); + return (type_name != NULL && !strcmp (type_name, vtbl_ptr_name)); } /* Return truth value for the assertion that TYPE is of the type @@ -167,7 +165,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, int fields_seen = 0; static int last_set_recurse = -1; - CHECK_TYPEDEF (type); + type = check_typedef (type); if (recurse == 0) { @@ -208,9 +206,11 @@ cp_print_value_fields (struct type *type, struct type *real_type, fprintf_filtered (stream, ""); else { - int statmem_obstack_initial_size = 0; - int stat_array_obstack_initial_size = 0; - + size_t statmem_obstack_initial_size = 0; + size_t stat_array_obstack_initial_size = 0; + struct type *vptr_basetype = NULL; + int vptr_fieldno; + if (dont_print_statmem == 0) { statmem_obstack_initial_size = @@ -225,6 +225,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, } } + vptr_fieldno = get_vptr_fieldno (type, &vptr_basetype); for (i = n_baseclasses; i < len; i++) { /* If requested, skip printing of static fields. */ @@ -236,7 +237,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, fprintf_filtered (stream, ", "); else if (n_baseclasses > 0) { - if (options->pretty) + if (options->prettyformat) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); @@ -247,7 +248,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, } fields_seen = 1; - if (options->pretty) + if (options->prettyformat) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); @@ -256,42 +257,21 @@ cp_print_value_fields (struct type *type, struct type *real_type, { wrap_here (n_spaces (2 + 2 * recurse)); } - 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 (field_is_static (&TYPE_FIELD (type, i))) - fputs_filtered ("static ", stream); - 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), - current_language->la_language, - DMGL_PARAMS | DMGL_ANSI); - fputs_filtered ("\") \"", stream); - } - else - { - annotate_field_begin (TYPE_FIELD_TYPE (type, i)); - - if (field_is_static (&TYPE_FIELD (type, i))) - fputs_filtered ("static ", stream); - fprintf_symbol_filtered (stream, - TYPE_FIELD_NAME (type, i), - current_language->la_language, - DMGL_PARAMS | DMGL_ANSI); - annotate_field_name_end (); - /* Do not print leading '=' in case of anonymous - unions. */ - if (strcmp (TYPE_FIELD_NAME (type, i), "")) - fputs_filtered (" = ", stream); - annotate_field_value (); - } + + annotate_field_begin (TYPE_FIELD_TYPE (type, i)); + + if (field_is_static (&TYPE_FIELD (type, i))) + fputs_filtered ("static ", stream); + fprintf_symbol_filtered (stream, + TYPE_FIELD_NAME (type, i), + current_language->la_language, + DMGL_PARAMS | DMGL_ANSI); + annotate_field_name_end (); + /* Do not print leading '=' in case of anonymous + unions. */ + if (strcmp (TYPE_FIELD_NAME (type, i), "")) + fputs_filtered (" = ", stream); + annotate_field_value (); if (!field_is_static (&TYPE_FIELD (type, i)) && TYPE_FIELD_PACKED (type, i)) @@ -312,12 +292,6 @@ cp_print_value_fields (struct type *type, struct type *real_type, { 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 { struct value_print_options opts = *options; @@ -339,26 +313,26 @@ cp_print_value_fields (struct type *type, struct type *real_type, } else if (field_is_static (&TYPE_FIELD (type, i))) { - volatile struct gdb_exception ex; struct value *v = NULL; - TRY_CATCH (ex, RETURN_MASK_ERROR) + TRY { v = value_static_field (type, i); } - if (ex.reason < 0) - fprintf_filtered (stream, - _(""), - ex.message); - else if (v == NULL) - val_print_optimized_out (stream); - else - cp_print_static_field (TYPE_FIELD_TYPE (type, i), - v, stream, recurse + 1, - options); + CATCH (ex, RETURN_MASK_ERROR) + { + fprintf_filtered (stream, + _(""), + ex.message); + } + END_CATCH + + cp_print_static_field (TYPE_FIELD_TYPE (type, i), + v, stream, recurse + 1, + options); } - else if (i == TYPE_VPTR_FIELDNO (type)) + else if (i == vptr_fieldno && type == vptr_basetype) { int i_offset = offset + TYPE_FIELD_BITPOS (type, i) / 8; struct type *i_type = TYPE_FIELD_TYPE (type, i); @@ -391,7 +365,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, if (dont_print_statmem == 0) { - int obstack_final_size = + size_t obstack_final_size = obstack_object_size (&dont_print_statmem_obstack); if (obstack_final_size > statmem_obstack_initial_size) @@ -399,7 +373,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, /* In effect, a pop of the printed-statics stack. */ void *free_to_ptr = - obstack_next_free (&dont_print_statmem_obstack) - + (char *) obstack_next_free (&dont_print_statmem_obstack) - (obstack_final_size - statmem_obstack_initial_size); obstack_free (&dont_print_statmem_obstack, @@ -408,13 +382,13 @@ cp_print_value_fields (struct type *type, struct type *real_type, if (last_set_recurse != recurse) { - int obstack_final_size = + size_t 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) + (char *) obstack_next_free (&dont_print_stat_array_obstack) - (obstack_final_size - stat_array_obstack_initial_size); @@ -425,7 +399,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, } } - if (options->pretty) + if (options->prettyformat) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 * recurse, stream); @@ -455,8 +429,9 @@ cp_print_value_fields_rtti (struct type *type, /* 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))) + if (!value_bits_any_optimized_out (val, + TARGET_CHAR_BIT * offset, + TARGET_CHAR_BIT * TYPE_LENGTH (type))) { struct value *value; int full, top, using_enc; @@ -464,6 +439,7 @@ cp_print_value_fields_rtti (struct type *type, /* Ugh, we have to convert back to a value here. */ value = value_from_contents_and_address (type, valaddr + offset, address + offset); + type = value_type (value); /* 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. */ @@ -508,12 +484,11 @@ cp_print_value (struct type *type, struct type *real_type, for (i = 0; i < n_baseclasses; i++) { int boffset = 0; - int skip; + int skip = 0; struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i)); const char *basename = TYPE_NAME (baseclass); const gdb_byte *base_valaddr = NULL; const struct value *base_val = NULL; - volatile struct gdb_exception ex; if (BASETYPE_VIA_VIRTUAL (type, i)) { @@ -533,18 +508,21 @@ cp_print_value (struct type *type, struct type *real_type, thisoffset = offset; thistype = real_type; - TRY_CATCH (ex, RETURN_MASK_ERROR) + TRY { boffset = baseclass_offset (type, i, valaddr, offset, address, val); } - if (ex.reason < 0 && ex.error == NOT_AVAILABLE_ERROR) - skip = -1; - else if (ex.reason < 0) - skip = 1; - else - { - skip = 0; + CATCH (ex, RETURN_MASK_ERROR) + { + if (ex.error == NOT_AVAILABLE_ERROR) + skip = -1; + else + skip = 1; + } + END_CATCH + if (skip == 0) + { if (BASETYPE_VIA_VIRTUAL (type, i)) { /* The virtual base class pointer might have been @@ -554,9 +532,11 @@ cp_print_value (struct type *type, struct type *real_type, if ((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)); + gdb_byte *buf; + struct cleanup *back_to; + + buf = (gdb_byte *) xmalloc (TYPE_LENGTH (baseclass)); + back_to = make_cleanup (xfree, buf); if (target_read_memory (address + boffset, buf, TYPE_LENGTH (baseclass)) != 0) @@ -564,10 +544,12 @@ cp_print_value (struct type *type, struct type *real_type, base_val = value_from_contents_and_address (baseclass, buf, address + boffset); + baseclass = value_type (base_val); thisoffset = 0; boffset = 0; thistype = baseclass; base_valaddr = value_contents_for_printing_const (base_val); + do_cleanups (back_to); } else { @@ -583,7 +565,7 @@ cp_print_value (struct type *type, struct type *real_type, } /* Now do the printing. */ - if (options->pretty) + if (options->prettyformat) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 * recurse, stream); @@ -602,17 +584,17 @@ cp_print_value (struct type *type, struct type *real_type, { int result = 0; - /* Attempt to run the Python pretty-printers on the + /* Attempt to run an extension language pretty-printer 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); - + result + = apply_ext_lang_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, @@ -655,7 +637,13 @@ cp_print_static_field (struct type *type, const struct value_print_options *options) { struct value_print_options opts; - + + if (value_entirely_optimized_out (val)) + { + val_print_optimized_out (val, stream); + return; + } + if (TYPE_CODE (type) == TYPE_CODE_STRUCT) { CORE_ADDR *first_dont_print; @@ -681,7 +669,7 @@ cp_print_static_field (struct type *type, addr = value_address (val); obstack_grow (&dont_print_statmem_obstack, (char *) &addr, sizeof (CORE_ADDR)); - CHECK_TYPEDEF (type); + type = check_typedef (type); cp_print_value_fields (type, value_enclosing_type (val), value_contents_for_printing (val), value_embedded_offset (val), addr, @@ -726,27 +714,26 @@ cp_print_static_field (struct type *type, &opts, current_language); } - -/* Find the field in *DOMAIN, or its non-virtual base classes, with - bit offset OFFSET. Set *DOMAIN to the containing type and *FIELDNO +/* Find the field in *SELF, or its non-virtual base classes, with + bit offset OFFSET. Set *SELF 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. */ + start of some field, set *SELF to NULL. */ static void -cp_find_class_member (struct type **domain_p, int *fieldno, +cp_find_class_member (struct type **self_p, int *fieldno, LONGEST offset) { - struct type *domain; + struct type *self; unsigned int i; unsigned len; - *domain_p = check_typedef (*domain_p); - domain = *domain_p; - len = TYPE_NFIELDS (domain); + *self_p = check_typedef (*self_p); + self = *self_p; + len = TYPE_NFIELDS (self); - for (i = TYPE_N_BASECLASSES (domain); i < len; i++) + for (i = TYPE_N_BASECLASSES (self); i < len; i++) { - LONGEST bitpos = TYPE_FIELD_BITPOS (domain, i); + LONGEST bitpos = TYPE_FIELD_BITPOS (self, i); QUIT; if (offset == bitpos) @@ -756,20 +743,20 @@ cp_find_class_member (struct type **domain_p, int *fieldno, } } - for (i = 0; i < TYPE_N_BASECLASSES (domain); i++) + for (i = 0; i < TYPE_N_BASECLASSES (self); i++) { - LONGEST bitpos = TYPE_FIELD_BITPOS (domain, i); - LONGEST bitsize = 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (domain, i)); + LONGEST bitpos = TYPE_FIELD_BITPOS (self, i); + LONGEST bitsize = 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (self, i)); if (offset >= bitpos && offset < bitpos + bitsize) { - *domain_p = TYPE_FIELD_TYPE (domain, i); - cp_find_class_member (domain_p, fieldno, offset - bitpos); + *self_p = TYPE_FIELD_TYPE (self, i); + cp_find_class_member (self_p, fieldno, offset - bitpos); return; } } - *domain_p = NULL; + *self_p = NULL; } void @@ -778,12 +765,12 @@ cp_print_class_member (const gdb_byte *valaddr, struct type *type, { enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type)); - /* VAL is a byte offset into the structure type DOMAIN. + /* VAL is a byte offset into the structure type SELF_TYPE. Find the name of the field for that offset and print it. */ - struct type *domain = TYPE_DOMAIN_TYPE (type); + struct type *self_type = TYPE_SELF_TYPE (type); LONGEST val; - unsigned int fieldno; + int fieldno; val = extract_signed_integer (valaddr, TYPE_LENGTH (type), @@ -805,20 +792,20 @@ cp_print_class_member (const gdb_byte *valaddr, struct type *type, return; } - cp_find_class_member (&domain, &fieldno, val << 3); + cp_find_class_member (&self_type, &fieldno, val << 3); - if (domain != NULL) + if (self_type != NULL) { const char *name; fputs_filtered (prefix, stream); - name = type_name_no_tag (domain); + name = type_name_no_tag (self_type); if (name) fputs_filtered (name, stream); else - c_type_print_base (domain, stream, 0, 0); + c_type_print_base (self_type, stream, 0, 0, &type_print_raw_options); fprintf_filtered (stream, "::"); - fputs_filtered (TYPE_FIELD_NAME (domain, fieldno), stream); + fputs_filtered (TYPE_FIELD_NAME (self_type, fieldno), stream); } else fprintf_filtered (stream, "%ld", (long) val);