From patchwork Wed Jul 15 16:47:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 7701 Received: (qmail 17987 invoked by alias); 15 Jul 2015 16:48:04 -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 17723 invoked by uid 89); 15 Jul 2015 16:48:02 -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:48:00 +0000 Received: from EUSAAHC003.ericsson.se (Unknown_Domain [147.117.188.81]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 1E.19.12958.A2336A55; Wed, 15 Jul 2015 12:17:15 +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:51 -0400 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 11/14] Factor out char printing code from generic_val_print Date: Wed, 15 Jul 2015 12:47:40 -0400 Message-ID: <1436978863-15125-12-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 gdb/ChangeLog: * valprint.c (generic_val_print): Factor out char printing code to ... (generic_val_print_char): ... this new function. --- gdb/valprint.c | 54 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/gdb/valprint.c b/gdb/valprint.c index 3d1480c2..eff97c8 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -675,6 +675,38 @@ generic_val_print_int (struct type *type, const gdb_byte *valaddr, val_print_type_code_int (type, valaddr + embedded_offset, stream); } +/* generic_val_print helper for TYPE_CODE_INT. */ + +static void +generic_val_print_char (struct type *type, struct type *unresolved_type, + const gdb_byte *valaddr, int embedded_offset, + struct ui_file *stream, + const struct value *original_value, + const struct value_print_options *options) +{ + LONGEST val; + + if (options->format || options->output_format) + { + struct value_print_options opts = *options; + + opts.format = (options->format ? options->format + : options->output_format); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, &opts, 0, stream); + } + else + { + val = unpack_long (type, valaddr + embedded_offset); + if (TYPE_UNSIGNED (type)) + fprintf_filtered (stream, "%u", (unsigned int) val); + else + fprintf_filtered (stream, "%d", (int) val); + fputs_filtered (" ", stream); + LA_PRINT_CHAR (val, unresolved_type, 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 @@ -695,7 +727,6 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, const struct generic_val_print_decorations *decorations) { struct type *unresolved_type = type; - LONGEST val; type = check_typedef (type); switch (TYPE_CODE (type)) @@ -758,25 +789,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_CHAR: - if (options->format || options->output_format) - { - struct value_print_options opts = *options; - - opts.format = (options->format ? options->format - : options->output_format); - val_print_scalar_formatted (type, valaddr, embedded_offset, - original_value, &opts, 0, stream); - } - else - { - val = unpack_long (type, valaddr + embedded_offset); - if (TYPE_UNSIGNED (type)) - fprintf_filtered (stream, "%u", (unsigned int) val); - else - fprintf_filtered (stream, "%d", (int) val); - fputs_filtered (" ", stream); - LA_PRINT_CHAR (val, unresolved_type, stream); - } + generic_val_print_char (type, unresolved_type, valaddr, embedded_offset, + stream, original_value, options); break; case TYPE_CODE_FLT: