mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-01 20:12:01 +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
@ -245,6 +245,39 @@ scalar_type_p (struct type *type)
|
||||
}
|
||||
}
|
||||
|
||||
/* Helper function to check the validity of some bits of a value.
|
||||
|
||||
If TYPE represents some aggregate type (e.g., a structure), return 1.
|
||||
|
||||
Otherwise, any of the bytes starting at OFFSET and extending for
|
||||
TYPE_LENGTH(TYPE) bytes are invalid, print a message to STREAM and
|
||||
return 0. The checking is done using FUNCS.
|
||||
|
||||
Otherwise, return 1. */
|
||||
|
||||
static int
|
||||
valprint_check_validity (struct ui_file *stream,
|
||||
struct type *type,
|
||||
int offset,
|
||||
const struct value *val)
|
||||
{
|
||||
CHECK_TYPEDEF (type);
|
||||
|
||||
if (TYPE_CODE (type) != TYPE_CODE_UNION
|
||||
&& TYPE_CODE (type) != TYPE_CODE_STRUCT
|
||||
&& TYPE_CODE (type) != TYPE_CODE_ARRAY)
|
||||
{
|
||||
if (! value_bits_valid (val, TARGET_CHAR_BIT * offset,
|
||||
TARGET_CHAR_BIT * TYPE_LENGTH (type)))
|
||||
{
|
||||
fprintf_filtered (stream, _("<value optimized out>"));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Print using the given LANGUAGE the data of type TYPE located at VALADDR
|
||||
(within GDB), which came from the inferior at address ADDRESS, onto
|
||||
stdio stream STREAM according to OPTIONS.
|
||||
@ -263,6 +296,7 @@ scalar_type_p (struct type *type)
|
||||
int
|
||||
val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
|
||||
CORE_ADDR address, struct ui_file *stream, int recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options,
|
||||
const struct language_defn *language)
|
||||
{
|
||||
@ -283,16 +317,19 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
|
||||
|
||||
if (TYPE_STUB (real_type))
|
||||
{
|
||||
fprintf_filtered (stream, "<incomplete type>");
|
||||
fprintf_filtered (stream, _("<incomplete type>"));
|
||||
gdb_flush (stream);
|
||||
return (0);
|
||||
}
|
||||
|
||||
if (!valprint_check_validity (stream, real_type, embedded_offset, val))
|
||||
return 0;
|
||||
|
||||
if (!options->raw)
|
||||
{
|
||||
ret = apply_val_pretty_printer (type, valaddr, embedded_offset,
|
||||
address, stream, recurse, options,
|
||||
language);
|
||||
address, stream, recurse,
|
||||
val, options, language);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
@ -308,7 +345,8 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
|
||||
TRY_CATCH (except, RETURN_MASK_ERROR)
|
||||
{
|
||||
ret = language->la_val_print (type, valaddr, embedded_offset, address,
|
||||
stream, recurse, &local_opts);
|
||||
stream, recurse, val,
|
||||
&local_opts);
|
||||
}
|
||||
if (except.reason < 0)
|
||||
fprintf_filtered (stream, _("<error reading variable>"));
|
||||
@ -329,7 +367,7 @@ value_check_printable (struct value *val, struct ui_file *stream)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (value_optimized_out (val))
|
||||
if (value_entirely_optimized_out (val))
|
||||
{
|
||||
fprintf_filtered (stream, _("<value optimized out>"));
|
||||
return 0;
|
||||
@ -369,9 +407,10 @@ common_val_print (struct value *val, struct ui_file *stream, int recurse,
|
||||
get a fixed representation of our value. */
|
||||
val = ada_to_fixed_value (val);
|
||||
|
||||
return val_print (value_type (val), value_contents_all (val),
|
||||
return val_print (value_type (val), value_contents_for_printing (val),
|
||||
value_embedded_offset (val), value_address (val),
|
||||
stream, recurse, options, language);
|
||||
stream, recurse,
|
||||
val, options, language);
|
||||
}
|
||||
|
||||
/* Print on stream STREAM the value VAL according to OPTIONS. The value
|
||||
@ -390,11 +429,11 @@ value_print (struct value *val, struct ui_file *stream,
|
||||
if (!options->raw)
|
||||
{
|
||||
int r = apply_val_pretty_printer (value_type (val),
|
||||
value_contents_all (val),
|
||||
value_contents_for_printing (val),
|
||||
value_embedded_offset (val),
|
||||
value_address (val),
|
||||
stream, 0, options,
|
||||
current_language);
|
||||
stream, 0,
|
||||
val, options, current_language);
|
||||
|
||||
if (r)
|
||||
return r;
|
||||
@ -1097,6 +1136,7 @@ void
|
||||
val_print_array_elements (struct type *type, const gdb_byte *valaddr,
|
||||
CORE_ADDR address, struct ui_file *stream,
|
||||
int recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options,
|
||||
unsigned int i)
|
||||
{
|
||||
@ -1175,7 +1215,7 @@ val_print_array_elements (struct type *type, const gdb_byte *valaddr,
|
||||
if (reps > options->repeat_count_threshold)
|
||||
{
|
||||
val_print (elttype, valaddr + i * eltlen, 0, address + i * eltlen,
|
||||
stream, recurse + 1, options, current_language);
|
||||
stream, recurse + 1, val, options, current_language);
|
||||
annotate_elt_rep (reps);
|
||||
fprintf_filtered (stream, " <repeats %u times>", reps);
|
||||
annotate_elt_rep_end ();
|
||||
@ -1186,7 +1226,7 @@ val_print_array_elements (struct type *type, const gdb_byte *valaddr,
|
||||
else
|
||||
{
|
||||
val_print (elttype, valaddr + i * eltlen, 0, address + i * eltlen,
|
||||
stream, recurse + 1, options, current_language);
|
||||
stream, recurse + 1, val, options, current_language);
|
||||
annotate_elt ();
|
||||
things_printed++;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user