6c7a06a3fa
2009-03-19 Tom Tromey <tromey@redhat.com> Julian Brown <julian@codesourcery.com> PR i18n/7220, PR i18n/7821, PR exp/8815, PR exp/9103, PR i18n/9401, PR exp/9613: * NEWS: Update * value.h (value_typed_string): Declare. (val_print_string): Update. * valprint.h (print_char_chars): Update. * valprint.c (print_char_chars): Add type argument. Update. (val_print_string): Likewise. * valops.c (value_typed_string): New function. * utils.c (host_char_to_target): New function. (parse_escape): Use host_char_to_target, host_hex_value. Update. Remove '^' case. (no_control_char_error): Remove. * typeprint.c (print_type_scalar): Update. * scm-valprint.c (scm_scmval_print): Update. * scm-lang.h (scm_printchar, scm_printstr): Update. * scm-lang.c (scm_printchar): Add type argument. (scm_printstr): Likewise. * printcmd.c (print_formatted): Update. (print_scalar_formatted): Update. (printf_command) <wide_string_arg, wide_char_arg>: New constants. Handle '%lc' and '%ls'. * parser-defs.h (struct typed_stoken): New type. (struct stoken_vector): Likewise. (write_exp_string_vector): Declare. * parse.c (write_exp_string_vector): New function. * p-valprint.c (pascal_val_print): Update. * p-lang.h (is_pascal_string_type, pascal_printchar, pascal_printstr): Update. * p-lang.c (is_pascal_string_type): Remove 'char_size' argument. Add 'char_type' argument. (pascal_emit_char): Add type argument. (pascal_printchar): Likewise. (pascal_printstr): Likewise. * objc-lang.c (objc_emit_char): Add type argument. (objc_printchar): Likewise. (objc_printstr): Likewise. * macroexp.c (get_character_constant): Handle unicode characters. Use c_parse_escape. (get_string_literal): Handle unicode strings. Use c_parse_escape. * m2-valprint.c (print_unpacked_pointer): Update. (m2_print_array_contents): Update. (m2_val_print): Update. * m2-lang.c (m2_emit_char): Add type argument. (m2_printchar): Likewise. (m2_printstr): Likewise. * language.h (struct language_defn) <la_printchar>: Add type argument. <la_printstr, la_emitchar>: Likewise. (LA_PRINT_CHAR): Likewise. (LA_PRINT_STRING): Likewise. (LA_EMIT_CHAR): Likewise. * language.c (unk_lang_emit_char): Add type argument. (unk_lang_printchar): Likewise. (unk_lang_printstr): Likewise. * jv-valprint.c (java_val_print): Update. * jv-lang.c (java_emit_char): Add type argument. * f-valprint.c (f_val_print): Update. * f-lang.c (f_emit_char): Add type argument. (f_printchar): Likewise. (f_printstr): Likewise. * expprint.c (print_subexp_standard): Update. * charset.h (target_wide_charset): Declare. (c_target_char_has_backslash_escape, c_parse_backslash, host_char_print_literally, host_char_to_target, target_char_to_host, target_char_to_control_char): Remove. (enum transliterations): New type. (convert_between_encodings): Declare. (HOST_ESCAPE_CHAR): New define. (host_letter_to_control_character, host_hex_value): Declare. (enum wchar_iterate_result): New enum. (struct wchar_iterator): Declare. (make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator, wchar_push_back): Declare. * charset-list.h: New file. * c-valprint.c (textual_name): New function. (textual_element_type): Handle wide character types. (c_val_print): Pass original type to textual_element_type. Handle wide character types. (c_value_print): Use textual_element_type. Pass original type of value to val_print. * c-lang.h (enum c_string_type): New type. (c_printchar, c_printstr): Update. * c-lang.c (classify_type): New function. (print_wchar): Likewise. (c_emit_char): Add type argument. Handle wide characters. (c_printchar): Likewise. (c_printstr): Add type argument. Handle wide and multibyte character sets. (convert_ucn): New function. (emit_numeric_character): Likewise. (convert_octal): Likewise. (convert_hex): Likewise. (ADVANCE): New macro. (convert_escape): New function. (parse_one_string): Likewise. (evaluate_subexp_c): Likewise. (exp_descriptor_c): New global. (c_language_defn): Use exp_descriptor_c. (cplus_language_defn): Likewise. (asm_language_defn): Likewise. (minimal_language_defn): Likewise. (charset_for_string_type): New function. * c-exp.y (%union): Add 'svec' and 'tsval'. (CHAR): New token. (exp): Add CHAR production. (string_exp): Rewrite. (exp) <string_exp>: Rewrite. (tempbuf): Now global. (tempbuf_init): New global. (parse_string_or_char): New function. (yylex) <tempbuf>: Now global. <tokptr, tempbufindex, tempbufsize, token_string, class_prefix>: Remove. Handle 'u', 'U', and 'L' prefixes. Call parse_string_or_char. (c_parse_escape): New function. * auxv.c (fprint_target_auxv): Update. * ada-valprint.c (ada_emit_char): Add type argument. (ada_printchar): Likewise. (ada_print_scalar): Update. (printstr): Add type argument. Update calls to ada_emit_char. (ada_printstr): Add type argument. (ada_val_print_array): Update. (ada_val_print_1): Likewise. * ada-lang.c (emit_char): Add type argument. * ada-lang.h (ada_emit_char, ada_printchar, ada_printstr): Add type arguments. * gdb_locale.h: Include langinfo.h. * charset.c (_initialize_charset): Set default host charset from the locale. Don't register charsets. Add target-wide-charset commands. Call find_charset_names. (struct charset, struct translation): Remove. (GDB_DEFAULT_HOST_CHARSET): Remove. (GDB_DEFAULT_TARGET_WIDE_CHARSET): New define. (target_wide_charset_name): New global. (show_host_charset_name): Handle "auto". (show_target_wide_charset_name): New function. (host_charset_enum, target_charset_enum): Remove. (charset_enum): New global. (all_charsets, register_charset, lookup_charset, all_translations, register_translation, lookup_translation): Remove. (simple_charset, ascii_print_literally, ascii_to_control): Remove. (iso_8859_print_literally, iso_8859_to_control, iso_8859_family_charset): Remove. (ebcdic_print_literally, ebcdic_to_control, ebcdic_family_charset): Remove. (struct cached_iconv, check_iconv_cache, cached_iconv_convert, register_iconv_charsets): Remove. (target_wide_charset_be_name, target_wide_charset_le_name): New globals. (identity_either_char_to_other): Remove. (set_be_le_names, validate): New functions. (backslashable, backslashed, represented): Remove. (default_c_target_char_has_backslash_escape): Remove. (default_c_parse_backslash, iconv_convert): Remove. (ascii_to_iso_8859_1_table, ascii_to_ebcdic_us_table, ascii_to_ibm1047_table, iso_8859_1_to_ascii_table, iso_8859_1_to_ebcdic_us_table, iso_8859_1_to_ibm1047_table, ebcdic_us_to_ascii_table, ebcdic_us_to_iso_8859_1_table, ebcdic_us_to_ibm1047_table, ibm1047_to_ascii_table, ibm1047_to_iso_8859_1_table, ibm1047_to_ebcdic_us_table): Remove. (table_convert_char, table_translation, simple_table_translation): Remove. (current_host_charset, current_target_charset, c_target_char_has_backslash_escape_func, c_target_char_has_backslash_escape_baton): Remove. (c_parse_backslash_func, c_parse_backslash_baton): Remove. (host_char_to_target_func, host_char_to_target_baton): Remove. (target_char_to_host_func, target_char_to_host_baton): Remove. (cached_iconv_host_to_target, cached_iconv_target_to_host): Remove. (lookup_charset_or_error, check_valid_host_charset): Remove. (set_host_and_target_charsets): Remove. (set_host_charset, set_target_charset): Remove. (set_host_charset_sfunc, set_target_charset_sfunc): Rewrite. (set_target_wide_charset_sfunc): New function. (show_charset): Print target wide character set. (host_charset, target_charset): Rewrite. (target_wide_charset): New function. (c_target_char_has_backslash_escape): Remove. (c_parse_backslash): Remove. (host_letter_to_control_character): New function. (host_char_print_literally): Remove. (host_hex_value): New function. (target_char_to_control_char): Remove. (cleanup_iconv): New function. (convert_between_encodings): New function. (target_char_to_host): Remove. (struct wchar_iterator): Define. (make_wchar_iterator, make_cleanup_wchar_iterator, wchar_iterator, wchar_push_back): New functions. (do_cleanup_iterator): New function. (char_ptr): New typedef. (charsets): New global. (add_one, find_charset_names): New functions. (default_charset_names): New global. (auto_host_charset_name): Likewise. * aclocal.m4, config.in, configure: Rebuild. * configure.ac: Call AM_LANGINFO_CODESET. (GDB_DEFAULT_HOST_CHARSET): Default to UTF-8. (AM_ICONV): Invoke earlier. * acinclude.m4: Include codeset.m4. Subst LIBICONV_INCLUDE and LIBICONV_LIBDIR. Check for libiconv in build tree. * Makefile.in (LIBICONV_LIBDIR, LIBICONV_INCLUDE): New macros. (INTERNAL_CFLAGS_BASE): Add LIBICONV_INCLUDE. (INTERNAL_LDFLAGS): Add LIBICONV_LIBDIR. * gdb_obstack.h (obstack_grow_wstr): New define. * gdb_wchar.h: New file. * defs.h: Include it. gdb/testsuite: * gdb.base/store.exp: Update for change to escape output. * gdb.base/callfuncs.exp (fetch_all_registers): Update for change to escape output. * gdb.base/pointers.exp: Update for change to escape output. * gdb.base/long_long.exp (gdb_test_long_long): Update for change to escape output. * gdb.base/constvars.exp (do_constvar_tests): Update for change to escape output. * gdb.base/call-rt-st.exp (print_struct_call): Update for change to escape output. * gdb.cp/ref-types.exp (gdb_start_again): Update for change to escape output. * gdb.base/setvar.exp: Update for change to escape output. * lib/gdb.exp (default_gdb_start): Set LC_CTYPE to C. * gdb.base/printcmds.exp (test_print_all_chars): Update for change to escape output. (test_print_string_constants): Likewise. * gdb.base/charset.exp (valid_host_charset): Check size of wchar_t. Handle UCS-2 and UCS-4. Add tests for wide and unicode cases. Handle "auto"-related output. * gdb.base/charset.c (char16_t, char32_t): New typedefs. (uvar, Uvar): New globals. gdb/doc: * gdb.texinfo (Character Sets): Remove obsolete text. Document set target-wide-charset. (Requirements): Mention iconv.
540 lines
15 KiB
C
540 lines
15 KiB
C
/* Support for printing Java values for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
|
|
2008, 2009 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "symtab.h"
|
|
#include "gdbtypes.h"
|
|
#include "gdbcore.h"
|
|
#include "expression.h"
|
|
#include "value.h"
|
|
#include "demangle.h"
|
|
#include "valprint.h"
|
|
#include "language.h"
|
|
#include "jv-lang.h"
|
|
#include "c-lang.h"
|
|
#include "annotate.h"
|
|
#include "gdb_string.h"
|
|
|
|
/* Local functions */
|
|
|
|
int
|
|
java_value_print (struct value *val, struct ui_file *stream,
|
|
const struct value_print_options *options)
|
|
{
|
|
struct type *type;
|
|
CORE_ADDR address;
|
|
int i;
|
|
char *name;
|
|
struct value_print_options opts;
|
|
|
|
type = value_type (val);
|
|
address = VALUE_ADDRESS (val) + value_offset (val);
|
|
|
|
if (is_object_type (type))
|
|
{
|
|
CORE_ADDR obj_addr;
|
|
|
|
/* Get the run-time type, and cast the object into that */
|
|
|
|
obj_addr = unpack_pointer (type, value_contents (val));
|
|
|
|
if (obj_addr != 0)
|
|
{
|
|
type = type_from_class (java_class_from_object (val));
|
|
type = lookup_pointer_type (type);
|
|
|
|
val = value_at (type, address);
|
|
}
|
|
}
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR && !value_logical_not (val))
|
|
type_print (TYPE_TARGET_TYPE (type), "", stream, -1);
|
|
|
|
name = TYPE_TAG_NAME (type);
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT && name != NULL
|
|
&& (i = strlen (name), name[i - 1] == ']'))
|
|
{
|
|
gdb_byte buf4[4];
|
|
long length;
|
|
unsigned int things_printed = 0;
|
|
int reps;
|
|
struct type *el_type = java_primitive_type_from_name (name, i - 2);
|
|
|
|
i = 0;
|
|
read_memory (address + JAVA_OBJECT_SIZE, buf4, 4);
|
|
|
|
length = (long) extract_signed_integer (buf4, 4);
|
|
fprintf_filtered (stream, "{length: %ld", length);
|
|
|
|
if (el_type == NULL)
|
|
{
|
|
CORE_ADDR element;
|
|
CORE_ADDR next_element = -1; /* dummy initial value */
|
|
|
|
address += JAVA_OBJECT_SIZE + 4; /* Skip object header and length. */
|
|
|
|
while (i < length && things_printed < options->print_max)
|
|
{
|
|
gdb_byte *buf;
|
|
|
|
buf = alloca (gdbarch_ptr_bit (current_gdbarch) / HOST_CHAR_BIT);
|
|
fputs_filtered (", ", stream);
|
|
wrap_here (n_spaces (2));
|
|
|
|
if (i > 0)
|
|
element = next_element;
|
|
else
|
|
{
|
|
read_memory (address, buf, sizeof (buf));
|
|
address += gdbarch_ptr_bit (current_gdbarch) / HOST_CHAR_BIT;
|
|
/* FIXME: cagney/2003-05-24: Bogus or what. It
|
|
pulls a host sized pointer out of the target and
|
|
then extracts that as an address (while assuming
|
|
that the address is unsigned)! */
|
|
element = extract_unsigned_integer (buf, sizeof (buf));
|
|
}
|
|
|
|
for (reps = 1; i + reps < length; reps++)
|
|
{
|
|
read_memory (address, buf, sizeof (buf));
|
|
address += gdbarch_ptr_bit (current_gdbarch) / HOST_CHAR_BIT;
|
|
/* FIXME: cagney/2003-05-24: Bogus or what. It
|
|
pulls a host sized pointer out of the target and
|
|
then extracts that as an address (while assuming
|
|
that the address is unsigned)! */
|
|
next_element = extract_unsigned_integer (buf, sizeof (buf));
|
|
if (next_element != element)
|
|
break;
|
|
}
|
|
|
|
if (reps == 1)
|
|
fprintf_filtered (stream, "%d: ", i);
|
|
else
|
|
fprintf_filtered (stream, "%d..%d: ", i, i + reps - 1);
|
|
|
|
if (element == 0)
|
|
fprintf_filtered (stream, "null");
|
|
else
|
|
fprintf_filtered (stream, "@%s", paddr_nz (element));
|
|
|
|
things_printed++;
|
|
i += reps;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
struct value *v = allocate_value (el_type);
|
|
struct value *next_v = allocate_value (el_type);
|
|
|
|
VALUE_ADDRESS (v) = address + JAVA_OBJECT_SIZE + 4;
|
|
VALUE_ADDRESS (next_v) = VALUE_ADDRESS (v);
|
|
|
|
while (i < length && things_printed < options->print_max)
|
|
{
|
|
fputs_filtered (", ", stream);
|
|
wrap_here (n_spaces (2));
|
|
|
|
if (i > 0)
|
|
{
|
|
struct value *tmp;
|
|
|
|
tmp = next_v;
|
|
next_v = v;
|
|
v = tmp;
|
|
}
|
|
else
|
|
{
|
|
set_value_lazy (v, 1);
|
|
set_value_offset (v, 0);
|
|
}
|
|
|
|
set_value_offset (next_v, value_offset (v));
|
|
|
|
for (reps = 1; i + reps < length; reps++)
|
|
{
|
|
set_value_lazy (next_v, 1);
|
|
set_value_offset (next_v, value_offset (next_v) + TYPE_LENGTH (el_type));
|
|
if (memcmp (value_contents (v), value_contents (next_v),
|
|
TYPE_LENGTH (el_type)) != 0)
|
|
break;
|
|
}
|
|
|
|
if (reps == 1)
|
|
fprintf_filtered (stream, "%d: ", i);
|
|
else
|
|
fprintf_filtered (stream, "%d..%d: ", i, i + reps - 1);
|
|
|
|
opts = *options;
|
|
opts.deref_ref = 1;
|
|
common_val_print (v, stream, 1, &opts, current_language);
|
|
|
|
things_printed++;
|
|
i += reps;
|
|
}
|
|
}
|
|
|
|
if (i < length)
|
|
fprintf_filtered (stream, "...");
|
|
|
|
fprintf_filtered (stream, "}");
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* If it's type String, print it */
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR
|
|
&& TYPE_TARGET_TYPE (type)
|
|
&& TYPE_TAG_NAME (TYPE_TARGET_TYPE (type))
|
|
&& strcmp (TYPE_TAG_NAME (TYPE_TARGET_TYPE (type)),
|
|
"java.lang.String") == 0
|
|
&& (options->format == 0 || options->format == 's')
|
|
&& address != 0
|
|
&& value_as_address (val) != 0)
|
|
{
|
|
struct value *data_val;
|
|
CORE_ADDR data;
|
|
struct value *boffset_val;
|
|
unsigned long boffset;
|
|
struct value *count_val;
|
|
unsigned long count;
|
|
struct value *mark;
|
|
|
|
mark = value_mark (); /* Remember start of new values */
|
|
|
|
data_val = value_struct_elt (&val, NULL, "data", NULL, NULL);
|
|
data = value_as_address (data_val);
|
|
|
|
boffset_val = value_struct_elt (&val, NULL, "boffset", NULL, NULL);
|
|
boffset = value_as_address (boffset_val);
|
|
|
|
count_val = value_struct_elt (&val, NULL, "count", NULL, NULL);
|
|
count = value_as_address (count_val);
|
|
|
|
value_free_to_mark (mark); /* Release unnecessary values */
|
|
|
|
val_print_string (java_char_type, data + boffset, count, stream, options);
|
|
|
|
return 0;
|
|
}
|
|
|
|
opts = *options;
|
|
opts.deref_ref = 1;
|
|
return common_val_print (val, stream, 0, &opts, current_language);
|
|
}
|
|
|
|
/* TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the
|
|
same meanings as in cp_print_value and c_val_print.
|
|
|
|
DONT_PRINT is an array of baseclass types that we
|
|
should not print, or zero if called from top level. */
|
|
|
|
static void
|
|
java_print_value_fields (struct type *type, const gdb_byte *valaddr,
|
|
CORE_ADDR address, struct ui_file *stream,
|
|
int recurse,
|
|
const struct value_print_options *options)
|
|
{
|
|
int i, len, n_baseclasses;
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
fprintf_filtered (stream, "{");
|
|
len = TYPE_NFIELDS (type);
|
|
n_baseclasses = TYPE_N_BASECLASSES (type);
|
|
|
|
if (n_baseclasses > 0)
|
|
{
|
|
int i, n_baseclasses = TYPE_N_BASECLASSES (type);
|
|
|
|
for (i = 0; i < n_baseclasses; i++)
|
|
{
|
|
int boffset;
|
|
struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
|
|
char *basename = TYPE_NAME (baseclass);
|
|
const gdb_byte *base_valaddr;
|
|
|
|
if (BASETYPE_VIA_VIRTUAL (type, i))
|
|
continue;
|
|
|
|
if (basename != NULL && strcmp (basename, "java.lang.Object") == 0)
|
|
continue;
|
|
|
|
boffset = 0;
|
|
|
|
if (options->pretty)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 * (recurse + 1), stream);
|
|
}
|
|
fputs_filtered ("<", stream);
|
|
/* Not sure what the best notation is in the case where there is no
|
|
baseclass name. */
|
|
fputs_filtered (basename ? basename : "", stream);
|
|
fputs_filtered ("> = ", stream);
|
|
|
|
base_valaddr = valaddr;
|
|
|
|
java_print_value_fields (baseclass, base_valaddr, address + boffset,
|
|
stream, recurse + 1, options);
|
|
fputs_filtered (", ", stream);
|
|
}
|
|
|
|
}
|
|
|
|
if (!len && n_baseclasses == 1)
|
|
fprintf_filtered (stream, "<No data fields>");
|
|
else
|
|
{
|
|
int fields_seen = 0;
|
|
|
|
for (i = n_baseclasses; i < len; i++)
|
|
{
|
|
/* If requested, skip printing of static fields. */
|
|
if (field_is_static (&TYPE_FIELD (type, i)))
|
|
{
|
|
char *name = TYPE_FIELD_NAME (type, i);
|
|
if (!options->static_field_print)
|
|
continue;
|
|
if (name != NULL && strcmp (name, "class") == 0)
|
|
continue;
|
|
}
|
|
if (fields_seen)
|
|
fprintf_filtered (stream, ", ");
|
|
else if (n_baseclasses > 0)
|
|
{
|
|
if (options->pretty)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
fputs_filtered ("members of ", stream);
|
|
fputs_filtered (type_name_no_tag (type), stream);
|
|
fputs_filtered (": ", stream);
|
|
}
|
|
}
|
|
fields_seen = 1;
|
|
|
|
if (options->pretty)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
}
|
|
else
|
|
{
|
|
wrap_here (n_spaces (2 + 2 * recurse));
|
|
}
|
|
if (options->inspect_it)
|
|
{
|
|
if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
|
|
fputs_filtered ("\"( ptr \"", stream);
|
|
else
|
|
fputs_filtered ("\"( nodef \"", stream);
|
|
if (field_is_static (&TYPE_FIELD (type, i)))
|
|
fputs_filtered ("static ", stream);
|
|
fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
|
|
language_cplus,
|
|
DMGL_PARAMS | DMGL_ANSI);
|
|
fputs_filtered ("\" \"", stream);
|
|
fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
|
|
language_cplus,
|
|
DMGL_PARAMS | DMGL_ANSI);
|
|
fputs_filtered ("\") \"", stream);
|
|
}
|
|
else
|
|
{
|
|
annotate_field_begin (TYPE_FIELD_TYPE (type, i));
|
|
|
|
if (field_is_static (&TYPE_FIELD (type, i)))
|
|
fputs_filtered ("static ", stream);
|
|
fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
|
|
language_cplus,
|
|
DMGL_PARAMS | DMGL_ANSI);
|
|
annotate_field_name_end ();
|
|
fputs_filtered (": ", stream);
|
|
annotate_field_value ();
|
|
}
|
|
|
|
if (!field_is_static (&TYPE_FIELD (type, i))
|
|
&& TYPE_FIELD_PACKED (type, i))
|
|
{
|
|
struct value *v;
|
|
|
|
/* Bitfields require special handling, especially due to byte
|
|
order problems. */
|
|
if (TYPE_FIELD_IGNORE (type, i))
|
|
{
|
|
fputs_filtered ("<optimized out or zero length>", stream);
|
|
}
|
|
else
|
|
{
|
|
struct value_print_options opts;
|
|
|
|
v = value_from_longest (TYPE_FIELD_TYPE (type, i),
|
|
unpack_field_as_long (type, valaddr, i));
|
|
|
|
opts = *options;
|
|
opts.deref_ref = 0;
|
|
common_val_print (v, stream, recurse + 1,
|
|
&opts, current_language);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (TYPE_FIELD_IGNORE (type, i))
|
|
{
|
|
fputs_filtered ("<optimized out or zero length>", stream);
|
|
}
|
|
else if (field_is_static (&TYPE_FIELD (type, i)))
|
|
{
|
|
struct value *v = value_static_field (type, i);
|
|
if (v == NULL)
|
|
fputs_filtered ("<optimized out>", stream);
|
|
else
|
|
{
|
|
struct value_print_options opts;
|
|
struct type *t = check_typedef (value_type (v));
|
|
if (TYPE_CODE (t) == TYPE_CODE_STRUCT)
|
|
v = value_addr (v);
|
|
opts = *options;
|
|
opts.deref_ref = 0;
|
|
common_val_print (v, stream, recurse + 1,
|
|
&opts, current_language);
|
|
}
|
|
}
|
|
else if (TYPE_FIELD_TYPE (type, i) == NULL)
|
|
fputs_filtered ("<unknown type>", stream);
|
|
else
|
|
{
|
|
struct value_print_options opts = *options;
|
|
opts.deref_ref = 0;
|
|
val_print (TYPE_FIELD_TYPE (type, i),
|
|
valaddr + TYPE_FIELD_BITPOS (type, i) / 8, 0,
|
|
address + TYPE_FIELD_BITPOS (type, i) / 8,
|
|
stream, recurse + 1, &opts,
|
|
current_language);
|
|
}
|
|
}
|
|
annotate_field_end ();
|
|
}
|
|
|
|
if (options->pretty)
|
|
{
|
|
fprintf_filtered (stream, "\n");
|
|
print_spaces_filtered (2 * recurse, stream);
|
|
}
|
|
}
|
|
fprintf_filtered (stream, "}");
|
|
}
|
|
|
|
/* Print data of type TYPE located at VALADDR (within GDB), which came from
|
|
the inferior at address ADDRESS, onto stdio stream STREAM according to
|
|
OPTIONS. The data at VALADDR is in target byte order.
|
|
|
|
If the data are a string pointer, returns the number of string characters
|
|
printed. */
|
|
|
|
int
|
|
java_val_print (struct type *type, const gdb_byte *valaddr,
|
|
int embedded_offset, CORE_ADDR address,
|
|
struct ui_file *stream, int recurse,
|
|
const struct value_print_options *options)
|
|
{
|
|
unsigned int i = 0; /* Number of characters printed */
|
|
struct type *target_type;
|
|
CORE_ADDR addr;
|
|
|
|
CHECK_TYPEDEF (type);
|
|
switch (TYPE_CODE (type))
|
|
{
|
|
case TYPE_CODE_PTR:
|
|
if (options->format && options->format != 's')
|
|
{
|
|
print_scalar_formatted (valaddr, type, options, 0, stream);
|
|
break;
|
|
}
|
|
#if 0
|
|
if (options->vtblprint && cp_is_vtbl_ptr_type (type))
|
|
{
|
|
/* Print the unmangled name if desired. */
|
|
/* Print vtable entry - we only get here if we ARE using
|
|
-fvtable_thunks. (Otherwise, look under TYPE_CODE_STRUCT.) */
|
|
/* Extract an address, assume that it is unsigned. */
|
|
print_address_demangle (extract_unsigned_integer (valaddr, TYPE_LENGTH (type)),
|
|
stream, demangle);
|
|
break;
|
|
}
|
|
#endif
|
|
addr = unpack_pointer (type, valaddr);
|
|
if (addr == 0)
|
|
{
|
|
fputs_filtered ("null", stream);
|
|
return i;
|
|
}
|
|
target_type = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
if (TYPE_CODE (target_type) == TYPE_CODE_FUNC)
|
|
{
|
|
/* Try to print what function it points to. */
|
|
print_address_demangle (addr, stream, demangle);
|
|
/* Return value is irrelevant except for string pointers. */
|
|
return (0);
|
|
}
|
|
|
|
if (options->addressprint && options->format != 's')
|
|
{
|
|
fputs_filtered ("@", stream);
|
|
print_longest (stream, 'x', 0, (ULONGEST) addr);
|
|
}
|
|
|
|
return i;
|
|
|
|
case TYPE_CODE_CHAR:
|
|
case TYPE_CODE_INT:
|
|
/* Can't just call c_val_print because that prints bytes as C
|
|
chars. */
|
|
if (options->format || options->output_format)
|
|
{
|
|
struct value_print_options opts = *options;
|
|
opts.format = (options->format ? options->format
|
|
: options->output_format);
|
|
print_scalar_formatted (valaddr, type, &opts, 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), type, stream);
|
|
else
|
|
val_print_type_code_int (type, valaddr, stream);
|
|
break;
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
java_print_value_fields (type, valaddr, address, stream, recurse,
|
|
options);
|
|
break;
|
|
|
|
default:
|
|
return c_val_print (type, valaddr, embedded_offset, address, stream,
|
|
recurse, options);
|
|
}
|
|
|
|
return 0;
|
|
}
|