From 65786af6265044c67b25db23267f942c73b6fc20 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 13 Mar 2020 17:39:52 -0600 Subject: [PATCH] Remove generic_val_print_flags This remove generic_val_print_flags in favor of using the value-based API where possible. gdb/ChangeLog 2020-03-13 Tom Tromey * valprint.c (generic_val_print_flags): Remove. (generic_val_print, generic_value_print): Update. (val_print_type_code_flags): Add original_value parameter. --- gdb/ChangeLog | 6 ++++++ gdb/valprint.c | 43 ++++++++++++++++--------------------------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f812cd75339..38e9fb7e483 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-03-13 Tom Tromey + + * valprint.c (generic_val_print_flags): Remove. + (generic_val_print, generic_value_print): Update. + (val_print_type_code_flags): Add original_value parameter. + 2020-03-13 Tom Tromey * valprint.c (generic_val_print): Update. diff --git a/gdb/valprint.c b/gdb/valprint.c index 9362bdab2b2..499d03f16dc 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -88,7 +88,8 @@ static void set_input_radix_1 (int, unsigned); static void set_output_radix_1 (int, unsigned); static void val_print_type_code_flags (struct type *type, - const gdb_byte *valaddr, + struct value *original_value, + int embedded_offset, struct ui_file *stream); #define PRINT_MAX_DEFAULT 200 /* Start print_max off at this value. */ @@ -730,26 +731,6 @@ generic_val_print_enum (struct type *type, generic_val_print_enum_1 (type, val, stream); } -/* generic_val_print helper for TYPE_CODE_FLAGS. */ - -static void -generic_val_print_flags (struct type *type, - int embedded_offset, struct ui_file *stream, - struct value *original_value, - const struct value_print_options *options) - -{ - if (options->format) - val_print_scalar_formatted (type, embedded_offset, original_value, - options, 0, stream); - else - { - const gdb_byte *valaddr = value_contents_for_printing (original_value); - - val_print_type_code_flags (type, valaddr + embedded_offset, stream); - } -} - /* generic_val_print helper for TYPE_CODE_FUNC and TYPE_CODE_METHOD. */ static void @@ -980,8 +961,12 @@ generic_val_print (struct type *type, break; case TYPE_CODE_FLAGS: - generic_val_print_flags (type, embedded_offset, stream, - original_value, options); + if (options->format) + val_print_scalar_formatted (type, embedded_offset, + original_value, options, 0, stream); + else + val_print_type_code_flags (type, original_value, embedded_offset, + stream); break; case TYPE_CODE_FUNC: @@ -1091,8 +1076,10 @@ generic_value_print (struct value *val, struct ui_file *stream, int recurse, break; case TYPE_CODE_FLAGS: - generic_val_print_flags (type, 0, stream, - val, options); + if (options->format) + value_print_scalar_formatted (val, options, 0, stream); + else + val_print_type_code_flags (type, val, 0, stream); break; case TYPE_CODE_FUNC: @@ -1411,9 +1398,11 @@ value_print (struct value *val, struct ui_file *stream, } static void -val_print_type_code_flags (struct type *type, const gdb_byte *valaddr, - struct ui_file *stream) +val_print_type_code_flags (struct type *type, struct value *original_value, + int embedded_offset, struct ui_file *stream) { + const gdb_byte *valaddr = (value_contents_for_printing (original_value) + + embedded_offset); ULONGEST val = unpack_long (type, valaddr); int field, nfields = TYPE_NFIELDS (type); struct gdbarch *gdbarch = get_type_arch (type); -- 2.30.2