mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-05-31 01:45:52 +08:00
gdb
PR gdb/9977, PR exp/11636: * value.h (value_offset): Update. (struct lval_funcs) <check_validity>: New field. <copy_closure>: Make argument const. (value_computed_closure): Update. (value_contents_for_printing): Declare. (value_bits_valid): Likewise. (val_print): Likewise. (set_value_component_location): Update. (value_entirely_optimized_out): Declare. * value.c (value_offset): Argument now const. (require_not_optimized_out): New function. (value_contents_for_printing): New function. (value_contents_all): Call require_not_optimized_out. (value_contents): Likewise. (value_bits_valid): New function. (value_computed_closure): Argument now const. (set_value_component_location): Make 'whole' argument const. (value_entirely_optimized_out): New function. (value_bitsize): Argument now 'const'. (value_bitpos): Likewise. (value_type): Likewise. * valprint.h (val_print_array_elements): Update. * valprint.c (val_print): Add 'val' argument. Use valprint_check_validity. (valprint_check_validity): New function. (value_check_printable): Use value_entirely_optimized_out. (common_val_print): Update. (value_print): Likewise. (val_print_array_elements): Add 'val' argument. * valops.c (value_fetch_lazy): Use value_contents_for_printing, value_bits_valid. Reinit frame cache for lval_computed. * sh64-tdep.c (sh64_do_register): Update. * scm-valprint.c (scm_val_print): Add 'val' argument. * scm-lang.h (scm_val_print): Update. * python/python.h (apply_val_pretty_printer): Update. * python/py-prettyprint.c (apply_val_pretty_printer): Add 'val' argument. Call set_value_component_location. * printcmd.c (print_scalar_formatted): Update. * p-valprint.c (pascal_val_print): Add 'val' argument. (pascal_object_print_value_fields): Likewise. (pascal_object_print_value): Likewise. (pascal_object_print_static_field): Update. * p-lang.h (pascal_val_print): Update. (pascal_object_print_value_fields): Update. * mt-tdep.c (mt_registers_info): Update. * mi/mi-main.c (get_register): Update. (mi_cmd_data_evaluate_expression): Use common_val_print. * m2-valprint.c (m2_print_array_contents): Add 'val' argument. (m2_print_unbounded_array): Likewise. (m2_val_print): Likewise. * m2-lang.h (m2_val_print): Update. * language.h (struct language_defn) <la_val_print>: Add 'val' argument. (LA_VAL_PRINT): Likewise. * language.c (unk_lang_val_print): Add 'val' argument. * jv-valprint.c (java_print_value_fields): Add 'val' argument. (java_val_print): Likewise. * jv-lang.h (java_val_print): Add 'val' argument. * infcmd.c (default_print_registers_info): Update. * f-valprint.c (f77_print_array_1): Add 'val' argument. (f77_print_array): Likewise. (f_val_print): Likewise. * f-lang.h (f_val_print): Add 'val' argument. * dwarf2loc.c (read_pieced_value): Use value_bitsize and value_bitpos. <DWARF_VALUE_OPTIMIZED_OUT>: Don't print warning. Call set_value_optimized_out. (write_pieced_value): Use value_bitsize and value_bitpos. <default>: Don't exit loop. (check_pieced_value_validity): New function. (pieced_value_funcs): Reference check_pieced_value_validity, check_pieced_value_invalid. (copy_pieced_value_closure): Update. (check_pieced_value_bits): New function. (check_pieced_value_invalid): New function. * d-valprint.c (dynamic_array_type): Add 'val' argument. (d_val_print): Likewise. * d-lang.h (d_val_print): Update. * cp-valprint.c (cp_print_value_fields): Add 'val' argument. (cp_print_value_fields_rtti): Likewise. (cp_print_value): Likewise. (cp_print_static_field): Update. * c-valprint.c (c_val_print): Add 'val' argument. (c_value_print): Update. * c-lang.h (c_val_print): Update. (cp_print_value_fields): Likewise. (cp_print_value_fields_rtti): Likewise. * ada-valprint.c (struct ada_val_print_args): Remove. (val_print_packed_array_elements): Add 'val' argument. (ada_val_print): Likewise. Rewrite. (ada_val_print_stub): Remove. (ada_val_print_array): Add 'val' argument. (ada_val_print_1): Likewise. (print_variant_part): Likewise. (ada_value_print): Update. (print_record): Add 'val' argument. (print_field_values): Likewise. * ada-lang.h (ada_val_print): Update. gdb/testsuite PR gdb/9977, PR exp/11636:: * gdb.dwarf2/pieces.exp (pieces_test_f3): Remove kfail. (pieces_test_f6): Update expected output.
This commit is contained in:
Tom Tromey
@ -81,6 +81,7 @@ static void cp_print_static_field (struct type *, struct value *,
|
||||
|
||||
static void cp_print_value (struct type *, struct type *, const gdb_byte *,
|
||||
int, CORE_ADDR, struct ui_file *, int,
|
||||
const struct value *,
|
||||
const struct value_print_options *, struct type **);
|
||||
|
||||
|
||||
@ -151,6 +152,7 @@ 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 recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options,
|
||||
struct type **dont_print_vb, int dont_print_statmem)
|
||||
{
|
||||
@ -177,7 +179,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,
|
||||
recurse + 1, options, dont_print_vb);
|
||||
recurse + 1, val, options, dont_print_vb);
|
||||
|
||||
/* Second, print out data fields */
|
||||
|
||||
@ -278,6 +280,11 @@ cp_print_value_fields (struct type *type, struct type *real_type,
|
||||
{
|
||||
fputs_filtered ("<optimized out or zero length>", stream);
|
||||
}
|
||||
else if (!value_bits_valid (val, TYPE_FIELD_BITPOS (type, i),
|
||||
TYPE_FIELD_BITSIZE (type, i)))
|
||||
{
|
||||
fputs_filtered (_("<value optimized out>"), stream);
|
||||
}
|
||||
else
|
||||
{
|
||||
struct value_print_options opts = *options;
|
||||
@ -315,7 +322,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
|
||||
val_print (TYPE_FIELD_TYPE (type, i),
|
||||
valaddr, offset + TYPE_FIELD_BITPOS (type, i) / 8,
|
||||
address,
|
||||
stream, recurse + 1, &opts,
|
||||
stream, recurse + 1, val, &opts,
|
||||
current_language);
|
||||
}
|
||||
}
|
||||
@ -377,26 +384,35 @@ cp_print_value_fields_rtti (struct type *type,
|
||||
const gdb_byte *valaddr, int offset,
|
||||
CORE_ADDR address,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options,
|
||||
struct type **dont_print_vb,
|
||||
int dont_print_statmem)
|
||||
{
|
||||
struct value *value;
|
||||
int full, top, using_enc;
|
||||
struct type *real_type;
|
||||
struct type *real_type = NULL;
|
||||
|
||||
/* We require all bits to be valid in order to attempt a
|
||||
conversion. */
|
||||
if (value_bits_valid (val, TARGET_CHAR_BIT * offset,
|
||||
TARGET_CHAR_BIT * TYPE_LENGTH (type)))
|
||||
{
|
||||
struct value *value;
|
||||
int full, top, using_enc;
|
||||
|
||||
/* Ugh, we have to convert back to a value here. */
|
||||
value = value_from_contents_and_address (type, valaddr + offset,
|
||||
address + offset);
|
||||
/* 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);
|
||||
}
|
||||
|
||||
/* Ugh, we have to convert back to a value here. */
|
||||
value = value_from_contents_and_address (type, valaddr + offset,
|
||||
address + offset);
|
||||
/* 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, valaddr, offset,
|
||||
address, stream, recurse, options,
|
||||
address, stream, recurse, val, options,
|
||||
dont_print_vb, dont_print_statmem);
|
||||
}
|
||||
|
||||
@ -407,6 +423,7 @@ 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 recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options,
|
||||
struct type **dont_print_vb)
|
||||
{
|
||||
@ -508,14 +525,14 @@ cp_print_value (struct type *type, struct type *real_type,
|
||||
result = apply_val_pretty_printer (baseclass, base_valaddr,
|
||||
thisoffset + boffset,
|
||||
address,
|
||||
stream, recurse,
|
||||
stream, recurse, val,
|
||||
options,
|
||||
current_language);
|
||||
|
||||
if (!result)
|
||||
cp_print_value_fields (baseclass, thistype, base_valaddr,
|
||||
thisoffset + boffset, address,
|
||||
stream, recurse, options,
|
||||
stream, recurse, val, options,
|
||||
((struct type **)
|
||||
obstack_base (&dont_print_vb_obstack)),
|
||||
0);
|
||||
@ -582,9 +599,10 @@ cp_print_static_field (struct type *type,
|
||||
sizeof (CORE_ADDR));
|
||||
CHECK_TYPEDEF (type);
|
||||
cp_print_value_fields (type, value_enclosing_type (val),
|
||||
value_contents_all (val),
|
||||
value_contents_for_printing (val),
|
||||
value_embedded_offset (val), addr,
|
||||
stream, recurse, options, NULL, 1);
|
||||
stream, recurse,
|
||||
val, options, NULL, 1);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -616,9 +634,10 @@ cp_print_static_field (struct type *type,
|
||||
|
||||
opts = *options;
|
||||
opts.deref_ref = 0;
|
||||
val_print (type, value_contents_all (val),
|
||||
val_print (type, value_contents_for_printing (val),
|
||||
value_embedded_offset (val), value_address (val),
|
||||
stream, recurse, &opts, current_language);
|
||||
stream, recurse,
|
||||
val, &opts, current_language);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user