forked from Imagelibrary/binutils-gdb
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
@@ -233,7 +233,7 @@ static void
|
||||
c_val_print_array (struct type *type, const gdb_byte *valaddr,
|
||||
int embedded_offset, CORE_ADDR address,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *original_value,
|
||||
struct value *original_value,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
|
||||
@@ -325,7 +325,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
|
||||
{
|
||||
i = 0;
|
||||
}
|
||||
val_print_array_elements (type, valaddr, embedded_offset,
|
||||
val_print_array_elements (type, embedded_offset,
|
||||
address, stream,
|
||||
recurse, original_value, options, i);
|
||||
fprintf_filtered (stream, "}");
|
||||
@@ -345,7 +345,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
|
||||
static void
|
||||
c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
|
||||
int embedded_offset, struct ui_file *stream, int recurse,
|
||||
const struct value *original_value,
|
||||
struct value *original_value,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
struct gdbarch *arch = get_type_arch (type);
|
||||
@@ -353,7 +353,7 @@ c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
|
||||
|
||||
if (options->format && options->format != 's')
|
||||
{
|
||||
val_print_scalar_formatted (type, valaddr, embedded_offset,
|
||||
val_print_scalar_formatted (type, embedded_offset,
|
||||
original_value, options, 0, stream);
|
||||
}
|
||||
else if (options->vtblprint && cp_is_vtbl_ptr_type (type))
|
||||
@@ -386,7 +386,7 @@ static void
|
||||
c_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 *original_value,
|
||||
struct value *original_value,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
if (options->vtblprint && cp_is_vtbl_ptr_type (type))
|
||||
@@ -418,7 +418,7 @@ static void
|
||||
c_val_print_union (struct type *type, const gdb_byte *valaddr,
|
||||
int embedded_offset, CORE_ADDR address,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *original_value,
|
||||
struct value *original_value,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
if (recurse && !options->unionprint)
|
||||
@@ -437,7 +437,7 @@ c_val_print_union (struct type *type, const gdb_byte *valaddr,
|
||||
static void
|
||||
c_val_print_int (struct type *type, struct type *unresolved_type,
|
||||
const gdb_byte *valaddr, int embedded_offset,
|
||||
struct ui_file *stream, const struct value *original_value,
|
||||
struct ui_file *stream, struct value *original_value,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
struct gdbarch *arch = get_type_arch (type);
|
||||
@@ -449,7 +449,7 @@ c_val_print_int (struct type *type, struct type *unresolved_type,
|
||||
|
||||
opts.format = (options->format ? options->format
|
||||
: options->output_format);
|
||||
val_print_scalar_formatted (type, valaddr, embedded_offset,
|
||||
val_print_scalar_formatted (type, embedded_offset,
|
||||
original_value, &opts, 0, stream);
|
||||
}
|
||||
else
|
||||
@@ -476,7 +476,7 @@ static void
|
||||
c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
|
||||
int embedded_offset, CORE_ADDR address,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *original_value,
|
||||
struct value *original_value,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
if (!options->format)
|
||||
@@ -485,7 +485,7 @@ c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
|
||||
}
|
||||
else
|
||||
{
|
||||
generic_val_print (type, valaddr, embedded_offset, address, stream,
|
||||
generic_val_print (type, embedded_offset, address, stream,
|
||||
recurse, original_value, options, &c_decorations);
|
||||
}
|
||||
}
|
||||
@@ -494,13 +494,14 @@ c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
|
||||
function; they are identical. */
|
||||
|
||||
void
|
||||
c_val_print (struct type *type, const gdb_byte *valaddr,
|
||||
c_val_print (struct type *type,
|
||||
int embedded_offset, CORE_ADDR address,
|
||||
struct ui_file *stream, int recurse,
|
||||
const struct value *original_value,
|
||||
struct value *original_value,
|
||||
const struct value_print_options *options)
|
||||
{
|
||||
struct type *unresolved_type = type;
|
||||
const gdb_byte *valaddr = value_contents_for_printing (original_value);
|
||||
|
||||
type = check_typedef (type);
|
||||
switch (TYPE_CODE (type))
|
||||
@@ -554,7 +555,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr,
|
||||
case TYPE_CODE_COMPLEX:
|
||||
case TYPE_CODE_CHAR:
|
||||
default:
|
||||
generic_val_print (type, valaddr, embedded_offset, address,
|
||||
generic_val_print (type, embedded_offset, address,
|
||||
stream, recurse, original_value, options,
|
||||
&c_decorations);
|
||||
break;
|
||||
@@ -669,7 +670,7 @@ c_value_print (struct value *val, struct ui_file *stream,
|
||||
/* Print out object: enclosing type is same as real_type if
|
||||
full. */
|
||||
val_print (value_enclosing_type (val),
|
||||
value_contents_for_printing (val), 0,
|
||||
0,
|
||||
value_address (val), stream, 0,
|
||||
val, &opts, current_language);
|
||||
return;
|
||||
@@ -682,7 +683,7 @@ c_value_print (struct value *val, struct ui_file *stream,
|
||||
fprintf_filtered (stream, "(%s ?) ",
|
||||
TYPE_NAME (value_enclosing_type (val)));
|
||||
val_print (value_enclosing_type (val),
|
||||
value_contents_for_printing (val), 0,
|
||||
0,
|
||||
value_address (val), stream, 0,
|
||||
val, &opts, current_language);
|
||||
return;
|
||||
@@ -690,7 +691,7 @@ c_value_print (struct value *val, struct ui_file *stream,
|
||||
/* Otherwise, we end up at the return outside this "if". */
|
||||
}
|
||||
|
||||
val_print (val_type, value_contents_for_printing (val),
|
||||
val_print (val_type,
|
||||
value_embedded_offset (val),
|
||||
value_address (val),
|
||||
stream, 0,
|
||||
|
||||
Reference in New Issue
Block a user