aboutsummaryrefslogtreecommitdiff
path: root/gdb/d-valprint.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2011-01-24 18:54:17 +0000
committerPedro Alves <palves@redhat.com>2011-01-24 18:54:17 +0000
commit490f124f0943a59ca6829a030164f79716600166 (patch)
tree0140c25ba1bd8fa65f9242d98bacbb0177e8514b /gdb/d-valprint.c
parent23b1e6e45074aded91b36b498a953d611da21b47 (diff)
downloadgdb-490f124f0943a59ca6829a030164f79716600166.zip
gdb-490f124f0943a59ca6829a030164f79716600166.tar.gz
gdb-490f124f0943a59ca6829a030164f79716600166.tar.bz2
2011-01-24 Pedro Alves <pedro@codesourcery.com>
Don't lose embedded_offset in printing routines throughout. gdb/ * valprint.h (val_print_array_elements): Change prototype. * valprint.c (val_print_array_elements): Add `embedded_offset' parameter, and adjust to pass it down to val_print, while passing `valaddr' or `address' unmodified. Take embedded_offset into account when checking repetitions. * c-valprint.c (c_val_print): Pass embedded_offset to val_print_array_elements instead of adjusting `valaddr' and `address'. * m2-valprint.c (m2_print_array_contents, m2_val_print): Pass embedded_offset to val_print_array_elements instead of adjusting `valaddr'. * p-lang.h (pascal_object_print_value_fields): Adjust prototype. * p-valprint.c (pascal_val_print): Pass embedded_offset to val_print_array_elements and pascal_object_print_value_fields instead of adjusting `valaddr'. (pascal_object_print_value_fields): Add `offset' parameter, and adjust to use it. (pascal_object_print_value): Add `offset' parameter, and adjust to use it. (pascal_object_print_static_field): Use value_contents_for_printing/value_embedded_offset, rather than value_contents. * ada-valprint.c (val_print_packed_array_elements): Add `offset' parameter, and adjust to use it. Use value_contents_for_printing/value_embedded_offset, rather than value_contents. (ada_val_print): Rename `valaddr0' parameter to `valaddr'. (ada_val_print_array): Add `offset' parameter, and adjust to use it. (ada_val_print_1): Rename `valaddr0' parameter to `valaddr', and `embedded_offset' to `offset'. Don't re-adjust `valaddr'. Instead work with offsets. Use value_contents_for_printing/value_embedded_offset, rather than value_contents. Change `defer_val_int' local type to CORE_ADDR, and use value_from_pointer to extract a target pointer, rather than value_from_longest. (print_variant_part): Add `offset' parameter. Replace `outer_valaddr' parameter by a new `outer_offset' parameter. Don't re-adjust `valaddr'. Instead pass down adjusted offsets. (ada_value_print): Use value_contents_for_printing/value_embedded_offset, rather than value_contents. (print_record): Add `offset' parameter, and adjust to pass it down. (print_field_values): Add `offset' parameter. Replace `outer_valaddr' parameter by a new `outer_offset' parameter. Don't re-adjust `valaddr'. Instead pass down adjusted offsets. Use value_contents_for_printing/value_embedded_offset, rather than value_contents. * d-valprint.c (dynamic_array_type): Use value_contents_for_printing/value_embedded_offset, rather than value_contents. * jv-valprint.c (java_print_value_fields): Add `offset' parameter. Don't re-adjust `valaddr'. Instead pass down adjusted offsets. (java_print_value_fields): Take `offset' into account. Don't re-adjust `valaddr'. Instead pass down adjusted offsets. (java_val_print): Take `embedded_offset' into account. Pass it to java_print_value_fields. * f-valprint.c (f77_print_array_1): Add `embedded_offset' parameter. Don't re-adjust `valaddr' or `address'. Instead pass down adjusted offsets. (f77_print_array): Add `embedded_offset' parameter. Pass it down. (f_val_print): Take `embedded_offset' into account. gdb/testsuite/ * gdb.base/printcmds.c (some_struct): New struct and instance. * gdb.base/printcmds.exp (test_print_repeats_embedded_array): New procedure. <global scope>: Call it.
Diffstat (limited to 'gdb/d-valprint.c')
-rw-r--r--gdb/d-valprint.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gdb/d-valprint.c b/gdb/d-valprint.c
index 9577a2e..969cfe2 100644
--- a/gdb/d-valprint.c
+++ b/gdb/d-valprint.c
@@ -45,7 +45,6 @@ dynamic_array_type (struct type *type, const gdb_byte *valaddr,
struct type *elttype;
struct type *true_type;
struct type *ptr_type;
- const gdb_byte *ptraddr;
struct value *val;
int length;
@@ -60,10 +59,11 @@ dynamic_array_type (struct type *type, const gdb_byte *valaddr,
true_type = lookup_array_range_type (true_type, 0, length - 1);
val = value_at (true_type, addr);
- ptraddr = value_contents (val);
- return d_val_print (true_type, ptraddr, 0, addr, stream, recurse + 1,
- NULL, options);
+ return d_val_print (true_type,
+ value_contents_for_printing (val),
+ value_embedded_offset (val), addr,
+ stream, recurse + 1, val, options);
}
return -1;
}