diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/c-valprint.c | 20 |
2 files changed, 23 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b5d41ae..15d20e1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2020-03-13 Tom Tromey <tom@tromey.com> + * c-valprint.c (c_value_print_memberptr): New function. + (c_value_print_inner): Use it. + +2020-03-13 Tom Tromey <tom@tromey.com> + * c-valprint.c (c_value_print_int): New function. (c_value_print_inner): Use it. diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 80ba5d7..d1a0816 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -553,6 +553,23 @@ c_val_print_memberptr (struct type *type, const gdb_byte *valaddr, } } +/* c_value_print helper for TYPE_CODE_MEMBERPTR. */ + +static void +c_value_print_memberptr (struct value *val, struct ui_file *stream, + int recurse, + const struct value_print_options *options) +{ + if (!options->format) + { + struct type *type = check_typedef (value_type (val)); + const gdb_byte *valaddr = value_contents_for_printing (val); + cp_print_class_member (valaddr, type, stream, "&"); + } + else + generic_value_print (val, stream, recurse, options, &c_decorations); +} + /* See val_print for a description of the various parameters of this function; they are identical. */ @@ -667,8 +684,7 @@ c_value_print_inner (struct value *val, struct ui_file *stream, int recurse, break; case TYPE_CODE_MEMBERPTR: - c_val_print_memberptr (type, valaddr, 0, address, stream, - recurse, val, options); + c_value_print_memberptr (val, stream, recurse, options); break; case TYPE_CODE_REF: |