diff options
| author | Tom Tromey <tom@tromey.com> | 2020-03-13 17:39:52 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2020-03-13 18:03:41 -0600 |
| commit | 6dde752183769c712eb22f49a5b74bfadad4a6be (patch) | |
| tree | 1ce1dc7e029e3a5fa3bf654ef552686037942084 | |
| parent | 4112d2e602fed7157ce6bb30f46969129633d0f2 (diff) | |
| download | gdb-6dde752183769c712eb22f49a5b74bfadad4a6be.zip gdb-6dde752183769c712eb22f49a5b74bfadad4a6be.tar.gz gdb-6dde752183769c712eb22f49a5b74bfadad4a6be.tar.bz2 | |
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 <tom@tromey.com>
* valprint.c (generic_value_print_bool): New function.
(generic_value_print): Use it.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/valprint.c | 32 |
2 files changed, 35 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c969b12..1d15ca6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2020-03-13 Tom Tromey <tom@tromey.com> + * valprint.c (generic_value_print_bool): New function. + (generic_value_print): Use it. + +2020-03-13 Tom Tromey <tom@tromey.com> + * valprint.c (generic_val_print_func): Simplify. (generic_val_print, generic_value_print): Update. diff --git a/gdb/valprint.c b/gdb/valprint.c index 0517bf0..56a2e99 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: |