diff options
Diffstat (limited to 'gdb/cp-valprint.c')
| -rw-r--r-- | gdb/cp-valprint.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 61559af..2968953 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -38,7 +38,6 @@ #include "language.h" /* Controls printing of vtbl's */ -int vtblprint; static void show_vtblprint (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -50,7 +49,6 @@ Printing of C++ virtual function tables is %s.\n"), /* Controls looking up an object's derived type using what we find in its vtables. */ -int objectprint; static void show_objectprint (struct ui_file *file, int from_tty, struct cmd_list_element *c, @@ -61,7 +59,6 @@ Printing of object's derived type based on vtable info is %s.\n"), value); } -int static_field_print; /* Controls printing of static fields. */ static void show_static_field_print (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -77,12 +74,12 @@ static struct obstack dont_print_statmem_obstack; extern void _initialize_cp_valprint (void); static void cp_print_static_field (struct type *, struct value *, - struct ui_file *, int, int, - enum val_prettyprint); + struct ui_file *, int, + const struct value_print_options *); static void cp_print_value (struct type *, struct type *, const gdb_byte *, - int, CORE_ADDR, struct ui_file *, int, int, - enum val_prettyprint, struct type **); + int, CORE_ADDR, struct ui_file *, int, + const struct value_print_options *, struct type **); /* GCC versions after 2.4.5 use this. */ @@ -139,7 +136,7 @@ cp_is_vtbl_member (struct type *type) /* 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 + TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the same meanings as in cp_print_value and c_val_print. 2nd argument REAL_TYPE is used to carry over the type of the derived @@ -151,9 +148,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, CORE_ADDR address, - struct ui_file *stream, int format, int recurse, - enum val_prettyprint pretty, - struct type **dont_print_vb,int dont_print_statmem) + struct ui_file *stream, int recurse, + const struct value_print_options *options, + struct type **dont_print_vb, int dont_print_statmem) { int i, len, n_baseclasses; char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack); @@ -170,7 +167,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, if (n_baseclasses > 0) cp_print_value (type, real_type, valaddr, offset, address, stream, - format, recurse + 1, pretty, dont_print_vb); + recurse + 1, options, dont_print_vb); /* Second, print out data fields */ @@ -192,7 +189,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, for (i = n_baseclasses; i < len; i++) { /* If requested, skip printing of static fields. */ - if (!static_field_print + if (!options->static_field_print && field_is_static (&TYPE_FIELD (type, i))) continue; @@ -200,7 +197,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, fprintf_filtered (stream, ", "); else if (n_baseclasses > 0) { - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); @@ -211,7 +208,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, } fields_seen = 1; - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); @@ -220,7 +217,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, { 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); @@ -266,11 +263,13 @@ cp_print_value_fields (struct type *type, struct type *real_type, } else { + struct value_print_options opts = *options; + 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, format, 0, recurse + 1, pretty, + common_val_print (v, stream, recurse + 1, &opts, current_language); } } @@ -287,15 +286,16 @@ cp_print_value_fields (struct type *type, struct type *real_type, fputs_filtered ("<optimized out>", stream); else cp_print_static_field (TYPE_FIELD_TYPE (type, i), v, - stream, format, recurse + 1, - pretty); + stream, recurse + 1, options); } else { + 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 + TYPE_FIELD_BITPOS (type, i) / 8, - stream, format, 0, recurse + 1, pretty, + stream, recurse + 1, &opts, current_language); } } @@ -310,7 +310,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, dont_print_statmem_obstack = tmp_obstack; } - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 * recurse, stream); @@ -326,8 +326,9 @@ cp_print_value_fields (struct type *type, struct type *real_type, static void cp_print_value (struct type *type, struct type *real_type, const gdb_byte *valaddr, int offset, CORE_ADDR address, - struct ui_file *stream, int format, int recurse, - enum val_prettyprint pretty, struct type **dont_print_vb) + struct ui_file *stream, int recurse, + const struct value_print_options *options, + struct type **dont_print_vb) { struct type **last_dont_print = (struct type **) obstack_next_free (&dont_print_vb_obstack); @@ -402,7 +403,7 @@ cp_print_value (struct type *type, struct type *real_type, base_valaddr = valaddr; /* now do the printing */ - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 * recurse, stream); @@ -419,8 +420,7 @@ cp_print_value (struct type *type, struct type *real_type, else cp_print_value_fields (baseclass, thistype, base_valaddr, thisoffset + boffset, address + boffset, - stream, format, - recurse, pretty, + stream, recurse, options, ((struct type **) obstack_base (&dont_print_vb_obstack)), 0); @@ -447,17 +447,17 @@ cp_print_value (struct type *type, struct type *real_type, 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 (struct type *type, struct value *val, struct ui_file *stream, - int format, int recurse, - enum val_prettyprint pretty) + const struct value_print_options *options) { + struct value_print_options opts; if (TYPE_CODE (type) == TYPE_CODE_STRUCT) { CORE_ADDR *first_dont_print; @@ -485,12 +485,15 @@ cp_print_static_field (struct type *type, CHECK_TYPEDEF (type); cp_print_value_fields (type, type, value_contents_all (val), value_embedded_offset (val), VALUE_ADDRESS (val), - stream, format, recurse, pretty, NULL, 1); + stream, recurse, options, NULL, 1); return; } + + opts = *options; + opts.deref_ref = 0; val_print (type, value_contents_all (val), value_embedded_offset (val), VALUE_ADDRESS (val), - stream, format, 0, recurse, pretty, current_language); + stream, recurse, &opts, current_language); } @@ -589,32 +592,29 @@ void _initialize_cp_valprint (void) { add_setshow_boolean_cmd ("static-members", class_support, - &static_field_print, _("\ + &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); - /* Turn on printing of static fields. */ - static_field_print = 1; - add_setshow_boolean_cmd ("vtbl", class_support, &vtblprint, _("\ + 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, &objectprint, _("\ + 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); - /* 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), |