diff options
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/ada-valprint.c | 3 | ||||
| -rw-r--r-- | gdb/c-valprint.c | 4 | ||||
| -rw-r--r-- | gdb/f-valprint.c | 3 | ||||
| -rw-r--r-- | gdb/valprint.c | 60 | ||||
| -rw-r--r-- | gdb/valprint.h | 3 |
6 files changed, 23 insertions, 62 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ec006f5..2956819 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,17 @@ 2017-06-12 Tom Tromey <tom@tromey.com> + * valprint.h (val_print_type_code_int): Remove. + * valprint.c (generic_val_print_int): Always call + val_print_scalar_formatted. + (val_print_type_code_int): Remove. + * printcmd.c (print_scalar_formatted): Handle options->format==0. + * f-valprint.c (f_val_print): Use val_print_scalar_formatted. + * c-valprint.c (c_val_print_int): Use val_print_scalar_formatted. + * ada-valprint.c (ada_val_print_num): Use + val_print_scalar_formatted. + +2017-06-12 Tom Tromey <tom@tromey.com> + * printcmd.c (print_scalar_formatted): Unify the two switches. Don't convert scalars to LONGEST. diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index d2489a2..8095eed 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -859,7 +859,8 @@ ada_val_print_num (struct type *type, const gdb_byte *valaddr, } else { - val_print_type_code_int (type, valaddr + offset_aligned, stream); + val_print_scalar_formatted (type, offset_aligned, + original_value, options, 0, stream); if (ada_is_character_type (type)) { LONGEST c; diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index ab1de5c..653fed6 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -454,8 +454,8 @@ c_val_print_int (struct type *type, struct type *unresolved_type, } else { - val_print_type_code_int (type, valaddr + embedded_offset * unit_size, - stream); + val_print_scalar_formatted (type, embedded_offset, + original_value, options, 0, stream); /* C and C++ has no single byte int type, char is used instead. Since we don't know whether the value is really intended to be used as an integer or a character, print diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index a517406..4234447 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -311,7 +311,8 @@ f_val_print (struct type *type, int embedded_offset, } else { - val_print_type_code_int (type, valaddr + embedded_offset, stream); + val_print_scalar_formatted (type, embedded_offset, + original_value, options, 0, stream); /* C and C++ has no single byte int type, char is used instead. Since we don't know whether the value is really intended to be used as an integer or a character, print the character diff --git a/gdb/valprint.c b/gdb/valprint.c index 2420fb5..e627e85 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -781,25 +781,12 @@ generic_val_print_int (struct type *type, struct value *original_value, const struct value_print_options *options) { - struct gdbarch *gdbarch = get_type_arch (type); - int unit_size = gdbarch_addressable_memory_unit_size (gdbarch); - - 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, embedded_offset, - original_value, &opts, 0, stream); - } - else - { - const gdb_byte *valaddr = value_contents_for_printing (original_value); + struct value_print_options opts = *options; - val_print_type_code_int (type, valaddr + embedded_offset * unit_size, - stream); - } + opts.format = (options->format ? options->format + : options->output_format); + val_print_scalar_formatted (type, embedded_offset, + original_value, &opts, 0, stream); } /* generic_val_print helper for TYPE_CODE_CHAR. */ @@ -1237,43 +1224,6 @@ value_print (struct value *val, struct ui_file *stream, LA_VALUE_PRINT (val, stream, options); } -/* Called by various <lang>_val_print routines to print - TYPE_CODE_INT's. TYPE is the type. VALADDR is the address of the - value. STREAM is where to print the value. */ - -void -val_print_type_code_int (struct type *type, const gdb_byte *valaddr, - struct ui_file *stream) -{ - enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type)); - - if (TYPE_LENGTH (type) > sizeof (LONGEST)) - { - LONGEST val; - - if (TYPE_UNSIGNED (type) - && extract_long_unsigned_integer (valaddr, TYPE_LENGTH (type), - byte_order, &val)) - { - print_longest (stream, 'u', 0, val); - } - else - { - /* Signed, or we couldn't turn an unsigned value into a - LONGEST. For signed values, one could assume two's - complement (a reasonable assumption, I think) and do - better than this. */ - print_hex_chars (stream, (unsigned char *) valaddr, - TYPE_LENGTH (type), byte_order, false); - } - } - else - { - print_longest (stream, TYPE_UNSIGNED (type) ? 'u' : 'd', 0, - unpack_long (type, valaddr)); - } -} - static void val_print_type_code_flags (struct type *type, const gdb_byte *valaddr, struct ui_file *stream) diff --git a/gdb/valprint.h b/gdb/valprint.h index f71d4ab..302626d 100644 --- a/gdb/valprint.h +++ b/gdb/valprint.h @@ -121,9 +121,6 @@ extern void val_print_array_elements (struct type *, LONGEST, const struct value_print_options *, unsigned int); -extern void val_print_type_code_int (struct type *, const gdb_byte *, - struct ui_file *); - extern void val_print_scalar_formatted (struct type *, LONGEST, struct value *, |