This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 08/14] Factor out function/method printing code from generic_val_print
- From: Simon Marchi <simon dot marchi at ericsson dot com>
- To: <gdb-patches at sourceware dot org>
- Cc: Simon Marchi <simon dot marchi at ericsson dot com>
- Date: Wed, 15 Jul 2015 12:47:37 -0400
- Subject: [PATCH 08/14] Factor out function/method printing code from generic_val_print
- Authentication-results: sourceware.org; auth=none
- References: <1436978863-15125-1-git-send-email-simon dot marchi at ericsson dot com>
gdb/ChangeLog:
* valprint.c (generic_val_print): Factor out function/method
printing code to ...
(generic_val_print_func): ... this new function.
---
gdb/valprint.c | 46 +++++++++++++++++++++++++++++++---------------
1 file changed, 31 insertions(+), 15 deletions(-)
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 3dcc54c..d2ca244 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 _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.1.4