* jv-valprint.c (java_val_print): Handle `char' as a special case

of TYPE_CODE_INT.
This commit is contained in:
Tom Tromey 2002-05-09 18:23:41 +00:00
parent 35928259ea
commit c55a3f731b
2 changed files with 12 additions and 8 deletions

View File

@ -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],

View File

@ -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;