From: Simon Marchi <simon.marchi@ericsson.com>
To: <gdb-patches@sourceware.org>
Cc: Simon Marchi <simon.marchi@ericsson.com>
Subject: [PATCH 4/7] Factor out pointer printing code from c_val_print
Date: Wed, 08 Jul 2015 21:08:00 -0000 [thread overview]
Message-ID: <1436389629-18754-5-git-send-email-simon.marchi@ericsson.com> (raw)
In-Reply-To: <1436389629-18754-1-git-send-email-simon.marchi@ericsson.com>
gdb/ChangeLog:
* c-valprint.c (c_val_print): Factor out pointer printing code
to ...
(c_val_print_ptr): ... this new function.
---
gdb/c-valprint.c | 62 +++++++++++++++++++++++++++++++++-----------------------
1 file changed, 37 insertions(+), 25 deletions(-)
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 0b95a7f..9f68815 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -334,6 +334,41 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
}
}
+/* c_val_print helper for TYPE_CODE_PTR. */
+
+static void
+c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
+ int embedded_offset, struct ui_file *stream, int recurse,
+ const struct value *original_value,
+ const struct value_print_options *options)
+{
+ if (options->format && options->format != 's')
+ {
+ val_print_scalar_formatted (type, valaddr, embedded_offset,
+ original_value, options, 0, stream);
+ }
+ else if (options->vtblprint && cp_is_vtbl_ptr_type (type))
+ {
+ /* Print the unmangled name if desired. */
+ /* Print vtable entry - we only get here if we ARE using
+ -fvtable_thunks. (Otherwise, look under
+ TYPE_CODE_STRUCT.) */
+ CORE_ADDR addr
+ = extract_typed_address (valaddr + embedded_offset, type);
+ struct gdbarch *gdbarch = get_type_arch (type);
+
+ print_function_pointer_address (options, gdbarch, addr, stream);
+ }
+ else
+ {
+ struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
+ struct type *elttype = check_typedef (unresolved_elttype);
+ CORE_ADDR addr = unpack_pointer (type, valaddr + embedded_offset);
+ print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr,
+ embedded_offset, addr, stream, recurse, options);
+ }
+}
+
/* See val_print for a description of the various parameters of this
function; they are identical. */
@@ -345,9 +380,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr,
const struct value_print_options *options)
{
struct gdbarch *gdbarch = get_type_arch (type);
- struct type *elttype, *unresolved_elttype;
struct type *unresolved_type = type;
- CORE_ADDR addr;
CHECK_TYPEDEF (type);
switch (TYPE_CODE (type))
@@ -362,29 +395,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr,
break;
case TYPE_CODE_PTR:
- if (options->format && options->format != 's')
- {
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, options, 0, stream);
- break;
- }
- if (options->vtblprint && cp_is_vtbl_ptr_type (type))
- {
- /* Print the unmangled name if desired. */
- /* Print vtable entry - we only get here if we ARE using
- -fvtable_thunks. (Otherwise, look under
- TYPE_CODE_STRUCT.) */
- CORE_ADDR addr
- = extract_typed_address (valaddr + embedded_offset, type);
-
- print_function_pointer_address (options, gdbarch, addr, stream);
- break;
- }
- unresolved_elttype = TYPE_TARGET_TYPE (type);
- elttype = check_typedef (unresolved_elttype);
- addr = unpack_pointer (type, valaddr + embedded_offset);
- print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr,
- embedded_offset, addr, stream, recurse, options);
+ c_val_print_ptr (type, valaddr, embedded_offset, stream, recurse,
+ original_value, options);
break;
case TYPE_CODE_UNION:
--
2.1.4
next prev parent reply other threads:[~2015-07-08 21:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 21:08 [PATCH 0/7] Split c_val_print Simon Marchi
2015-07-08 21:08 ` Simon Marchi [this message]
2015-07-09 15:32 ` [PATCH 4/7] Factor out pointer printing code from c_val_print Simon Marchi
2015-07-08 21:08 ` [PATCH 2/7] Factor out print_unpacked_pointer " Simon Marchi
2015-07-09 15:30 ` Simon Marchi
2015-07-08 21:08 ` [PATCH 6/7] Factor out int printing code " Simon Marchi
2015-07-08 21:08 ` [PATCH 1/7] Remove unneeded variable assignment Simon Marchi
2015-07-08 21:08 ` [PATCH 5/7] Factor out struct and union printing code from c_val_print Simon Marchi
2015-07-08 21:08 ` [PATCH 7/7] Factor out memberptr " Simon Marchi
2015-07-08 21:08 ` [PATCH 3/7] Factor out array " Simon Marchi
2015-07-09 10:53 ` [PATCH 0/7] Split c_val_print Pedro Alves
2015-07-09 15:28 ` Simon Marchi
2015-07-09 15:30 ` Pedro Alves
2015-07-09 23:42 ` Sergio Durigan Junior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436389629-18754-5-git-send-email-simon.marchi@ericsson.com \
--to=simon.marchi@ericsson.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).