/* Support for printing C++ values for GDB, the GNU debugger.
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2023 Free Software Foundation, Inc.
This file is part of GDB.
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-#include "gdb_obstack.h"
+#include "gdbsupport/gdb_obstack.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "expression.h"
#include "gdbsupport/byte-vector.h"
#include "gdbarch.h"
#include "cli/cli-style.h"
+#include "gdbsupport/selftest.h"
+#include "selftest-arch.h"
static struct obstack dont_print_vb_obstack;
static struct obstack dont_print_statmem_obstack;
structures. Nowadays it points directly to the structure. */
if (type->code () == TYPE_CODE_PTR)
{
- type = TYPE_TARGET_TYPE (type);
+ type = type->target_type ();
if (type->code () == TYPE_CODE_ARRAY)
{
- type = TYPE_TARGET_TYPE (type);
+ type = type->target_type ();
if (type->code () == TYPE_CODE_STRUCT /* if not using thunks */
|| type->code () == TYPE_CODE_PTR) /* if using thunks */
{
int fields_seen = 0;
static int last_set_recurse = -1;
- struct type *type = check_typedef (value_type (val));
+ struct type *type = check_typedef (val->type ());
if (recurse == 0)
{
}
}
- fprintf_filtered (stream, "{");
+ gdb_printf (stream, "{");
len = type->num_fields ();
n_baseclasses = TYPE_N_BASECLASSES (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);
+ const gdb_byte *valaddr = val->contents_for_printing ().data ();
/* If requested, skip printing of static fields. */
if (!options->static_field_print
- && field_is_static (&type->field (i)))
+ && type->field (i).is_static ())
continue;
if (fields_seen)
{
- fputs_filtered (",", stream);
+ gdb_puts (",", stream);
if (!options->prettyformat)
- fputs_filtered (" ", stream);
+ gdb_puts (" ", 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 (), stream);
- fputs_filtered (":", stream);
+ gdb_printf (stream, "\n");
+ print_spaces (2 + 2 * recurse, stream);
+ gdb_puts ("members of ", stream);
+ gdb_puts (type->name (), stream);
+ gdb_puts (":", stream);
}
}
fields_seen = 1;
if (options->prettyformat)
{
- fprintf_filtered (stream, "\n");
- print_spaces_filtered (2 + 2 * recurse, stream);
+ gdb_printf (stream, "\n");
+ print_spaces (2 + 2 * recurse, stream);
}
else
{
- wrap_here (n_spaces (2 + 2 * recurse));
+ stream->wrap_here (2 + 2 * recurse);
}
annotate_field_begin (type->field (i).type ());
- if (field_is_static (&type->field (i)))
+ if (type->field (i).is_static ())
{
- fputs_filtered ("static ", stream);
- fprintf_symbol_filtered (stream,
- TYPE_FIELD_NAME (type, i),
- current_language->la_language,
- DMGL_PARAMS | DMGL_ANSI);
+ gdb_puts ("static ", stream);
+ fprintf_symbol (stream,
+ type->field (i).name (),
+ current_language->la_language,
+ DMGL_PARAMS | DMGL_ANSI);
}
else
- fputs_styled (TYPE_FIELD_NAME (type, i),
+ fputs_styled (type->field (i).name (),
variable_name_style.style (), stream);
annotate_field_name_end ();
/* Do not print leading '=' in case of anonymous
unions. */
- if (strcmp (TYPE_FIELD_NAME (type, i), ""))
- fputs_filtered (" = ", stream);
+ if (strcmp (type->field (i).name (), ""))
+ gdb_puts (" = ", stream);
else
{
/* If this is an anonymous field then we want to consider it
}
annotate_field_value ();
- if (!field_is_static (&type->field (i))
- && TYPE_FIELD_PACKED (type, i))
+ if (!type->field (i).is_static ()
+ && type->field (i).is_packed ())
{
struct value *v;
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)))
+ else if (val->bits_synthetic_pointer
+ (type->field (i).loc_bitpos (),
+ type->field (i).bitsize ()))
{
fputs_styled (_("<synthetic pointer>"),
metadata_style.style (), stream);
}
else
{
- opts->deref_ref = 0;
+ opts->deref_ref = false;
v = value_field_bitfield (type, i, valaddr,
- value_embedded_offset (val), val);
+ val->embedded_offset (), val);
common_val_print (v, stream, recurse + 1,
opts, current_language);
fputs_styled ("<optimized out or zero length>",
metadata_style.style (), stream);
}
- else if (field_is_static (&type->field (i)))
+ else if (type->field (i).is_static ())
{
try
{
}
else if (i == vptr_fieldno && type == vptr_basetype)
{
- int i_offset = TYPE_FIELD_BITPOS (type, i) / 8;
+ int i_offset = type->field (i).loc_bitpos () / 8;
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);
+ i_offset += val->embedded_offset ();
addr = extract_typed_address (valaddr + i_offset, i_type);
print_function_pointer_address (opts,
- get_type_arch (type),
+ type->arch (),
addr, stream);
}
}
else
{
- struct value *v = value_primitive_field (val, 0, i, type);
- opts->deref_ref = 0;
+ struct value *v = val->primitive_field (0, i, type);
+ opts->deref_ref = false;
common_val_print (v, stream, recurse + 1, opts,
current_language);
}
if (options->prettyformat)
{
- fprintf_filtered (stream, "\n");
- print_spaces_filtered (2 * recurse, stream);
+ gdb_printf (stream, "\n");
+ print_spaces (2 * recurse, stream);
}
} /* if there are data fields */
- fprintf_filtered (stream, "}");
+ gdb_printf (stream, "}");
+}
+
+/* A wrapper for cp_print_value_fields that tries to apply a
+ pretty-printer first. */
+
+static void
+cp_print_value_fields_pp (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 result = 0;
+
+ /* Attempt to run an extension language pretty-printer if
+ possible. */
+ if (!options->raw)
+ result
+ = apply_ext_lang_val_pretty_printer (val, stream,
+ recurse, options,
+ current_language);
+
+ if (!result)
+ cp_print_value_fields (val, stream, recurse, options, dont_print_vb,
+ dont_print_statmem);
}
/* Special val_print routine to avoid printing multiple copies of
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 *type = check_typedef (val->type ());
+ CORE_ADDR address = val->address ();
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);
- const gdb_byte *valaddr = value_contents_for_printing (val);
+ const gdb_byte *valaddr = val->contents_for_printing ().data ();
if (dont_print_vb == 0)
{
try
{
boffset = baseclass_offset (type, i, valaddr,
- value_embedded_offset (val),
+ val->embedded_offset (),
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 < 0 || boffset >= TYPE_LENGTH (type))
+ if (boffset < 0 || boffset >= type->length ())
{
- gdb::byte_vector buf (TYPE_LENGTH (baseclass));
+ gdb::byte_vector buf (baseclass->length ());
if (target_read_memory (address + boffset, buf.data (),
- TYPE_LENGTH (baseclass)) != 0)
+ baseclass->length ()) != 0)
skip = 1;
base_val = value_from_contents_and_address (baseclass,
buf.data (),
address + boffset);
- baseclass = value_type (base_val);
+ baseclass = base_val->type ();
boffset = 0;
}
else
/* Now do the printing. */
if (options->prettyformat)
{
- fprintf_filtered (stream, "\n");
- print_spaces_filtered (2 * recurse, stream);
+ gdb_printf (stream, "\n");
+ print_spaces (2 * recurse, stream);
}
- fputs_filtered ("<", stream);
+ gdb_puts ("<", stream);
/* Not sure what the best notation is in the case where there is
no baseclass name. */
- fputs_filtered (basename ? basename : "", stream);
- fputs_filtered ("> = ", stream);
+ gdb_puts (basename ? basename : "", stream);
+ gdb_puts ("> = ", stream);
if (skip < 0)
val_print_unavailable (stream);
val_print_invalid_address (stream);
else
{
- int result = 0;
-
- if (options->max_depth > -1
- && recurse >= options->max_depth)
+ if (!val_print_check_max_depth (stream, recurse, options,
+ current_language))
{
- const struct language_defn *language = current_language;
- gdb_assert (language->struct_too_deep_ellipsis () != NULL);
- fputs_filtered (language->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);
+ struct value *baseclass_val = val->primitive_field (0,
+ i, type);
+
+ cp_print_value_fields_pp
+ (baseclass_val, stream, recurse, options,
+ (struct type **) obstack_base (&dont_print_vb_obstack),
+ 0);
}
}
- fputs_filtered (", ", stream);
+ gdb_puts (", ", stream);
flush_it:
;
{
struct value_print_options opts;
- if (value_entirely_optimized_out (val))
+ if (val->entirely_optimized_out ())
{
val_print_optimized_out (val, stream);
return;
if (real_type->code () == TYPE_CODE_STRUCT)
{
CORE_ADDR *first_dont_print;
- CORE_ADDR addr = value_address (val);
+ CORE_ADDR addr = val->address ();
int i;
first_dont_print
obstack_grow (&dont_print_statmem_obstack, (char *) &addr,
sizeof (CORE_ADDR));
- cp_print_value_fields (val, stream, recurse, options, NULL, 1);
+ cp_print_value_fields_pp (val, stream, recurse, options, nullptr, 1);
return;
}
{
struct type **first_dont_print;
int i;
- struct type *target_type = TYPE_TARGET_TYPE (type);
+ struct type *target_type = type->target_type ();
first_dont_print
= (struct type **) obstack_base (&dont_print_stat_array_obstack);
}
opts = *options;
- opts.deref_ref = 0;
+ opts.deref_ref = false;
common_val_print (val, stream, recurse, &opts, current_language);
}
for (i = TYPE_N_BASECLASSES (self); i < len; i++)
{
- LONGEST bitpos = TYPE_FIELD_BITPOS (self, i);
+ field &f = self->field (i);
+ if (f.is_static ())
+ continue;
+ LONGEST bitpos = f.loc_bitpos ();
QUIT;
if (offset == bitpos)
for (i = 0; i < TYPE_N_BASECLASSES (self); i++)
{
- LONGEST bitpos = TYPE_FIELD_BITPOS (self, i);
- LONGEST bitsize = 8 * TYPE_LENGTH (self->field (i).type ());
+ LONGEST bitpos = self->field (i).loc_bitpos ();
+ LONGEST bitsize = 8 * self->field (i).type ()->length ();
if (offset >= bitpos && offset < bitpos + bitsize)
{
int fieldno;
val = extract_signed_integer (valaddr,
- TYPE_LENGTH (type),
+ type->length (),
byte_order);
/* Pointers to data members are usually byte offsets into an object.
if (val == -1)
{
- fprintf_filtered (stream, "NULL");
+ gdb_printf (stream, "NULL");
return;
}
{
const char *name;
- fputs_filtered (prefix, stream);
+ gdb_puts (prefix, stream);
name = self_type->name ();
if (name)
- fputs_filtered (name, stream);
+ gdb_puts (name, stream);
else
c_type_print_base (self_type, stream, 0, 0, &type_print_raw_options);
- fprintf_filtered (stream, "::");
- fputs_styled (TYPE_FIELD_NAME (self_type, fieldno),
+ gdb_printf (stream, "::");
+ fputs_styled (self_type->field (fieldno).name (),
variable_name_style.style (), stream);
}
else
- fprintf_filtered (stream, "%ld", (long) val);
+ gdb_printf (stream, "%ld", (long) val);
+}
+
+#if GDB_SELF_TEST
+
+/* Test printing of TYPE_CODE_STRUCT values. */
+
+static void
+test_print_fields (gdbarch *arch)
+{
+ struct field *f;
+ type *uint8_type = builtin_type (arch)->builtin_uint8;
+ type *bool_type = builtin_type (arch)->builtin_bool;
+ type *the_struct = arch_composite_type (arch, NULL, TYPE_CODE_STRUCT);
+ the_struct->set_length (4);
+
+ /* Value: 1110 1001
+ Fields: C-BB B-A- */
+ if (gdbarch_byte_order (arch) == BFD_ENDIAN_LITTLE)
+ {
+ f = append_composite_type_field_raw (the_struct, "A", bool_type);
+ f->set_loc_bitpos (1);
+ f->set_bitsize (1);
+ f = append_composite_type_field_raw (the_struct, "B", uint8_type);
+ f->set_loc_bitpos (3);
+ f->set_bitsize (3);
+ f = append_composite_type_field_raw (the_struct, "C", bool_type);
+ f->set_loc_bitpos (7);
+ f->set_bitsize (1);
+ }
+ /* According to the logic commented in "make_gdb_type_struct ()" of
+ * target-descriptions.c, bit positions are numbered differently for
+ * little and big endians. */
+ else
+ {
+ f = append_composite_type_field_raw (the_struct, "A", bool_type);
+ f->set_loc_bitpos (30);
+ f->set_bitsize (1);
+ f = append_composite_type_field_raw (the_struct, "B", uint8_type);
+ f->set_loc_bitpos (26);
+ f->set_bitsize (3);
+ f = append_composite_type_field_raw (the_struct, "C", bool_type);
+ f->set_loc_bitpos (24);
+ f->set_bitsize (1);
+ }
+
+ value *val = value::allocate (the_struct);
+ gdb_byte *contents = val->contents_writeable ().data ();
+ store_unsigned_integer (contents, val->enclosing_type ()->length (),
+ gdbarch_byte_order (arch), 0xe9);
+
+ string_file out;
+ struct value_print_options opts;
+ get_no_prettyformat_print_options (&opts);
+ cp_print_value_fields(val, &out, 0, &opts, NULL, 0);
+ SELF_CHECK (out.string () == "{A = false, B = 5, C = true}");
+
+ out.clear();
+ opts.format = 'x';
+ cp_print_value_fields(val, &out, 0, &opts, NULL, 0);
+ SELF_CHECK (out.string () == "{A = 0x0, B = 0x5, C = 0x1}");
}
+#endif
+
void _initialize_cp_valprint ();
void
_initialize_cp_valprint ()
{
+#if GDB_SELF_TEST
+ selftests::register_test_foreach_arch ("print-fields", test_print_fields);
+#endif
+
obstack_begin (&dont_print_stat_array_obstack,
32 * sizeof (struct type *));
obstack_begin (&dont_print_statmem_obstack,
projects / binutils-gdb.git / blobdiff