diff options
Diffstat (limited to 'gdb/c-valprint.c')
| -rw-r--r-- | gdb/c-valprint.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 2cb418d4310..a90da884db8 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -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, |