diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/jv-valprint.c | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3e8f9eb787b..0595f37571f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2002-05-09 Tom Tromey <tromey@redhat.com> + + * jv-valprint.c (java_val_print): Handle `char' as a special case + of TYPE_CODE_INT. + 2002-05-09 Michael Snyder <msnyder@redhat.com> * arm-tdep.c (arm_scan_prologue): Accept strb r(0123),[r11,#-nn], diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c index 73fff27199b..f0fd0f5ea25 100644 --- a/gdb/jv-valprint.c +++ b/gdb/jv-valprint.c @@ -497,18 +497,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; |