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/p-valprint.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gdb/p-valprint.c') diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c index f803ddc..ca7606a 100644 --- a/gdb/p-valprint.c +++ b/gdb/p-valprint.c @@ -139,8 +139,8 @@ pascal_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 && pascal_object_is_vtbl_ptr_type (type)) @@ -337,8 +337,8 @@ pascal_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); @@ -363,8 +363,8 @@ pascal_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); break; @@ -372,8 +372,8 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_FUNC: 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, eliminating @@ -392,8 +392,8 @@ pascal_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 { @@ -427,8 +427,8 @@ pascal_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 { @@ -443,8 +443,8 @@ pascal_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 { @@ -461,8 +461,8 @@ pascal_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 { -- cgit v1.1