/* Support for printing C++ values for GDB, the GNU debugger.
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
This file is part of GDB.
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 **);
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. */
+ 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
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 (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,
- struct type **dont_print_vb,
- int dont_print_statmem)
-{
- int i, len, n_baseclasses;
- int fields_seen = 0;
- static int last_set_recurse = -1;
-
- type = 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);
-
- /* 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);
-
- /* Second, print out data fields */
-
- /* If there are no data fields, skip this part */
- if (len == n_baseclasses || !len)
- fprintf_styled (stream, metadata_style.style (), "<No data fields>");
- else
- {
- 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 =
- 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;
- }
- }
-
- 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)
- {
- fputs_filtered (",", stream);
- if (!options->prettyformat)
- fputs_filtered (" ", stream);
- }
- else if (n_baseclasses > 0)
- {
- if (options->prettyformat)
- {
- fprintf_filtered (stream, "\n");
- print_spaces_filtered (2 + 2 * recurse, stream);
- fputs_filtered ("members of ", stream);
- fputs_filtered (TYPE_NAME (type), stream);
- fputs_filtered (":", stream);
- }
- }
- fields_seen = 1;
-
- if (options->prettyformat)
- {
- fprintf_filtered (stream, "\n");
- print_spaces_filtered (2 + 2 * recurse, stream);
- }
- else
- {
- wrap_here (n_spaces (2 + 2 * recurse));
- }
-
- 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);
- }
- 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))
- && TYPE_FIELD_PACKED (type, i))
- {
- struct value *v;
-
- /* Bitfields require special handling, especially due to
- byte order problems. */
- if (TYPE_FIELD_IGNORE (type, i))
- {
- fputs_styled ("<optimized out or zero length>",
- metadata_style.style (), stream);
- }
- else if (value_bits_synthetic_pointer (val,
- TYPE_FIELD_BITPOS (type,
- i),
- TYPE_FIELD_BITSIZE (type,
- i)))
- {
- fputs_styled (_("<synthetic pointer>"),
- metadata_style.style (), stream);
- }
- else
- {
- opts->deref_ref = 0;
-
- v = value_field_bitfield (type, i, valaddr, offset, val);
-
- common_val_print (v, stream, recurse + 1,
- opts, current_language);
- }
- }
- else
- {
- if (TYPE_FIELD_IGNORE (type, i))
- {
- fputs_styled ("<optimized out or zero length>",
- metadata_style.style (), stream);
- }
- else if (field_is_static (&TYPE_FIELD (type, i)))
- {
- try
- {
- struct value *v = value_static_field (type, i);
-
- 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 (),
- _("<error reading variable: %s>"),
- ex.what ());
- }
- }
- 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);
-
- 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 (opts,
- get_type_arch (type),
- addr, stream);
- }
- }
- else
- {
- 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);
- }
- }
- annotate_field_end ();
- }
-
- if (dont_print_statmem == 0)
- {
- size_t 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. */
- 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)
- {
- obstack_final_size =
- obstack_object_size (&dont_print_stat_array_obstack);
-
- if (obstack_final_size > stat_array_obstack_initial_size)
- {
- void *free_to_ptr =
- (char *) 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 (options->prettyformat)
- {
- fprintf_filtered (stream, "\n");
- print_spaces_filtered (2 * recurse, stream);
- }
- } /* if there are data fields */
-
- fprintf_filtered (stream, "}");
-}
-
-/* Mutually recursive subroutines of cp_print_value and c_value_print
- to print out a structure's fields: cp_print_value_fields and
- cp_print_value.
-
- VAL, ADDRESS, STREAM, RECURSE, and OPTIONS have the same meanings
- as in cp_print_value and c_value_print.
-
- 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 (struct value *val, struct ui_file *stream,
int recurse, const struct value_print_options *options,
static int last_set_recurse = -1;
struct type *type = check_typedef (value_type (val));
- CORE_ADDR address = value_address (val);
if (recurse == 0)
{
}
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, type, 0, 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 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);
}
}
wrap_here (n_spaces (2 + 2 * recurse));
}
- annotate_field_begin (TYPE_FIELD_TYPE (type, i));
+ annotate_field_begin (type->field (i).type ());
- if (field_is_static (&TYPE_FIELD (type, i)))
+ if (field_is_static (&type->field (i)))
{
fputs_filtered ("static ", stream);
fprintf_symbol_filtered (stream,
}
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;
/* Bitfields require special handling, especially due to
- byte order problems. */
+ byte order problems. */
if (TYPE_FIELD_IGNORE (type, i))
{
fputs_styled ("<optimized out or zero length>",
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)))
{
try
{
struct value *v = value_static_field (type, i);
- cp_print_static_field (TYPE_FIELD_TYPE (type, i),
+ cp_print_static_field (type->field (i).type (),
v, stream, recurse + 1,
opts);
}
else if (i == vptr_fieldno && type == vptr_basetype)
{
int i_offset = TYPE_FIELD_BITPOS (type, i) / 8;
- struct type *i_type = TYPE_FIELD_TYPE (type, i);
+ struct type *i_type = type->field (i).type ();
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 (opts,
- get_type_arch (type),
+ type->arch (),
addr, stream);
}
}
if (dont_print_statmem == 0)
{
size_t obstack_final_size =
- obstack_object_size (&dont_print_statmem_obstack);
+ obstack_object_size (&dont_print_statmem_obstack);
if (obstack_final_size > statmem_obstack_initial_size)
{
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 value_print routine to avoid printing multiple copies of
+/* 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)
{
/* If we're at top level, carve out a completely fresh chunk of
- the obstack and use that until this particular invocation
- returns. */
+ 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);
}
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
{
- boffset = baseclass_offset (type, i, valaddr, offset, address, val);
+ boffset = baseclass_offset (type, i, valaddr,
+ value_embedded_offset (val),
+ address, val);
}
catch (const gdb_exception_error &ex)
{
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
{
}
fputs_filtered ("<", stream);
/* Not sure what the best notation is in the case where there is
- no baseclass name. */
+ no baseclass name. */
fputs_filtered (basename ? basename : "", stream);
fputs_filtered ("> = ", stream);
{
int result = 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
+ if (!val_print_check_max_depth (stream, recurse, options,
+ current_language))
{
+ 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,
- thisoffset + boffset,
- value_address (base_val),
- stream, recurse,
- base_val, options,
+ = apply_ext_lang_val_pretty_printer (baseclass_val, stream,
+ recurse, options,
current_language);
if (!result)
- cp_print_value_fields (baseclass, thistype,
- thisoffset + boffset,
- value_address (base_val),
- stream, recurse, base_val, options,
+ cp_print_value_fields (baseclass_val, stream, recurse, options,
((struct type **)
obstack_base (&dont_print_vb_obstack)),
0);
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;
}
}
}
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_styled (_("<same as static member of an already"
" seen type>"),
}
}
- 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;
*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++)
{
for (i = 0; i < TYPE_N_BASECLASSES (self); i++)
{
LONGEST bitpos = TYPE_FIELD_BITPOS (self, i);
- LONGEST bitsize = 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (self, i));
+ LONGEST bitsize = 8 * TYPE_LENGTH (self->field (i).type ());
if (offset >= bitpos && offset < bitpos + bitsize)
{
- *self_p = TYPE_FIELD_TYPE (self, i);
+ *self_p = self->field (i).type ();
cp_find_class_member (self_p, fieldno, offset - bitpos);
return;
}
const char *name;
fputs_filtered (prefix, stream);
- name = TYPE_NAME (self_type);
+ name = self_type->name ();
if (name)
fputs_filtered (name, stream);
else
projects / deliverable / binutils-gdb.git / blobdiff