diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/c-lang.h | 2 | ||||
| -rw-r--r-- | gdb/cp-valprint.c | 16 | ||||
| -rw-r--r-- | gdb/m2-valprint.c | 2 |
4 files changed, 19 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8982d99..96e4f5f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2016-11-11 Yao Qi <yao.qi@linaro.org> + + * c-lang.h (cp_print_value_fields): Update declaration. + * cp-valprint.c (cp_print_value): Update declaration. + (cp_print_value_fields): Remove parameter valaddr. Callers + updated. + (cp_print_value): Likewise. + 2016-11-09 Tom Tromey <tom@tromey.com> * varobj.h (varobj_get_display_hint): Change return type. diff --git a/gdb/c-lang.h b/gdb/c-lang.h index 25cd93c..b898b70 100644 --- a/gdb/c-lang.h +++ b/gdb/c-lang.h @@ -123,7 +123,7 @@ extern void cp_print_class_member (const gdb_byte *, struct type *, struct ui_file *, char *); extern void cp_print_value_fields (struct type *, struct type *, - const gdb_byte *, LONGEST, CORE_ADDR, + LONGEST, CORE_ADDR, struct ui_file *, int, struct value *, const struct value_print_options *, diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 82e505a..57d5d02 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -80,7 +80,7 @@ static void cp_print_static_field (struct type *, struct value *, const struct value_print_options *); static void cp_print_value (struct type *, struct type *, - const gdb_byte *, LONGEST, + LONGEST, CORE_ADDR, struct ui_file *, int, struct value *, const struct value_print_options *, @@ -154,7 +154,7 @@ cp_is_vtbl_member (struct type *type) void cp_print_value_fields (struct type *type, struct type *real_type, - const gdb_byte *valaddr, LONGEST offset, + LONGEST offset, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *val, const struct value_print_options *options, @@ -194,7 +194,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, duplicates of virtual baseclasses. */ if (n_baseclasses > 0) - cp_print_value (type, real_type, valaddr, + cp_print_value (type, real_type, offset, address, stream, recurse + 1, val, options, dont_print_vb); @@ -228,6 +228,8 @@ cp_print_value_fields (struct type *type, struct type *real_type, vptr_fieldno = get_vptr_fieldno (type, &vptr_basetype); for (i = n_baseclasses; i < len; i++) { + const gdb_byte *valaddr = value_contents_for_printing (val); + /* If requested, skip printing of static fields. */ if (!options->static_field_print && field_is_static (&TYPE_FIELD (type, i))) @@ -449,7 +451,7 @@ cp_print_value_fields_rtti (struct type *type, if (!real_type) real_type = type; - cp_print_value_fields (type, real_type, valaddr, offset, + cp_print_value_fields (type, real_type, offset, address, stream, recurse, val, options, dont_print_vb, dont_print_statmem); } @@ -459,7 +461,7 @@ cp_print_value_fields_rtti (struct type *type, static void cp_print_value (struct type *type, struct type *real_type, - const gdb_byte *valaddr, LONGEST offset, + LONGEST offset, CORE_ADDR address, struct ui_file *stream, int recurse, struct value *val, const struct value_print_options *options, @@ -471,6 +473,7 @@ cp_print_value (struct type *type, struct type *real_type, int i, n_baseclasses = TYPE_N_BASECLASSES (type); LONGEST thisoffset; struct type *thistype; + const gdb_byte *valaddr = value_contents_for_printing (val); if (dont_print_vb == 0) { @@ -596,7 +599,7 @@ cp_print_value (struct type *type, struct type *real_type, current_language); if (!result) - cp_print_value_fields (baseclass, thistype, base_valaddr, + cp_print_value_fields (baseclass, thistype, thisoffset + boffset, value_address (base_val), stream, recurse, base_val, options, @@ -671,7 +674,6 @@ cp_print_static_field (struct type *type, sizeof (CORE_ADDR)); type = check_typedef (type); cp_print_value_fields (type, value_enclosing_type (val), - value_contents_for_printing (val), value_embedded_offset (val), addr, stream, recurse, val, options, NULL, 1); diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c index f43a2d2..50c2b30 100644 --- a/gdb/m2-valprint.c +++ b/gdb/m2-valprint.c @@ -398,7 +398,7 @@ m2_val_print (struct type *type, int embedded_offset, m2_print_unbounded_array (type, valaddr, embedded_offset, address, stream, recurse, options); else - cp_print_value_fields (type, type, valaddr, embedded_offset, + cp_print_value_fields (type, type, embedded_offset, address, stream, recurse, original_value, options, NULL, 0); break; |