From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 3193D394B02F; Sat, 14 Mar 2020 00:07:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3193D394B02F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1584144437; bh=eFlH02zY9RyMmpxYxTKrKeDvzudX7xTUUhpvTUmahPY=; h=From:To:Subject:Date:From; b=fGV5t3cQPRsjiWVQ6POeREODHBSbg54bnWFagBG8l9fOcmYsxpODRkSeuZcpOXAY5 LUu3bvaPOYuHSmOgq26hiyquC3jKYcs7vLaiThJ2ODIckL8rjxTbORSEbZsxqIRd+i 6EJkp5wg/7YgkMpTSA10ge2yxzGfU9YYCzo0tC4Q= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Introduce generic_value_print_bool X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 4112d2e602fed7157ce6bb30f46969129633d0f2 X-Git-Newrev: 6dde752183769c712eb22f49a5b74bfadad4a6be Message-Id: <20200314000717.3193D394B02F@sourceware.org> Date: Sat, 14 Mar 2020 00:07:17 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 00:07:17 -0000 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6dde752183769c712eb22f49a5b74bfadad4a6be commit 6dde752183769c712eb22f49a5b74bfadad4a6be Author: Tom Tromey Date: Fri Mar 13 17:39:52 2020 -0600 Introduce generic_value_print_bool This adds generic_value_print_bool, a value-based analogue of generic_val_print_bool. gdb/ChangeLog 2020-03-13 Tom Tromey * valprint.c (generic_value_print_bool): New function. (generic_value_print): Use it. Diff: --- gdb/ChangeLog | 5 +++++ gdb/valprint.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c969b12bcad..1d15ca6c24a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-03-13 Tom Tromey + + * valprint.c (generic_value_print_bool): New function. + (generic_value_print): Use it. + 2020-03-13 Tom Tromey * valprint.c (generic_val_print_func): Simplify. diff --git a/gdb/valprint.c b/gdb/valprint.c index 0517bf089f3..56a2e99c860 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -789,6 +789,35 @@ generic_val_print_bool (struct type *type, } } +/* generic_value_print helper for TYPE_CODE_BOOL. */ + +static void +generic_value_print_bool + (struct value *value, struct ui_file *stream, + const struct value_print_options *options, + const struct generic_val_print_decorations *decorations) +{ + if (options->format || options->output_format) + { + struct value_print_options opts = *options; + opts.format = (options->format ? options->format + : options->output_format); + value_print_scalar_formatted (value, &opts, 0, stream); + } + else + { + const gdb_byte *valaddr = value_contents_for_printing (value); + struct type *type = check_typedef (value_type (value)); + LONGEST val = unpack_long (type, valaddr); + if (val == 0) + fputs_filtered (decorations->false_name, stream); + else if (val == 1) + fputs_filtered (decorations->true_name, stream); + else + print_longest (stream, 'd', 0, val); + } +} + /* generic_val_print helper for TYPE_CODE_INT. */ static void @@ -1090,8 +1119,7 @@ generic_value_print (struct value *val, struct ui_file *stream, int recurse, break; case TYPE_CODE_BOOL: - generic_val_print_bool (type, 0, stream, - val, options, decorations); + generic_value_print_bool (val, stream, options, decorations); break; case TYPE_CODE_RANGE: