* xtensa-modules.c: Remove comment indicating that this is a

[deliverable/binutils-gdb.git] / gdb / jv-valprint.c

diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index 73fff27199b4210ed5ed7cec026e9d9d4e9e8e34..f25cd09905fadc96ddfc6e47f720f64e063c2b7f 100644 (file)
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -30,6 +30,7 @@
 #include "jv-lang.h"
 #include "c-lang.h"
 #include "annotate.h"
+#include "gdb_string.h"
 
 /* Local functions */
 
@@ -198,8 +199,9 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
 
   if (TYPE_CODE (type) == TYPE_CODE_PTR
       && TYPE_TARGET_TYPE (type)
-      && TYPE_NAME (TYPE_TARGET_TYPE (type))
-      && strcmp (TYPE_NAME (TYPE_TARGET_TYPE (type)), "java.lang.String") == 0
+      && TYPE_TAG_NAME (TYPE_TARGET_TYPE (type))
+      && strcmp (TYPE_TAG_NAME (TYPE_TARGET_TYPE (type)),
+                "java.lang.String") == 0
       && (format == 0 || format == 's')
       && address != 0
       && value_as_address (val) != 0)
@@ -497,18 +499,17 @@ java_val_print (struct type *type, char *valaddr, int embedded_offset,
       return i;
 
     case TYPE_CODE_CHAR:
-      format = format ? format : output_format;
-      if (format)
-       print_scalar_formatted (valaddr, type, format, 0, stream);
-      else
-       LA_PRINT_CHAR ((int) unpack_long (type, valaddr), stream);
-      break;
-
     case TYPE_CODE_INT:
-      /* Can't just call c_val_print because that print bytes as C chars. */
+      /* Can't just call c_val_print because that prints bytes as C
+        chars.  */
       format = format ? format : output_format;
       if (format)
        print_scalar_formatted (valaddr, type, format, 0, stream);
+      else if (TYPE_CODE (type) == TYPE_CODE_CHAR
+              || (TYPE_CODE (type) == TYPE_CODE_INT
+                  && TYPE_LENGTH (type) == 2
+                  && strcmp (TYPE_NAME (type), "char") == 0))
+       LA_PRINT_CHAR ((int) unpack_long (type, valaddr), stream);
       else
        val_print_type_code_int (type, valaddr, stream);
       break;