/* Support for printing C++ values for GDB, the GNU debugger.
- Copyright (C) 1986-2019 Free Software Foundation, Inc.
+ Copyright (C) 1986-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "language.h"
#include "extension.h"
#include "typeprint.h"
-#include "common/byte-vector.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;
struct ui_file *, int,
const struct value_print_options *);
-static void cp_print_value (struct type *, struct type *,
- LONGEST,
- CORE_ADDR, struct ui_file *,
- int, struct value *,
- const struct value_print_options *,
+static void cp_print_value (struct value *, struct ui_file *,
+ int, const struct value_print_options *,
struct type **);
/* GCC versions after 2.4.5 use this. */
-extern const char vtbl_ptr_name[] = "__vtbl_ptr_type";
+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 (struct type *type)
{
- const char *type_name = TYPE_NAME (type);
+ const char *type_name = type->name ();
return (type_name != NULL && !strcmp (type_name, vtbl_ptr_name));
}
{
/* 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)
+ if (type->code () == TYPE_CODE_PTR)
{
type = TYPE_TARGET_TYPE (type);
- if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
+ if (type->code () == 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_CODE_STRUCT /* if not using thunks */
+ || type->code () == TYPE_CODE_PTR) /* if using thunks */
{
/* Virtual functions tables are full of pointers
to virtual functions. */
return cp_is_vtbl_ptr_type (type);
}
}
- else if (TYPE_CODE (type) == TYPE_CODE_STRUCT) /* if not using thunks */
+ else if (type->code () == 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 */
+ else if (type->code () == 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
or zero if called from top level. */
void
-cp_print_value_fields (struct type *type, struct type *real_type,
- LONGEST offset,
- CORE_ADDR address, struct ui_file *stream,
- int recurse, struct value *val,
- const struct value_print_options *options,
+cp_print_value_fields (struct value *val, struct ui_file *stream,
+ int recurse, const struct value_print_options *options,
struct type **dont_print_vb,
int dont_print_statmem)
{
int fields_seen = 0;
static int last_set_recurse = -1;
- type = check_typedef (type);
-
+ struct type *type = check_typedef (value_type (val));
+
if (recurse == 0)
{
/* Any object can be left on obstacks only during an unexpected
}
fprintf_filtered (stream, "{");
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
n_baseclasses = TYPE_N_BASECLASSES (type);
/* First, print out baseclasses such that we don't print
duplicates of virtual baseclasses. */
if (n_baseclasses > 0)
- cp_print_value (type, real_type,
- offset, address, stream,
- recurse + 1, val, options,
- dont_print_vb);
+ cp_print_value (val, stream, recurse + 1, options, dont_print_vb);
/* Second, print out data fields */
/* If there are no data fields, skip this part */
if (len == n_baseclasses || !len)
- fprintf_filtered (stream, "<No data fields>");
+ fprintf_styled (stream, metadata_style.style (), "<No data fields>");
else
{
size_t statmem_obstack_initial_size = 0;
/* If requested, skip printing of static fields. */
if (!options->static_field_print
- && field_is_static (&TYPE_FIELD (type, i)))
+ && field_is_static (&type->field (i)))
continue;
if (fields_seen)
fprintf_filtered (stream, "\n");
print_spaces_filtered (2 + 2 * recurse, stream);
fputs_filtered ("members of ", stream);
- fputs_filtered (TYPE_NAME (type), stream);
+ fputs_filtered (type->name (), stream);
fputs_filtered (":", stream);
}
}
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);
+ if (field_is_static (&type->field (i)))
+ {
+ fputs_filtered ("static ", stream);
+ fprintf_symbol_filtered (stream,
+ TYPE_FIELD_NAME (type, i),
+ current_language->la_language,
+ DMGL_PARAMS | DMGL_ANSI);
+ }
+ else
+ fputs_styled (TYPE_FIELD_NAME (type, i),
+ variable_name_style.style (), stream);
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))
+ if (!field_is_static (&type->field (i))
&& TYPE_FIELD_PACKED (type, i))
{
struct value *v;
byte order problems. */
if (TYPE_FIELD_IGNORE (type, i))
{
- fputs_filtered ("<optimized out or zero length>", stream);
+ fputs_styled ("<optimized out or zero length>",
+ metadata_style.style (), stream);
}
else if (value_bits_synthetic_pointer (val,
TYPE_FIELD_BITPOS (type,
TYPE_FIELD_BITSIZE (type,
i)))
{
- fputs_filtered (_("<synthetic pointer>"), stream);
+ fputs_styled (_("<synthetic pointer>"),
+ 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);
+ v = value_field_bitfield (type, i, valaddr,
+ value_embedded_offset (val), 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 ("<optimized out or zero length>",
- stream);
+ fputs_styled ("<optimized out or zero length>",
+ metadata_style.style (), stream);
}
- else if (field_is_static (&TYPE_FIELD (type, i)))
+ else if (field_is_static (&type->field (i)))
{
- struct value *v = NULL;
-
- TRY
+ try
{
- v = value_static_field (type, i);
- }
+ struct value *v = value_static_field (type, i);
- CATCH (ex, RETURN_MASK_ERROR)
+ cp_print_static_field (TYPE_FIELD_TYPE (type, i),
+ v, stream, recurse + 1,
+ opts);
+ }
+ catch (const gdb_exception_error &ex)
{
- fprintf_filtered (stream,
- _("<error reading variable: %s>"),
- ex.message);
+ fprintf_styled (stream, metadata_style.style (),
+ _("<error reading variable: %s>"),
+ ex.what ());
}
- END_CATCH
-
- cp_print_static_field (TYPE_FIELD_TYPE (type, i),
- v, stream, recurse + 1,
- options);
}
else if (i == vptr_fieldno && type == vptr_basetype)
{
- int i_offset = offset + TYPE_FIELD_BITPOS (type, i) / 8;
+ int i_offset = TYPE_FIELD_BITPOS (type, i) / 8;
struct type *i_type = TYPE_FIELD_TYPE (type, i);
if (valprint_check_validity (stream, i_type, i_offset, val))
{
CORE_ADDR addr;
-
+
+ i_offset += value_embedded_offset (val);
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;
- val_print (TYPE_FIELD_TYPE (type, i),
- offset + TYPE_FIELD_BITPOS (type, i) / 8,
- address,
- stream, recurse + 1, val, &opts,
- current_language);
+ struct value *v = value_primitive_field (val, 0, i, type);
+ opts->deref_ref = 0;
+ common_val_print (v, stream, recurse + 1, opts,
+ current_language);
}
}
annotate_field_end ();
{
obstack_final_size =
obstack_object_size (&dont_print_stat_array_obstack);
-
+
if (obstack_final_size > stat_array_obstack_initial_size)
{
void *free_to_ptr =
fprintf_filtered (stream, "}");
}
-/* 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, LONGEST offset,
- CORE_ADDR address,
- struct ui_file *stream, int recurse,
- 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_any_optimized_out (val,
- TARGET_CHAR_BIT * offset,
- TARGET_CHAR_BIT * TYPE_LENGTH (type)))
- {
- struct value *value;
- 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,
- 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. */
- real_type = value_rtti_type (value, &full, &top, &using_enc);
- }
-
- if (!real_type)
- real_type = type;
-
- cp_print_value_fields (type, real_type, 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 (struct type *type, struct type *real_type,
- LONGEST offset,
- CORE_ADDR address, struct ui_file *stream,
- int recurse, struct value *val,
- const struct value_print_options *options,
+cp_print_value (struct value *val, struct ui_file *stream,
+ int recurse, const struct value_print_options *options,
struct type **dont_print_vb)
{
+ struct type *type = check_typedef (value_type (val));
+ CORE_ADDR address = value_address (val);
struct type **last_dont_print
= (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);
- LONGEST thisoffset;
- struct type *thistype;
const gdb_byte *valaddr = value_contents_for_printing (val);
if (dont_print_vb == 0)
LONGEST boffset = 0;
int skip = 0;
struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
- const char *basename = TYPE_NAME (baseclass);
+ const char *basename = baseclass->name ();
struct value *base_val = NULL;
if (BASETYPE_VIA_VIRTUAL (type, i))
obstack_ptr_grow (&dont_print_vb_obstack, baseclass);
}
- thisoffset = offset;
- thistype = real_type;
-
- TRY
+ try
{
- boffset = baseclass_offset (type, i, valaddr, offset, address, val);
+ boffset = baseclass_offset (type, i, valaddr,
+ value_embedded_offset (val),
+ address, val);
}
- CATCH (ex, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &ex)
{
if (ex.error == NOT_AVAILABLE_ERROR)
skip = -1;
else
skip = 1;
}
- END_CATCH
if (skip == 0)
{
clobbered by the user program. Make sure that it
still points to a valid memory location. */
- if ((boffset + offset) < 0
- || (boffset + offset) >= TYPE_LENGTH (real_type))
+ if (boffset < 0 || boffset >= TYPE_LENGTH (type))
{
gdb::byte_vector buf (TYPE_LENGTH (baseclass));
buf.data (),
address + boffset);
baseclass = value_type (base_val);
- thisoffset = 0;
boffset = 0;
- thistype = baseclass;
}
else
{
{
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,
- 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);
+ 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
+ {
+ struct value *baseclass_val = value_primitive_field (val, 0,
+ i, type);
+
+ /* Attempt to run an extension language pretty-printer on the
+ baseclass if possible. */
+ if (!options->raw)
+ result
+ = apply_ext_lang_val_pretty_printer (baseclass_val, stream,
+ recurse, options,
+ current_language);
+
+ if (!result)
+ cp_print_value_fields (baseclass_val, stream, recurse, options,
+ ((struct type **)
+ obstack_base (&dont_print_vb_obstack)),
+ 0);
+ }
}
fputs_filtered (", ", stream);
}
struct type *real_type = check_typedef (type);
- if (TYPE_CODE (real_type) == TYPE_CODE_STRUCT)
+ if (real_type->code () == TYPE_CODE_STRUCT)
{
CORE_ADDR *first_dont_print;
- CORE_ADDR addr;
+ CORE_ADDR addr = value_address (val);
int i;
first_dont_print
while (--i >= 0)
{
- if (value_address (val) == first_dont_print[i])
+ if (addr == first_dont_print[i])
{
- fputs_filtered ("<same as static member of an already"
- " seen type>",
- stream);
+ fputs_styled (_("<same as static member of an already"
+ " seen type>"),
+ metadata_style.style (), stream);
return;
}
}
- addr = value_address (val);
obstack_grow (&dont_print_statmem_obstack, (char *) &addr,
sizeof (CORE_ADDR));
- cp_print_value_fields (type, value_enclosing_type (val),
- value_embedded_offset (val), addr,
- stream, recurse, val,
- options, NULL, 1);
+ cp_print_value_fields (val, stream, recurse, options, NULL, 1);
return;
}
- if (TYPE_CODE (real_type) == TYPE_CODE_ARRAY)
+ if (real_type->code () == TYPE_CODE_ARRAY)
{
struct type **first_dont_print;
int i;
{
if (target_type == first_dont_print[i])
{
- fputs_filtered ("<same as static member of an already"
- " seen type>",
- stream);
+ fputs_styled (_("<same as static member of an already"
+ " seen type>"),
+ metadata_style.style (), stream);
return;
}
}
opts = *options;
opts.deref_ref = 0;
- val_print (type,
- value_embedded_offset (val),
- value_address (val),
- stream, recurse, val,
- &opts, current_language);
+ common_val_print (val, stream, recurse, &opts, current_language);
}
/* Find the field in *SELF, or its non-virtual base classes, with
*self_p = check_typedef (*self_p);
self = *self_p;
- len = TYPE_NFIELDS (self);
+ len = self->num_fields ();
for (i = TYPE_N_BASECLASSES (self); i < len; i++)
{
cp_print_class_member (const gdb_byte *valaddr, struct type *type,
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
const char *name;
fputs_filtered (prefix, stream);
- name = TYPE_NAME (self_type);
+ name = self_type->name ();
if (name)
fputs_filtered (name, stream);
else
c_type_print_base (self_type, stream, 0, 0, &type_print_raw_options);
fprintf_filtered (stream, "::");
- fputs_filtered (TYPE_FIELD_NAME (self_type, fieldno), stream);
+ fputs_styled (TYPE_FIELD_NAME (self_type, fieldno),
+ variable_name_style.style (), stream);
}
else
fprintf_filtered (stream, "%ld", (long) val);
}
+void _initialize_cp_valprint ();
void
-_initialize_cp_valprint (void)
+_initialize_cp_valprint ()
{
- 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,
projects / thirdparty / binutils-gdb.git / blobdiff