From: Joel Brobecker <brobecker@gnat.com>
Date: Fri, 14 Jan 2011 20:18:21 +0000 (+0000)
Subject: Fix printing of Wide_Character & Wide_Wide_Character entities.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=384e9296f48f49db7620df6d8294131212f66339;p=thirdparty%2Fbinutils-gdb.git

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.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0e01c044c71..4edda80c5c3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-14  Joel Brobecker  <brobecker@adacore.com>
+
+	* 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  Joel Brobecker  <brobecker@adacore.com>
 
 	* ada-valprint.c (ada_emit_char): Remove strange code.
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index ea8450684d7..c9a8c94628d 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 f0895a4d9c1..85ca3543ef0 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -507,7 +507,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 	  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);
 	    }
 	}
@@ -530,7 +530,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 	  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;