From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17072 invoked by alias); 15 Jul 2015 16:47:59 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 16936 invoked by uid 89); 15 Jul 2015 16:47:59 -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: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 15 Jul 2015 16:47:54 +0000 Received: from EUSAAHC003.ericsson.se (Unknown_Domain [147.117.188.81]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id FC.19.12958.72336A55; Wed, 15 Jul 2015 12:17:11 +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:48 -0400 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 03/14] Factor out pointer printing code from generic_val_print Date: Wed, 15 Jul 2015 16:48:00 -0000 Message-ID: <1436978863-15125-4-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 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2015-07/txt/msg00454.txt.bz2 From: Simon Marchi gdb/ChangeLog: * valprint.c (generic_val_print): Factor out pointer printing code to ... (generic_val_print_ptr): ... this new function. --- gdb/valprint.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/gdb/valprint.c b/gdb/valprint.c index cf4567b..d84c3af 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -425,6 +425,29 @@ generic_val_print_array (struct type *type, const gdb_byte *valaddr, } +/* generic_val_print helper for TYPE_CODE_PTR. */ + +static void +generic_val_print_ptr (struct type *type, const gdb_byte *valaddr, + int embedded_offset, struct ui_file *stream, + 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 + { + 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, addr, stream, options); + } +} + /* 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 @@ -447,10 +470,9 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, struct gdbarch *gdbarch = get_type_arch (type); unsigned int i = 0; /* Number of characters printed. */ unsigned len; - struct type *elttype, *unresolved_elttype; + struct type *elttype; struct type *unresolved_type = type; LONGEST val; - CORE_ADDR addr; type = check_typedef (type); switch (TYPE_CODE (type)) @@ -466,16 +488,8 @@ generic_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; - } - unresolved_elttype = TYPE_TARGET_TYPE (type); - elttype = check_typedef (unresolved_elttype); - addr = unpack_pointer (type, valaddr + embedded_offset); - print_unpacked_pointer (type, elttype, addr, stream, options); + generic_val_print_ptr (type, valaddr, embedded_offset, stream, + original_value, options); break; case TYPE_CODE_REF: -- 2.1.4