diff options
Diffstat (limited to 'gdb/f-valprint.c')
| -rw-r--r-- | gdb/f-valprint.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index e1a677e..a39c801 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -152,7 +152,6 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type, struct value *elt = value_subscript ((struct value *)val, i); val_print (value_type (elt), - value_contents_for_printing (elt), value_embedded_offset (elt), value_address (elt), stream, recurse, elt, options, current_language); @@ -211,9 +210,9 @@ static const struct generic_val_print_decorations f_decorations = function; they are identical. */ void -f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, +f_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 gdbarch *gdbarch = get_type_arch (type); @@ -222,6 +221,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, struct type *elttype; CORE_ADDR addr; int index; + const gdb_byte *valaddr =value_contents_for_printing (original_value); type = check_typedef (type); switch (TYPE_CODE (type)) @@ -256,7 +256,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, case TYPE_CODE_PTR: 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); break; } @@ -306,7 +306,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, 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 @@ -355,7 +355,6 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, } val_print (value_type (field), - value_contents_for_printing (field), value_embedded_offset (field), value_address (field), stream, recurse + 1, field, options, current_language); @@ -378,7 +377,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, case TYPE_CODE_BOOL: 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, &f_decorations); break; |