From ab2188aa2a7958d3954f98229002036867278636 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 25 Jan 2011 17:59:00 +0000 Subject: * printcmd.c (print_formatted): Use val_print_scalar_formatted instead of print_scalar_formatted. (print_scalar_formatted): Don't handle 's' format strings here, and add an assertion that we never see such format here. * valprint.h (val_print_scalar_formatted): Declare. * valprint.c (val_print_scalar_formatted): New. * c-valprint.c (c_val_print): Use val_print_scalar_formatted instead of print_scalar_formatted. * jv-valprint.c (java_val_print): Ditto. * p-valprint.c (pascal_val_print): Ditto. * ada-valprint.c (ada_val_print_1): Ditto. * f-valprint.c (f_val_print): Ditto. * infcmd.c (registers_info): Ditto. * m2-valprint.c (m2_val_print): Ditto. --- gdb/c-valprint.c | 56 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 27 deletions(-) (limited to 'gdb/c-valprint.c') diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index bbe55888b1a..3bd4db25650 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -248,8 +248,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_MEMBERPTR: if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); break; } cp_print_class_member (valaddr + embedded_offset, type, stream, "&"); @@ -262,8 +262,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_PTR: if (options->format && options->format != 's') { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); break; } if (options->vtblprint && cp_is_vtbl_ptr_type (type)) @@ -432,8 +432,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_ENUM: if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); break; } len = TYPE_NFIELDS (type); @@ -458,8 +458,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_FLAGS: if (options->format) - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); else val_print_type_code_flags (type, valaddr + embedded_offset, stream); @@ -469,8 +469,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_METHOD: if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); break; } /* FIXME, we should consider, at least for ANSI C language, @@ -489,8 +489,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, struct value_print_options opts = *options; opts.format = (options->format ? options->format : options->output_format); - print_scalar_formatted (valaddr + embedded_offset, type, - &opts, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, &opts, 0, stream); } else { @@ -521,8 +521,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, opts.format = (options->format ? options->format : options->output_format); - print_scalar_formatted (valaddr + embedded_offset, type, - &opts, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, &opts, 0, stream); } else { @@ -547,8 +547,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, struct value_print_options opts = *options; opts.format = (options->format ? options->format : options->output_format); - print_scalar_formatted (valaddr + embedded_offset, type, - &opts, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, &opts, 0, stream); } else { @@ -565,8 +565,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_FLT: if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); } else { @@ -576,8 +576,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_DECFLOAT: if (options->format) - print_scalar_formatted (valaddr + embedded_offset, type, - options, 0, stream); + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); else print_decimal_floating (valaddr + embedded_offset, type, stream); @@ -601,19 +601,21 @@ c_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_COMPLEX: if (options->format) - print_scalar_formatted (valaddr + embedded_offset, - TYPE_TARGET_TYPE (type), - options, 0, stream); + val_print_scalar_formatted (TYPE_TARGET_TYPE (type), + valaddr, embedded_offset, + original_value, options, 0, stream); else print_floating (valaddr + embedded_offset, TYPE_TARGET_TYPE (type), stream); fprintf_filtered (stream, " + "); if (options->format) - print_scalar_formatted (valaddr + embedded_offset - + TYPE_LENGTH (TYPE_TARGET_TYPE (type)), - TYPE_TARGET_TYPE (type), - options, 0, stream); + val_print_scalar_formatted (TYPE_TARGET_TYPE (type), + valaddr, + embedded_offset + + TYPE_LENGTH (TYPE_TARGET_TYPE (type)), + original_value, + options, 0, stream); else print_floating (valaddr + embedded_offset + TYPE_LENGTH (TYPE_TARGET_TYPE (type)), -- cgit v1.2.1