From 45000ea2f350fae68b4524059ae1876f8e89f2bb Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 27 Jul 2015 14:11:20 -0400 Subject: [PATCH] Factor out memberptr printing code from generic_val_print gdb/ChangeLog: * valprint.c (generic_val_print): Factor out memberptr printing code to ... (generic_val_print_memberptr): ... this new function. --- gdb/ChangeLog | 6 ++++++ gdb/valprint.c | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e29dbc99fb4..8a6c0022de2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-07-27 Simon Marchi + + * valprint.c (generic_val_print): Factor out memberptr + printing code to ... + (generic_val_print_memberptr): ... this new function. + 2015-07-27 Simon Marchi * valprint.c (generic_val_print): Factor out pointer diff --git a/gdb/valprint.c b/gdb/valprint.c index dcc86496f93..9a565673bb2 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -448,6 +448,19 @@ generic_val_print_ptr (struct type *type, const gdb_byte *valaddr, } } + +/* generic_val_print helper for TYPE_CODE_MEMBERPTR. */ + +static void +generic_val_print_memberptr (struct type *type, const gdb_byte *valaddr, + int embedded_offset, struct ui_file *stream, + const struct value *original_value, + const struct value_print_options *options) +{ + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); +} + /* A generic val_print that is suitable for use by language implementations of the la_val_print method. This function can handle most type codes, though not all, notably exception @@ -483,8 +496,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_MEMBERPTR: - val_print_scalar_formatted (type, valaddr, embedded_offset, - original_value, options, 0, stream); + generic_val_print_memberptr (type, valaddr, embedded_offset, stream, + original_value, options); break; case TYPE_CODE_PTR: -- 2.30.2