From 447b483c37a0e0a04fd88756f1f731e6a28217cd Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 14 Jan 2011 19:32:56 +0000 Subject: [PATCH] Fix printing of Wide_Character & Wide_Wide_Character entities. Wide_Characters and Wide_Wide_Characters are incorrectly printed. Consider for instance: Medium : Wide_Character := Wide_Character'Val(16#dead#); Trying to print the value of this variable yields: (gdb) p medium $1 = 57005 '["ad"]' The integer value is correct (57005 = 0xdead), but the character representation is not, it should be: $1 = 57005 '["dead"]' Same for Wide_Wide_Characters. There were two issues: (a) The first issue was in ada-valprint, where we were assuming that character types were 1 byte long; (b) The second problem was in c-valprint, where we were down-casting the integer value of the character to type `unsigned char', causing use to lose all but the lowest byte. gdb/ChangeLog: * ada-valprint. (ada_printchar): Use the correct type length in call to ada_emit_char. * c-valprint.c (c_val_print): Remove cast in call to LA_PRINT_CHAR. --- gdb/ChangeLog | 6 ++++++ gdb/ada-valprint.c | 2 +- gdb/c-valprint.c | 6 ++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1067186519a..8b6de016c19 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-01-14 Joel Brobecker + + * ada-valprint. (ada_printchar): Use the correct type length + in call to ada_emit_char. + * c-valprint.c (c_val_print): Remove cast in call to LA_PRINT_CHAR. + 2011-01-14 Pierre Muller * solib-som.h (hpux_major_release): Declare variable here. diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index 630ceb5db13..ee3761725fb 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -368,7 +368,7 @@ void ada_printchar (int c, struct type *type, struct ui_file *stream) { fputs_filtered ("'", stream); - ada_emit_char (c, type, stream, '\'', 1); + ada_emit_char (c, type, stream, '\'', TYPE_LENGTH (type)); fputs_filtered ("'", stream); } diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 0c23c7e1eca..c6d3eae0569 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -536,9 +536,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr, if (c_textual_element_type (unresolved_type, options->format)) { fputs_filtered (" ", stream); - LA_PRINT_CHAR ((unsigned char) unpack_long (type, - valaddr - + embedded_offset), + LA_PRINT_CHAR (unpack_long (type, valaddr + embedded_offset), unresolved_type, stream); } } @@ -561,7 +559,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr, else fprintf_filtered (stream, "%d", (int) val); fputs_filtered (" ", stream); - LA_PRINT_CHAR ((unsigned char) val, unresolved_type, stream); + LA_PRINT_CHAR (val, unresolved_type, stream); } break; -- 2.30.2