From da3e2c2923b5c16c47c962bc53ea96678ca6a0e5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 13 Mar 2020 17:39:52 -0600 Subject: [PATCH] Introduce c_value_print_ptr This adds c_value_print_ptr, a value-based analogue of c_val_print_ptr. gdb/ChangeLog 2020-03-13 Tom Tromey * c-valprint.c (c_value_print_ptr): New function. (c_value_print_inner): Use it. --- gdb/ChangeLog | 5 +++++ gdb/c-valprint.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9c7113fe87..98223d4dfb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-03-13 Tom Tromey + + * c-valprint.c (c_value_print_ptr): New function. + (c_value_print_inner): Use it. + 2020-03-13 Tom Tromey * c-valprint.c (c_value_print_inner): Rewrite. diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 1fa33efbce..6cac9e0b57 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -375,6 +375,43 @@ c_val_print_ptr (struct type *type, const gdb_byte *valaddr, } } +/* c_value_print_inner helper for TYPE_CODE_PTR. */ + +static void +c_value_print_ptr (struct value *val, struct ui_file *stream, int recurse, + const struct value_print_options *options) +{ + if (options->format && options->format != 's') + { + value_print_scalar_formatted (val, options, 0, stream); + return; + } + + struct type *type = check_typedef (value_type (val)); + struct gdbarch *arch = get_type_arch (type); + const gdb_byte *valaddr = value_contents_for_printing (val); + + 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, type); + + print_function_pointer_address (options, arch, 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); + + print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr, + 0, addr, stream, recurse, options); + } +} + /* c_val_print helper for TYPE_CODE_STRUCT. */ static void @@ -582,8 +619,7 @@ c_value_print_inner (struct value *val, struct ui_file *stream, int recurse, break; case TYPE_CODE_PTR: - c_val_print_ptr (type, valaddr, 0, stream, recurse, - val, options); + c_value_print_ptr (val, stream, recurse, options); break; case TYPE_CODE_UNION: -- 2.34.1