From patchwork Mon Jul 27 18:17:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 7874 Received: (qmail 36877 invoked by alias); 27 Jul 2015 18:17:51 -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 36861 invoked by uid 89); 27 Jul 2015 18:17:51 -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; Mon, 27 Jul 2015 18:17:50 +0000 Received: from EUSAAHC008.ericsson.se (Unknown_Domain [147.117.188.96]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 7F.B3.12958.F9916B55; Mon, 27 Jul 2015 13:44:31 +0200 (CEST) Received: from [142.133.110.144] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.98) with Microsoft SMTP Server id 14.3.210.2; Mon, 27 Jul 2015 14:17:39 -0400 Message-ID: <55B675C3.503@ericsson.com> Date: Mon, 27 Jul 2015 14:17:39 -0400 From: Simon Marchi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Pedro Alves , Subject: Re: [PATCH 11/14] Factor out char printing code from generic_val_print References: <1436978863-15125-1-git-send-email-simon.marchi@ericsson.com> <1436978863-15125-12-git-send-email-simon.marchi@ericsson.com> <55B16097.2060009@redhat.com> In-Reply-To: <55B16097.2060009@redhat.com> X-IsSubscribed: yes On 15-07-23 05:45 PM, Pedro Alves wrote: > On 07/15/2015 05:47 PM, Simon Marchi wrote: >> +/* generic_val_print helper for TYPE_CODE_INT. */ > > TYPE_CODE_CHAR. Otherwise looks good. > >> + >> +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) > > > Thanks, > Pedro Alves Here is what I pushed: From 385f5affc00e88ad6ff0f8287bb3c1c43d59351c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 27 Jul 2015 14:11:24 -0400 Subject: [PATCH] Factor out char printing code from generic_val_print gdb/ChangeLog: * valprint.c (generic_val_print): Factor out char printing code to ... (generic_val_print_char): ... this new function. --- gdb/ChangeLog | 6 ++++++ gdb/valprint.c | 54 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bf318c3..782a893 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2015-07-27 Simon Marchi + * valprint.c (generic_val_print): Factor out char + printing code to ... + (generic_val_print_char): ... this new function. + +2015-07-27 Simon Marchi + * valprint.c (generic_val_print): Factor out integer printing code to ... (generic_val_print_int): ... this new function. diff --git a/gdb/valprint.c b/gdb/valprint.c index 887701c..c8f1e0a 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_CHAR. */ + +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: