mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-05-31 18:20:12 +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
@ -36,33 +36,23 @@
|
||||
#include "exceptions.h"
|
||||
#include "objfiles.h"
|
||||
|
||||
/* Encapsulates arguments to ada_val_print. */
|
||||
struct ada_val_print_args
|
||||
{
|
||||
struct type *type;
|
||||
const gdb_byte *valaddr0;
|
||||
int embedded_offset;
|
||||
CORE_ADDR address;
|
||||
struct ui_file *stream;
|
||||
int recurse;
|
||||
const struct value_print_options *options;
|
||||
};
|
||||
|
||||
static void print_record (struct type *, const gdb_byte *, struct ui_file *,
|
||||
int, const struct value_print_options *);
|
||||
int,
|
||||
const struct value *,
|
||||
const struct value_print_options *);
|
||||
|
||||
static int print_field_values (struct type *, const gdb_byte *,
|
||||
struct ui_file *, int,
|
||||
const struct value *,
|
||||
const struct value_print_options *,
|
||||
int, struct type *,
|
||||
const gdb_byte *);
|
||||
|
||||
static void adjust_type_signedness (struct type *);
|
||||
|
||||
static int ada_val_print_stub (void *args0);
|
||||
|
||||
static int ada_val_print_1 (struct type *, const gdb_byte *, int, CORE_ADDR,
|
||||
struct ui_file *, int,
|
||||
const struct value *,
|
||||
const struct value_print_options *);
|
||||
|
||||
|
||||
@ -146,6 +136,7 @@ static void
|
||||
val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
|
||||
int bitoffset, struct ui_file *stream,
|
||||
int recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
unsigned int i;
|
||||
@ -217,7 +208,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
|
||||
|
||||
opts.deref_ref = 0;
|
||||
val_print (elttype, value_contents (v0), 0, 0, stream,
|
||||
recurse + 1, &opts, current_language);
|
||||
recurse + 1, val, &opts, current_language);
|
||||
annotate_elt_rep (i - i0);
|
||||
fprintf_filtered (stream, _(" <repeats %u times>"), i - i0);
|
||||
annotate_elt_rep_end ();
|
||||
@ -247,7 +238,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
|
||||
stream, options);
|
||||
}
|
||||
val_print (elttype, value_contents (v0), 0, 0, stream,
|
||||
recurse + 1, &opts, current_language);
|
||||
recurse + 1, val, &opts, current_language);
|
||||
annotate_elt ();
|
||||
}
|
||||
}
|
||||
@ -581,30 +572,22 @@ int
|
||||
ada_val_print (struct type *type, const gdb_byte *valaddr0,
|
||||
int embedded_offset, CORE_ADDR address,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
struct ada_val_print_args args;
|
||||
args.type = type;
|
||||
args.valaddr0 = valaddr0;
|
||||
args.embedded_offset = embedded_offset;
|
||||
args.address = address;
|
||||
args.stream = stream;
|
||||
args.recurse = recurse;
|
||||
args.options = options;
|
||||
volatile struct gdb_exception except;
|
||||
int result = 0;
|
||||
|
||||
return catch_errors (ada_val_print_stub, &args, NULL, RETURN_MASK_ALL);
|
||||
}
|
||||
TRY_CATCH (except, RETURN_MASK_ALL)
|
||||
{
|
||||
result = ada_val_print_1 (type, valaddr0, embedded_offset, address,
|
||||
stream, recurse, val, options);
|
||||
}
|
||||
|
||||
/* Helper for ada_val_print; used as argument to catch_errors to
|
||||
unmarshal the arguments to ada_val_print_1, which does the work. */
|
||||
static int
|
||||
ada_val_print_stub (void *args0)
|
||||
{
|
||||
struct ada_val_print_args *argsp = (struct ada_val_print_args *) args0;
|
||||
if (except.reason < 0)
|
||||
result = 0;
|
||||
|
||||
return ada_val_print_1 (argsp->type, argsp->valaddr0,
|
||||
argsp->embedded_offset, argsp->address,
|
||||
argsp->stream, argsp->recurse, argsp->options);
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Assuming TYPE is a simple array, print the value of this array located
|
||||
@ -615,6 +598,7 @@ ada_val_print_stub (void *args0)
|
||||
static int
|
||||
ada_val_print_array (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)
|
||||
{
|
||||
enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));
|
||||
@ -663,10 +647,10 @@ ada_val_print_array (struct type *type, const gdb_byte *valaddr,
|
||||
print_optional_low_bound (stream, type, options);
|
||||
if (TYPE_FIELD_BITSIZE (type, 0) > 0)
|
||||
val_print_packed_array_elements (type, valaddr, 0, stream,
|
||||
recurse, options);
|
||||
recurse, val, options);
|
||||
else
|
||||
val_print_array_elements (type, valaddr, address, stream,
|
||||
recurse, options, 0);
|
||||
recurse, val, options, 0);
|
||||
fprintf_filtered (stream, ")");
|
||||
}
|
||||
|
||||
@ -680,6 +664,7 @@ static int
|
||||
ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
|
||||
int embedded_offset, CORE_ADDR address,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *original_value,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
unsigned int len;
|
||||
@ -706,7 +691,8 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
|
||||
}
|
||||
else
|
||||
retn = ada_val_print_1 (value_type (val), value_contents (val), 0,
|
||||
value_address (val), stream, recurse, options);
|
||||
value_address (val), stream, recurse,
|
||||
NULL, options);
|
||||
value_free_to_mark (mark);
|
||||
return retn;
|
||||
}
|
||||
@ -719,12 +705,12 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
|
||||
{
|
||||
default:
|
||||
return c_val_print (type, valaddr0, embedded_offset, address, stream,
|
||||
recurse, options);
|
||||
recurse, original_value, options);
|
||||
|
||||
case TYPE_CODE_PTR:
|
||||
{
|
||||
int ret = c_val_print (type, valaddr0, embedded_offset, address,
|
||||
stream, recurse, options);
|
||||
stream, recurse, original_value, options);
|
||||
|
||||
if (ada_is_tag_type (type))
|
||||
{
|
||||
@ -765,12 +751,12 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
|
||||
(type, valaddr, 0));
|
||||
|
||||
return ada_val_print_1 (target_type, value_contents (v), 0, 0,
|
||||
stream, recurse + 1, options);
|
||||
stream, recurse + 1, NULL, options);
|
||||
}
|
||||
else
|
||||
return ada_val_print_1 (TYPE_TARGET_TYPE (type),
|
||||
valaddr0, embedded_offset,
|
||||
address, stream, recurse, options);
|
||||
address, stream, recurse, original_value, options);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -855,7 +841,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
|
||||
case TYPE_CODE_FLT:
|
||||
if (options->format)
|
||||
return c_val_print (type, valaddr0, embedded_offset, address, stream,
|
||||
recurse, options);
|
||||
recurse, original_value, options);
|
||||
else
|
||||
ada_print_floating (valaddr0 + embedded_offset, type, stream);
|
||||
break;
|
||||
@ -869,13 +855,14 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
|
||||
}
|
||||
else
|
||||
{
|
||||
print_record (type, valaddr, stream, recurse, options);
|
||||
print_record (type, valaddr, stream, recurse, original_value,
|
||||
options);
|
||||
return 0;
|
||||
}
|
||||
|
||||
case TYPE_CODE_ARRAY:
|
||||
return ada_val_print_array (type, valaddr, address, stream,
|
||||
recurse, options);
|
||||
recurse, original_value, options);
|
||||
|
||||
case TYPE_CODE_REF:
|
||||
/* For references, the debugger is expected to print the value as
|
||||
@ -899,7 +886,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
|
||||
val_print (value_type (deref_val),
|
||||
value_contents (deref_val), 0,
|
||||
value_address (deref_val), stream, recurse + 1,
|
||||
options, current_language);
|
||||
original_value, options, current_language);
|
||||
}
|
||||
else
|
||||
fputs_filtered ("(null)", stream);
|
||||
@ -916,6 +903,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
|
||||
static int
|
||||
print_variant_part (struct type *type, int field_num, const gdb_byte *valaddr,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options, int comma_needed,
|
||||
struct type *outer_type, const gdb_byte *outer_valaddr)
|
||||
{
|
||||
@ -929,7 +917,7 @@ print_variant_part (struct type *type, int field_num, const gdb_byte *valaddr,
|
||||
(TYPE_FIELD_TYPE (var_type, which),
|
||||
valaddr + TYPE_FIELD_BITPOS (type, field_num) / HOST_CHAR_BIT
|
||||
+ TYPE_FIELD_BITPOS (var_type, which) / HOST_CHAR_BIT,
|
||||
stream, recurse, options,
|
||||
stream, recurse, val, options,
|
||||
comma_needed, outer_type, outer_valaddr);
|
||||
}
|
||||
|
||||
@ -973,19 +961,20 @@ ada_value_print (struct value *val0, struct ui_file *stream,
|
||||
opts = *options;
|
||||
opts.deref_ref = 1;
|
||||
return (val_print (type, value_contents (val), 0, address,
|
||||
stream, 0, &opts, current_language));
|
||||
stream, 0, val, &opts, current_language));
|
||||
}
|
||||
|
||||
static void
|
||||
print_record (struct type *type, const gdb_byte *valaddr,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
type = ada_check_typedef (type);
|
||||
|
||||
fprintf_filtered (stream, "(");
|
||||
|
||||
if (print_field_values (type, valaddr, stream, recurse, options,
|
||||
if (print_field_values (type, valaddr, stream, recurse, val, options,
|
||||
0, type, valaddr) != 0 && options->pretty)
|
||||
{
|
||||
fprintf_filtered (stream, "\n");
|
||||
@ -1012,6 +1001,7 @@ print_record (struct type *type, const gdb_byte *valaddr,
|
||||
static int
|
||||
print_field_values (struct type *type, const gdb_byte *valaddr,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *val,
|
||||
const struct value_print_options *options,
|
||||
int comma_needed,
|
||||
struct type *outer_type, const gdb_byte *outer_valaddr)
|
||||
@ -1031,7 +1021,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr,
|
||||
print_field_values (TYPE_FIELD_TYPE (type, i),
|
||||
valaddr
|
||||
+ TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT,
|
||||
stream, recurse, options,
|
||||
stream, recurse, val, options,
|
||||
comma_needed, type, valaddr);
|
||||
continue;
|
||||
}
|
||||
@ -1039,7 +1029,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr,
|
||||
{
|
||||
comma_needed =
|
||||
print_variant_part (type, i, valaddr,
|
||||
stream, recurse, options, comma_needed,
|
||||
stream, recurse, val, options, comma_needed,
|
||||
outer_type, outer_valaddr);
|
||||
continue;
|
||||
}
|
||||
@ -1106,7 +1096,8 @@ print_field_values (struct type *type, const gdb_byte *valaddr,
|
||||
opts = *options;
|
||||
opts.deref_ref = 0;
|
||||
val_print (TYPE_FIELD_TYPE (type, i), value_contents (v), 0, 0,
|
||||
stream, recurse + 1, &opts, current_language);
|
||||
stream, recurse + 1, v,
|
||||
&opts, current_language);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -1116,7 +1107,7 @@ print_field_values (struct type *type, const gdb_byte *valaddr,
|
||||
opts.deref_ref = 0;
|
||||
ada_val_print (TYPE_FIELD_TYPE (type, i),
|
||||
valaddr + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT,
|
||||
0, 0, stream, recurse + 1, &opts);
|
||||
0, 0, stream, recurse + 1, val, &opts);
|
||||
}
|
||||
annotate_field_end ();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user