From patchwork Wed Jul 8 21:07:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 7602 Received: (qmail 6799 invoked by alias); 8 Jul 2015 21:08:28 -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 6717 invoked by uid 89); 8 Jul 2015 21:08:27 -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, 08 Jul 2015 21:08:26 +0000 Received: from EUSAAHC005.ericsson.se (Unknown_Domain [147.117.188.87]) by usevmg21.ericsson.net (Symantec Mail Security) with SMTP id 0C.A4.07675.8E92D955; Wed, 8 Jul 2015 15:47:20 +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.87) with Microsoft SMTP Server (TLS) id 14.3.210.2; Wed, 8 Jul 2015 17:08:12 -0400 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 7/7] Factor out memberptr printing code from c_val_print Date: Wed, 8 Jul 2015 17:07:09 -0400 Message-ID: <1436389629-18754-8-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1436389629-18754-1-git-send-email-simon.marchi@ericsson.com> References: <1436389629-18754-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes gdb/ChangeLog: * c-valprint.c (c_val_print): Factor out memberptr printing code from c_val_print to ... (c_val_print_memberptr): ... this new function. --- gdb/c-valprint.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 0afd292..1cfe9d7 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -455,6 +455,26 @@ c_val_print_int (struct type *type, struct type *unresolved_type, } } +/* c_val_print helper for TYPE_CODE_MEMBERPTR. */ + +static void +c_val_print_memberptr (struct type *type, const gdb_byte *valaddr, + int embedded_offset, CORE_ADDR address, + struct ui_file *stream, int recurse, + const struct value *original_value, + const struct value_print_options *options) +{ + if (!options->format) + { + cp_print_class_member (valaddr + embedded_offset, type, stream, "&"); + } + else + { + generic_val_print (type, valaddr, embedded_offset, address, stream, + recurse, original_value, options, &c_decorations); + } +} + /* See val_print for a description of the various parameters of this function; they are identical. */ @@ -500,12 +520,9 @@ c_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_MEMBERPTR: - if (!options->format) - { - cp_print_class_member (valaddr + embedded_offset, type, stream, "&"); - break; - } - /* FALLTHROUGH */ + c_val_print_memberptr (type, valaddr, embedded_offset, address, stream, + recurse, original_value, options); + break; case TYPE_CODE_REF: case TYPE_CODE_ENUM: