X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-valprint.c;h=9f29eee13a01b5c23b90295a7548c19d99ca96fc;hb=f1f28025c3ea75d5368ddd3046461648145b89b3;hp=624976b0c05f66e620a05b1d4483a372c03e4972;hpb=09e2d7c72040dd2d1833c140b5f04a85bc3f6a0f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 624976b0c0..9f29eee13a 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -1,6 +1,6 @@ /* Support for printing C++ values for GDB, the GNU debugger. - Copyright (C) 1986-2015 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -35,54 +35,22 @@ #include "language.h" #include "extension.h" #include "typeprint.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); -} - +#include "gdbsupport/byte-vector.h" +#include "gdbarch.h" +#include "cli/cli-style.h" static struct obstack dont_print_vb_obstack; static struct obstack dont_print_statmem_obstack; static struct obstack dont_print_stat_array_obstack; -extern void _initialize_cp_valprint (void); - static void cp_print_static_field (struct type *, struct value *, struct ui_file *, int, const struct value_print_options *); static void cp_print_value (struct type *, struct type *, - const gdb_byte *, int, + LONGEST, CORE_ADDR, struct ui_file *, - int, const struct value *, + int, struct value *, const struct value_print_options *, struct type **); @@ -96,9 +64,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 (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 @@ -154,9 +122,9 @@ cp_is_vtbl_member (struct type *type) void cp_print_value_fields (struct type *type, struct type *real_type, - const gdb_byte *valaddr, int offset, + LONGEST offset, CORE_ADDR address, struct ui_file *stream, - int recurse, const struct value *val, + int recurse, struct value *val, const struct value_print_options *options, struct type **dont_print_vb, int dont_print_statmem) @@ -165,7 +133,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) { @@ -194,7 +162,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, duplicates of virtual baseclasses. */ if (n_baseclasses > 0) - cp_print_value (type, real_type, valaddr, + cp_print_value (type, real_type, offset, address, stream, recurse + 1, val, options, dont_print_vb); @@ -203,7 +171,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, /* If there are no data fields, skip this part */ if (len == n_baseclasses || !len) - fprintf_filtered (stream, ""); + fprintf_styled (stream, metadata_style.style (), ""); else { size_t statmem_obstack_initial_size = 0; @@ -228,13 +196,19 @@ 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++) { + const gdb_byte *valaddr = value_contents_for_printing (val); + /* If requested, skip printing of static fields. */ if (!options->static_field_print && field_is_static (&TYPE_FIELD (type, i))) continue; if (fields_seen) - fprintf_filtered (stream, ", "); + { + fputs_filtered (",", stream); + if (!options->prettyformat) + fputs_filtered (" ", stream); + } else if (n_baseclasses > 0) { if (options->prettyformat) @@ -242,8 +216,8 @@ cp_print_value_fields (struct type *type, struct type *real_type, 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); + fputs_filtered (TYPE_NAME (type), stream); + fputs_filtered (":", stream); } } fields_seen = 1; @@ -267,10 +241,23 @@ cp_print_value_fields (struct type *type, struct type *real_type, current_language->la_language, DMGL_PARAMS | DMGL_ANSI); annotate_field_name_end (); + + /* We tweak various options in a few cases below. */ + value_print_options options_copy = *options; + value_print_options *opts = &options_copy; + /* Do not print leading '=' in case of anonymous unions. */ if (strcmp (TYPE_FIELD_NAME (type, i), "")) fputs_filtered (" = ", stream); + else + { + /* If this is an anonymous field then we want to consider it + as though it is at its parent's depth when it comes to the + max print depth. */ + if (opts->max_depth != -1 && opts->max_depth < INT_MAX) + ++opts->max_depth; + } annotate_field_value (); if (!field_is_static (&TYPE_FIELD (type, i)) @@ -282,7 +269,8 @@ cp_print_value_fields (struct type *type, struct type *real_type, byte order problems. */ if (TYPE_FIELD_IGNORE (type, i)) { - fputs_filtered ("", stream); + fputs_styled ("", + metadata_style.style (), stream); } else if (value_bits_synthetic_pointer (val, TYPE_FIELD_BITPOS (type, @@ -290,44 +278,42 @@ cp_print_value_fields (struct type *type, struct type *real_type, TYPE_FIELD_BITSIZE (type, i))) { - fputs_filtered (_(""), stream); + fputs_styled (_(""), + metadata_style.style (), stream); } else { - struct value_print_options opts = *options; - - opts.deref_ref = 0; + opts->deref_ref = 0; v = value_field_bitfield (type, i, valaddr, offset, val); - common_val_print (v, stream, recurse + 1, &opts, - current_language); + common_val_print (v, stream, recurse + 1, + opts, current_language); } } else { if (TYPE_FIELD_IGNORE (type, i)) { - fputs_filtered ("", - stream); + fputs_styled ("", + metadata_style.style (), stream); } 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); - } + struct value *v = value_static_field (type, i); - if (ex.reason < 0) - fprintf_filtered (stream, + cp_print_static_field (TYPE_FIELD_TYPE (type, i), + v, stream, recurse + 1, + opts); + } + catch (const gdb_exception_error &ex) + { + fprintf_styled (stream, metadata_style.style (), _(""), - ex.message); - cp_print_static_field (TYPE_FIELD_TYPE (type, i), - v, stream, recurse + 1, - options); + ex.what ()); + } } else if (i == vptr_fieldno && type == vptr_basetype) { @@ -339,21 +325,18 @@ cp_print_value_fields (struct type *type, struct type *real_type, CORE_ADDR addr; addr = extract_typed_address (valaddr + i_offset, i_type); - print_function_pointer_address (options, + print_function_pointer_address (opts, get_type_arch (type), addr, stream); } } else { - struct value_print_options opts = *options; - - opts.deref_ref = 0; + 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, + stream, recurse + 1, val, opts, current_language); } } @@ -368,18 +351,14 @@ cp_print_value_fields (struct type *type, struct type *real_type, if (obstack_final_size > statmem_obstack_initial_size) { /* In effect, a pop of the printed-statics stack. */ - - void *free_to_ptr = - (char *) obstack_next_free (&dont_print_statmem_obstack) - - (obstack_final_size - statmem_obstack_initial_size); - - obstack_free (&dont_print_statmem_obstack, - free_to_ptr); + size_t shrink_bytes + = statmem_obstack_initial_size - obstack_final_size; + obstack_blank_fast (&dont_print_statmem_obstack, shrink_bytes); } if (last_set_recurse != recurse) { - size_t obstack_final_size = + obstack_final_size = obstack_object_size (&dont_print_stat_array_obstack); if (obstack_final_size > stat_array_obstack_initial_size) @@ -414,10 +393,10 @@ cp_print_value_fields (struct type *type, struct type *real_type, void cp_print_value_fields_rtti (struct type *type, - const gdb_byte *valaddr, int offset, + const gdb_byte *valaddr, LONGEST offset, CORE_ADDR address, struct ui_file *stream, int recurse, - const struct value *val, + struct value *val, const struct value_print_options *options, struct type **dont_print_vb, int dont_print_statmem) @@ -431,7 +410,8 @@ cp_print_value_fields_rtti (struct type *type, TARGET_CHAR_BIT * TYPE_LENGTH (type))) { struct value *value; - int full, top, using_enc; + int full, using_enc; + LONGEST top; /* Ugh, we have to convert back to a value here. */ value = value_from_contents_and_address (type, valaddr + offset, @@ -446,7 +426,7 @@ cp_print_value_fields_rtti (struct type *type, if (!real_type) real_type = type; - cp_print_value_fields (type, real_type, valaddr, offset, + cp_print_value_fields (type, real_type, offset, address, stream, recurse, val, options, dont_print_vb, dont_print_statmem); } @@ -456,9 +436,9 @@ cp_print_value_fields_rtti (struct type *type, static void cp_print_value (struct type *type, struct type *real_type, - const gdb_byte *valaddr, int offset, + LONGEST offset, CORE_ADDR address, struct ui_file *stream, - int recurse, const struct value *val, + int recurse, struct value *val, const struct value_print_options *options, struct type **dont_print_vb) { @@ -466,8 +446,9 @@ cp_print_value (struct type *type, struct type *real_type, = (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; + LONGEST thisoffset; struct type *thistype; + const gdb_byte *valaddr = value_contents_for_printing (val); if (dont_print_vb == 0) { @@ -480,13 +461,11 @@ cp_print_value (struct type *type, struct type *real_type, for (i = 0; i < n_baseclasses; i++) { - int boffset = 0; - int skip; + LONGEST boffset = 0; + 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; + struct value *base_val = NULL; if (BASETYPE_VIA_VIRTUAL (type, i)) { @@ -506,18 +485,20 @@ 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 (const gdb_exception_error &ex) + { + if (ex.error == NOT_AVAILABLE_ERROR) + skip = -1; + else + skip = 1; + } + if (skip == 0) + { if (BASETYPE_VIA_VIRTUAL (type, i)) { /* The virtual base class pointer might have been @@ -527,34 +508,26 @@ cp_print_value (struct type *type, struct type *real_type, if ((boffset + offset) < 0 || (boffset + offset) >= TYPE_LENGTH (real_type)) { - gdb_byte *buf; - struct cleanup *back_to; + gdb::byte_vector buf (TYPE_LENGTH (baseclass)); - buf = xmalloc (TYPE_LENGTH (baseclass)); - back_to = make_cleanup (xfree, buf); - - if (target_read_memory (address + boffset, buf, + if (target_read_memory (address + boffset, buf.data (), TYPE_LENGTH (baseclass)) != 0) skip = 1; base_val = value_from_contents_and_address (baseclass, - buf, + buf.data (), 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 { - base_valaddr = valaddr; base_val = val; } } else { - base_valaddr = valaddr; base_val = val; } } @@ -579,25 +552,35 @@ cp_print_value (struct type *type, struct type *real_type, { int result = 0; - /* Attempt to run an extension language pretty-printer on the - baseclass if possible. */ - if (!options->raw) - 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, - value_address (base_val), - stream, recurse, base_val, options, - ((struct type **) - obstack_base (&dont_print_vb_obstack)), - 0); + if (options->max_depth > -1 + && recurse >= options->max_depth) + { + const struct language_defn *language = current_language; + gdb_assert (language->la_struct_too_deep_ellipsis != NULL); + fputs_filtered (language->la_struct_too_deep_ellipsis, stream); + } + else + { + /* Attempt to run an extension language pretty-printer on the + baseclass if possible. */ + if (!options->raw) + result + = apply_ext_lang_val_pretty_printer (baseclass, + thisoffset + boffset, + value_address (base_val), + stream, recurse, + base_val, options, + current_language); + + if (!result) + cp_print_value_fields (baseclass, thistype, + thisoffset + boffset, + value_address (base_val), + stream, recurse, base_val, options, + ((struct type **) + obstack_base (&dont_print_vb_obstack)), + 0); + } } fputs_filtered (", ", stream); @@ -639,7 +622,8 @@ cp_print_static_field (struct type *type, return; } - if (TYPE_CODE (type) == TYPE_CODE_STRUCT) + struct type *real_type = check_typedef (type); + if (TYPE_CODE (real_type) == TYPE_CODE_STRUCT) { CORE_ADDR *first_dont_print; CORE_ADDR addr; @@ -654,9 +638,9 @@ cp_print_static_field (struct type *type, { if (value_address (val) == first_dont_print[i]) { - fputs_filtered ("", - stream); + fputs_styled (_(""), + metadata_style.style (), stream); return; } } @@ -664,16 +648,14 @@ 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); 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; } - if (TYPE_CODE (type) == TYPE_CODE_ARRAY) + if (TYPE_CODE (real_type) == TYPE_CODE_ARRAY) { struct type **first_dont_print; int i; @@ -688,9 +670,9 @@ cp_print_static_field (struct type *type, { if (target_type == first_dont_print[i]) { - fputs_filtered ("", - stream); + fputs_styled (_(""), + metadata_style.style (), stream); return; } } @@ -702,7 +684,7 @@ cp_print_static_field (struct type *type, opts = *options; opts.deref_ref = 0; - val_print (type, value_contents_for_printing (val), + val_print (type, value_embedded_offset (val), value_address (val), stream, recurse, val, @@ -756,9 +738,9 @@ cp_find_class_member (struct type **self_p, int *fieldno, void cp_print_class_member (const gdb_byte *valaddr, struct type *type, - struct ui_file *stream, char *prefix) + struct ui_file *stream, const char *prefix) { - enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type)); + enum bfd_endian byte_order = type_byte_order (type); /* VAL is a byte offset into the structure type SELF_TYPE. Find the name of the field for that offset and @@ -794,7 +776,7 @@ cp_print_class_member (const gdb_byte *valaddr, struct type *type, const char *name; fputs_filtered (prefix, stream); - name = type_name_no_tag (self_type); + name = TYPE_NAME (self_type); if (name) fputs_filtered (name, stream); else @@ -810,30 +792,6 @@ cp_print_class_member (const gdb_byte *valaddr, struct type *type, void _initialize_cp_valprint (void) { - 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,