From d93880bd1cd10d0ccf5346e261d5d145d50d8ab0 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 27 Jul 2015 14:11:22 -0400 Subject: [PATCH] Factor out flags printing code from generic_val_print gdb/ChangeLog: * valprint.c (generic_val_print): Factor out flags printing code to ... (generic_val_print_flags): ... this new function. --- gdb/ChangeLog | 6 ++++++ gdb/valprint.c | 24 ++++++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e16a24eb8ae..4c6e17c7d1b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-07-27 Simon Marchi + + * valprint.c (generic_val_print): Factor out flags + printing code to ... + (generic_val_print_flags): ... this new function. + 2015-07-27 Simon Marchi * valprint.c (generic_val_print): Factor out enum diff --git a/gdb/valprint.c b/gdb/valprint.c index f9d603a1896..d05b9075c8c 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -578,6 +578,22 @@ generic_val_print_enum (struct type *type, const gdb_byte *valaddr, print_longest (stream, 'd', 0, val); } +/* generic_val_print helper for TYPE_CODE_FLAGS. */ + +static void +generic_val_print_flags (struct type *type, const gdb_byte *valaddr, + int embedded_offset, struct ui_file *stream, + const struct value *original_value, + const struct value_print_options *options) + +{ + if (options->format) + val_print_scalar_formatted (type, valaddr, embedded_offset, original_value, + options, 0, stream); + else + val_print_type_code_flags (type, valaddr + embedded_offset, 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 @@ -630,12 +646,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_FLAGS: - if (options->format) - val_print_scalar_formatted (type, valaddr, embedded_offset, - original_value, options, 0, stream); - else - val_print_type_code_flags (type, valaddr + embedded_offset, - stream); + generic_val_print_flags (type, valaddr, embedded_offset, stream, + original_value, options); break; case TYPE_CODE_FUNC: -- 2.30.2