From 4a8c372f1f82d1be24d2575e5979690efd839e08 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 27 Jul 2015 14:11:22 -0400 Subject: [PATCH] Factor out function/method printing code from generic_val_print gdb/ChangeLog: * valprint.c (generic_val_print): Factor out function/method printing code to ... (generic_val_print_func): ... this new function. --- gdb/ChangeLog | 6 ++++++ gdb/valprint.c | 46 +++++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4c6e17c7d1b..c5e6fe2f81f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-07-27 Simon Marchi + + * valprint.c (generic_val_print): Factor out function/method + printing code to ... + (generic_val_print_func): ... this new function. + 2015-07-27 Simon Marchi * valprint.c (generic_val_print): Factor out flags diff --git a/gdb/valprint.c b/gdb/valprint.c index d05b9075c8c..cb1a3179d66 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -594,6 +594,35 @@ generic_val_print_flags (struct type *type, const gdb_byte *valaddr, val_print_type_code_flags (type, valaddr + embedded_offset, stream); } +/* generic_val_print helper for TYPE_CODE_FUNC and TYPE_CODE_METHOD. */ + +static void +generic_val_print_func (struct type *type, const gdb_byte *valaddr, + int embedded_offset, CORE_ADDR address, + struct ui_file *stream, + const struct value *original_value, + const struct value_print_options *options) +{ + struct gdbarch *gdbarch = get_type_arch (type); + + if (options->format) + { + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); + } + else + { + /* FIXME, we should consider, at least for ANSI C language, + eliminating the distinction made between FUNCs and POINTERs + to FUNCs. */ + fprintf_filtered (stream, "{"); + type_print (type, "", stream, -1); + fprintf_filtered (stream, "} "); + /* Try to print what function it points to, and its address. */ + print_address_demangle (options, gdbarch, address, stream, demangle); + } +} + /* 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 @@ -613,7 +642,6 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, const struct value_print_options *options, const struct generic_val_print_decorations *decorations) { - struct gdbarch *gdbarch = get_type_arch (type); struct type *unresolved_type = type; LONGEST val; @@ -652,20 +680,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_FUNC: case TYPE_CODE_METHOD: - if (options->format) - { - val_print_scalar_formatted (type, valaddr, embedded_offset, - original_value, options, 0, stream); - break; - } - /* FIXME, we should consider, at least for ANSI C language, - eliminating the distinction made between FUNCs and POINTERs - to FUNCs. */ - fprintf_filtered (stream, "{"); - type_print (type, "", stream, -1); - fprintf_filtered (stream, "} "); - /* Try to print what function it points to, and its address. */ - print_address_demangle (options, gdbarch, address, stream, demangle); + generic_val_print_func (type, valaddr, embedded_offset, address, stream, + original_value, options); break; case TYPE_CODE_BOOL: -- 2.30.2