From patchwork Wed Jul 15 16:47:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 7695 Received: (qmail 16558 invoked by alias); 15 Jul 2015 16:47:56 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 16459 invoked by uid 89); 15 Jul 2015 16:47:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg21.ericsson.net Received: from usevmg21.ericsson.net (HELO usevmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 15 Jul 2015 16:47:52 +0000 Received: from EUSAAHC003.ericsson.se (Unknown_Domain [147.117.188.81]) by usevmg21.ericsson.net (Symantec Mail Security) with SMTP id 4C.78.07675.30726A55; Wed, 15 Jul 2015 11:25:23 +0200 (CEST) Received: from elxcz23q12-y4.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.81) with Microsoft SMTP Server (TLS) id 14.3.210.2; Wed, 15 Jul 2015 12:47:47 -0400 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 01/14] Factor out print_unpacked_pointer from generic_val_print Date: Wed, 15 Jul 2015 12:47:30 -0400 Message-ID: <1436978863-15125-2-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1436978863-15125-1-git-send-email-simon.marchi@ericsson.com> References: <1436978863-15125-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes From: Simon Marchi gdb/ChangeLog: * valprint.c (generic_val_print): Factor out print_unpacked_pointer code to ... (print_unpacked_pointer): ... this new function. --- gdb/valprint.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/gdb/valprint.c b/gdb/valprint.c index 52a386a..eee52c5 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -359,6 +359,33 @@ val_print_invalid_address (struct ui_file *stream) fprintf_filtered (stream, _("")); } +/* Print a pointer based on the type of its target. + + Arguments to this functions are roughly the same as those in + generic_val_print. A difference is that ADDRESS is the address to print, + with embedded_offset already added. UNRESOLVED_ELTTYPE and ELTTYPE represent the pointed type, + respectively before and after check_typedef. */ + +static void +print_unpacked_pointer (struct type *type, struct type *elttype, + CORE_ADDR address, struct ui_file *stream, + const struct value_print_options *options) +{ + struct gdbarch *gdbarch = get_type_arch (type); + + if (TYPE_CODE (elttype) == TYPE_CODE_FUNC) + { + /* Try to print what function it points to. */ + print_function_pointer_address (options, gdbarch, address, stream); + return; + } + + if (options->symbol_print) + print_address_demangle (options, gdbarch, address, stream, demangle); + else if (options->addressprint) + fputs_filtered (paddress (gdbarch, address), 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 @@ -414,7 +441,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, /* Array of unspecified length: treat like pointer to first elt. */ addr = address + embedded_offset; - goto print_unpacked_pointer; + print_unpacked_pointer (type, elttype, addr, stream, options); + break; case TYPE_CODE_MEMBERPTR: val_print_scalar_formatted (type, valaddr, embedded_offset, @@ -430,22 +458,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, } unresolved_elttype = TYPE_TARGET_TYPE (type); elttype = check_typedef (unresolved_elttype); - { - addr = unpack_pointer (type, valaddr + embedded_offset); - print_unpacked_pointer: - - if (TYPE_CODE (elttype) == TYPE_CODE_FUNC) - { - /* Try to print what function it points to. */ - print_function_pointer_address (options, gdbarch, addr, stream); - return; - } - - if (options->symbol_print) - print_address_demangle (options, gdbarch, addr, stream, demangle); - else if (options->addressprint) - fputs_filtered (paddress (gdbarch, addr), stream); - } + addr = unpack_pointer (type, valaddr + embedded_offset); + print_unpacked_pointer (type, elttype, addr, stream, options); break; case TYPE_CODE_REF: