Remove parameter valaddr from la_val_print
Nowadays, we pass both val and return value of value_contents_for_printing (val) to la_val_print. The latter is unnecessary. This patch removes the second parameter of la_val_print, and get valaddr in each language's implementation by calling value_contents_for_printing. Since value_contents_for_printing calls value_fetch_lazy, I also make VAL non-const. Note that - I don't clean up the valaddr usages in each language's routines, - I don't remove valaddr from apply_ext_lang_val_pretty_printer, and extension language ops apply_val_pretty_printer. They can be done in followup patches. gdb: 2016-11-08 Yao Qi <yao.qi@linaro.org> * ada-lang.h (ada_val_print): Remove second parameter. Remove const from "struct value *". * ada-valprint.c (print_field_values): Remove const from "struct value *". (val_print_packed_array_elements): Likewise. (print_variant_part): Likewise. (ada_val_print_string): Likewise. (ada_val_print_gnat_array): Likewise. (ada_val_print_ptr): Likewise. (ada_val_print_num): Likewise. (ada_val_print_enum): Likewise. (ada_val_print_flt): Likewise. (ada_val_print_union): Likewise. (ada_val_print_struct_union): Likewise. (ada_val_print_ref): Likewise. (ada_val_print_1): Remove second parameter. Remove const from "struct value *". (ada_val_print): Likewise. * c-lang.h (c_val_print): Likewise. * c-valprint.c (c_val_print_array): Remove const from "struct value *". (c_val_print_ptr): Likewise. (c_val_print_struct): Likewise. (c_val_print_union): Likewise. (c_val_print_int): Likewise. (c_val_print_memberptr): Likewise. (c_val_print): Remove second parameter. Remove const from "struct value *". All callers updated. * cp-valprint.c (cp_print_value): Remove const from "struct value *". (cp_print_value_fields): Likewise. (c_val_print_value): Likewise. * d-lang.h (d_val_print): Remove second parameter. Remove const from "struct value *". * d-valprint.c (dynamic_array_type): Likewise. (d_val_print): Likewise. * f-lang.h (f_val_print): Likewise. * f-valprint.c (f_val_print): Likewise. * go-lang.h (go_val_print): Likewise. * go-valprint.c (print_go_string): Likewise. (go_val_print): Likewise. * language.c (unk_lang_val_print): Likewise. * language.h (struct language_defn) <la_val_print>: Likewise. Update comments. (LA_VAL_PRINT): Remove. * m2-lang.h (m2_val_print): Remove const from "struct value *". * m2-valprint.c (m2_print_array_contents): Likewise. (m2_val_print): Likewise. * p-lang.h (pascal_val_print): Remove second parameter. Remove const from "struct value *". (pascal_object_print_value_fields): Likewise. * p-valprint.c (pascal_val_print): Likewise. (pascal_object_print_value_fields): Likewise. (pascal_object_print_value): Likewise. * rust-lang.c (rust_get_disr_info): Likewise. (val_print_struct): Likewise. (rust_val_print): Likewise. * valprint.c (generic_val_print_array): Likewise. (generic_val_print_ptr): Likewise. (generic_val_print_memberptr): Likewise. (generic_val_print_ref): Likewise. (generic_val_print_enum): Likewise. (generic_val_print_flags): Likewise. (generic_val_print_func): Likewise. (generic_val_print_bool): Likewise. (generic_val_print_int): Likewise. (generic_val_print_char): Likewise. (generic_val_print_float): Likewise. (generic_val_print_decfloat): Likewise. (generic_val_print_complex): Likewise. (generic_val_print): Likewise. (val_print): Likewise. (common_val_print): Likewise. (val_print_type_code_flags): Likewise. (val_print_scalar_formatted): Likewise. (val_print_array_elements): Likewise. * valprint.h (val_print_array_elements): Update declaration. (val_print_scalar_formatted): Likewise. (generic_val_print): Likewise. * value.h (val_print): Likewise.
This commit is contained in:
Yao Qi
parent
cc977dc7d5
commit
e8b24d9ff5
28 changed files with 334 additions and 235 deletions
|
|
@ -120,7 +120,7 @@ rust_union_is_untagged (struct type *type)
|
|||
static struct disr_info
|
||||
rust_get_disr_info (struct type *type, const gdb_byte *valaddr,
|
||||
int embedded_offset, CORE_ADDR address,
|
||||
const struct value *val)
|
||||
struct value *val)
|
||||
{
|
||||
int i;
|
||||
struct disr_info ret;
|
||||
|
|
@ -235,7 +235,7 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr,
|
|||
cleanup = make_cleanup_ui_file_delete (temp_file);
|
||||
/* The first value of the first field (or any field)
|
||||
is the discriminant value. */
|
||||
c_val_print (TYPE_FIELD_TYPE (disr_type, 0), valaddr,
|
||||
c_val_print (TYPE_FIELD_TYPE (disr_type, 0),
|
||||
(embedded_offset + TYPE_FIELD_BITPOS (type, 0) / 8
|
||||
+ TYPE_FIELD_BITPOS (disr_type, 0) / 8),
|
||||
address, temp_file,
|
||||
|
|
@ -479,9 +479,9 @@ rust_printstr (struct ui_file *stream, struct type *type,
|
|||
/* rust_print_type branch for structs and untagged unions. */
|
||||
|
||||
static void
|
||||
val_print_struct (struct type *type, const gdb_byte *valaddr,
|
||||
int embedded_offset, CORE_ADDR address, struct ui_file *stream,
|
||||
int recurse, const struct value *val,
|
||||
val_print_struct (struct type *type, int embedded_offset,
|
||||
CORE_ADDR address, struct ui_file *stream,
|
||||
int recurse, struct value *val,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -536,7 +536,6 @@ val_print_struct (struct type *type, const gdb_byte *valaddr,
|
|||
}
|
||||
|
||||
val_print (TYPE_FIELD_TYPE (type, i),
|
||||
valaddr,
|
||||
embedded_offset + TYPE_FIELD_BITPOS (type, i) / 8,
|
||||
address,
|
||||
stream, recurse + 1, val, &opts,
|
||||
|
|
@ -572,11 +571,13 @@ static const struct generic_val_print_decorations rust_decorations =
|
|||
/* la_val_print implementation for Rust. */
|
||||
|
||||
static void
|
||||
rust_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
|
||||
rust_val_print (struct type *type, int embedded_offset,
|
||||
CORE_ADDR address, struct ui_file *stream, int recurse,
|
||||
const struct value *val,
|
||||
struct value *val,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
const gdb_byte *valaddr = value_contents_for_printing (val);
|
||||
|
||||
type = check_typedef (type);
|
||||
switch (TYPE_CODE (type))
|
||||
{
|
||||
|
|
@ -613,7 +614,7 @@ rust_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
|
|||
|
||||
case TYPE_CODE_METHODPTR:
|
||||
case TYPE_CODE_MEMBERPTR:
|
||||
c_val_print (type, valaddr, embedded_offset, address, stream,
|
||||
c_val_print (type, embedded_offset, address, stream,
|
||||
recurse, val, options);
|
||||
break;
|
||||
|
||||
|
|
@ -672,7 +673,7 @@ rust_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
|
|||
fields. */
|
||||
if (rust_union_is_untagged (type))
|
||||
{
|
||||
val_print_struct (type, valaddr, embedded_offset, address, stream,
|
||||
val_print_struct (type, embedded_offset, address, stream,
|
||||
recurse, val, options);
|
||||
break;
|
||||
}
|
||||
|
|
@ -728,7 +729,6 @@ rust_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
|
|||
TYPE_FIELD_NAME (variant_type, j));
|
||||
|
||||
val_print (TYPE_FIELD_TYPE (variant_type, j),
|
||||
valaddr,
|
||||
(embedded_offset
|
||||
+ TYPE_FIELD_BITPOS (type, disr.field_no) / 8
|
||||
+ TYPE_FIELD_BITPOS (variant_type, j) / 8),
|
||||
|
|
@ -745,14 +745,14 @@ rust_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
|
|||
break;
|
||||
|
||||
case TYPE_CODE_STRUCT:
|
||||
val_print_struct (type, valaddr, embedded_offset, address, stream,
|
||||
recurse, val, options);
|
||||
val_print_struct (type, embedded_offset, address, stream,
|
||||
recurse, val, options);
|
||||
break;
|
||||
|
||||
default:
|
||||
generic_print:
|
||||
/* Nothing special yet. */
|
||||
generic_val_print (type, valaddr, embedded_offset, address, stream,
|
||||
generic_val_print (type, embedded_offset, address, stream,
|
||||
recurse, val, options, &rust_decorations);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue