X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fjv-valprint.c;h=3b90e54fec3e3fcf18fa518ec1bd50a416fe803f;hb=16f92dd4d4a4e637f7910c32cd6fd4b0ff78149a;hp=ef258475fde737629cc2ba2926525ecbe651d30c;hpb=b276f1bbc9cf6f8d44204350cb03e4d021edf783;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index ef258475fd..3b90e54fec 100644
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -1,11 +1,12 @@
/* Support for printing Java values for GDB, the GNU debugger.
- Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+
+ Copyright (C) 1997-2013 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 2 of the License, or
+ 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,
@@ -14,9 +15,7 @@
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, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
#include "defs.h"
#include "symtab.h"
@@ -34,39 +33,38 @@
/* Local functions */
-static void java_print_value_fields (struct type * type, char *valaddr,
- CORE_ADDR address,
- struct ui_file *stream, int format,
- int recurse,
- enum val_prettyprint pretty);
-
-
-int
-java_value_print (struct value *val, struct ui_file *stream, int format,
- enum val_prettyprint pretty)
+void
+java_value_print (struct value *val, struct ui_file *stream,
+ const struct value_print_options *options)
{
+ struct gdbarch *gdbarch = get_type_arch (value_type (val));
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
struct type *type;
CORE_ADDR address;
int i;
- char *name;
+ const char *name;
+ struct value_print_options opts;
- type = VALUE_TYPE (val);
- address = VALUE_ADDRESS (val) + VALUE_OFFSET (val);
+ type = value_type (val);
+ address = value_address (val);
if (is_object_type (type))
{
CORE_ADDR obj_addr;
+ struct value *tem = val;
- /* Get the run-time type, and cast the object into that */
+ /* Get the run-time type, and cast the object into that. */
+ while (TYPE_CODE (value_type (tem)) == TYPE_CODE_PTR)
+ tem = value_ind (tem);
- obj_addr = unpack_pointer (type, VALUE_CONTENTS (val));
+ obj_addr = value_address (tem);
if (obj_addr != 0)
{
- type = type_from_class (java_class_from_object (val));
+ type = type_from_class (gdbarch, java_class_from_object (val));
type = lookup_pointer_type (type);
- val = value_at (type, address, NULL);
+ val = value_at (type, address);
}
}
@@ -77,30 +75,32 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
if (TYPE_CODE (type) == TYPE_CODE_STRUCT && name != NULL
&& (i = strlen (name), name[i - 1] == ']'))
{
- char buf4[4];
+ 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);
+ struct type *el_type
+ = java_primitive_type_from_name (gdbarch, name, i - 2);
i = 0;
- read_memory (address + JAVA_OBJECT_SIZE, buf4, 4);
+ read_memory (address + get_java_object_header_size (gdbarch), buf4, 4);
- length = (long) extract_signed_integer (buf4, 4);
+ length = (long) extract_signed_integer (buf4, 4, byte_order);
fprintf_filtered (stream, "{length: %ld", length);
if (el_type == NULL)
{
CORE_ADDR element;
- CORE_ADDR next_element = -1; /* dummy initial value */
+ CORE_ADDR next_element = -1; /* Dummy initial value. */
- address += JAVA_OBJECT_SIZE + 4; /* Skip object header and length. */
+ /* Skip object header and length. */
+ address += get_java_object_header_size (gdbarch) + 4;
- while (i < length && things_printed < print_max)
+ while (i < length && things_printed < options->print_max)
{
- char *buf;
+ gdb_byte *buf;
- buf = alloca (TARGET_PTR_BIT / HOST_CHAR_BIT);
+ buf = alloca (gdbarch_ptr_bit (gdbarch) / HOST_CHAR_BIT);
fputs_filtered (", ", stream);
wrap_here (n_spaces (2));
@@ -109,23 +109,25 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
else
{
read_memory (address, buf, sizeof (buf));
- address += TARGET_PTR_BIT / HOST_CHAR_BIT;
+ address += gdbarch_ptr_bit (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));
+ element = extract_unsigned_integer (buf, sizeof (buf),
+ byte_order);
}
for (reps = 1; i + reps < length; reps++)
{
read_memory (address, buf, sizeof (buf));
- address += TARGET_PTR_BIT / HOST_CHAR_BIT;
+ address += gdbarch_ptr_bit (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));
+ next_element = extract_unsigned_integer (buf, sizeof (buf),
+ byte_order);
if (next_element != element)
break;
}
@@ -138,7 +140,7 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
if (element == 0)
fprintf_filtered (stream, "null");
else
- fprintf_filtered (stream, "@%s", paddr_nz (element));
+ fprintf_filtered (stream, "@%s", paddress (gdbarch, element));
things_printed++;
i += reps;
@@ -149,10 +151,11 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
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);
+ set_value_address (v, (address
+ + get_java_object_header_size (gdbarch) + 4));
+ set_value_address (next_v, value_raw_address (v));
- while (i < length && things_printed < print_max)
+ while (i < length && things_printed < options->print_max)
{
fputs_filtered (", ", stream);
wrap_here (n_spaces (2));
@@ -167,18 +170,22 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
}
else
{
- VALUE_LAZY (v) = 1;
- VALUE_OFFSET (v) = 0;
+ set_value_lazy (v, 1);
+ set_value_offset (v, 0);
}
- VALUE_OFFSET (next_v) = VALUE_OFFSET (v);
+ set_value_offset (next_v, value_offset (v));
for (reps = 1; i + reps < length; reps++)
{
- VALUE_LAZY (next_v) = 1;
- VALUE_OFFSET (next_v) += TYPE_LENGTH (el_type);
- if (memcmp (VALUE_CONTENTS (v), VALUE_CONTENTS (next_v),
- TYPE_LENGTH (el_type)) != 0)
+ set_value_lazy (next_v, 1);
+ set_value_offset (next_v, value_offset (next_v)
+ + TYPE_LENGTH (el_type));
+ value_fetch_lazy (next_v);
+ if (!(value_available_contents_eq
+ (v, value_embedded_offset (v),
+ next_v, value_embedded_offset (next_v),
+ TYPE_LENGTH (el_type))))
break;
}
@@ -187,8 +194,9 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
else
fprintf_filtered (stream, "%d..%d: ", i, i + reps - 1);
- val_print (VALUE_TYPE (v), VALUE_CONTENTS (v), 0, 0,
- stream, format, 2, 1, pretty);
+ opts = *options;
+ opts.deref_ref = 1;
+ common_val_print (v, stream, 1, &opts, current_language);
things_printed++;
i += reps;
@@ -200,20 +208,21 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
fprintf_filtered (stream, "}");
- return 0;
+ return;
}
- /* If it's type String, print it */
+ /* 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
- && (format == 0 || format == 's')
+ && (options->format == 0 || options->format == 's')
&& address != 0
&& value_as_address (val) != 0)
{
+ struct type *char_type;
struct value *data_val;
CORE_ADDR data;
struct value *boffset_val;
@@ -222,7 +231,9 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
unsigned long count;
struct value *mark;
- mark = value_mark (); /* Remember start of new values */
+ fputs_filtered (" ", stream);
+
+ mark = value_mark (); /* Remember start of new values. */
data_val = value_struct_elt (&val, NULL, "data", NULL, NULL);
data = value_as_address (data_val);
@@ -233,27 +244,33 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
count_val = value_struct_elt (&val, NULL, "count", NULL, NULL);
count = value_as_address (count_val);
- value_free_to_mark (mark); /* Release unnecessary values */
+ value_free_to_mark (mark); /* Release unnecessary values. */
- val_print_string (data + boffset, count, 2, stream);
+ char_type = builtin_java_type (gdbarch)->builtin_char;
+ val_print_string (char_type, NULL, data + boffset, count, stream,
+ options);
- return 0;
+ return;
}
- return (val_print (type, VALUE_CONTENTS (val), 0, address,
- stream, format, 1, 0, pretty));
+ opts = *options;
+ opts.deref_ref = 1;
+ common_val_print (val, stream, 0, &opts, current_language);
}
-/* TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and PRETTY have the
+/* 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, char *valaddr, CORE_ADDR address,
- struct ui_file *stream, int format, int recurse,
- enum val_prettyprint pretty)
+java_print_value_fields (struct type *type, const gdb_byte *valaddr,
+ int offset,
+ CORE_ADDR address, struct ui_file *stream,
+ int recurse,
+ const struct value *val,
+ const struct value_print_options *options)
{
int i, len, n_baseclasses;
@@ -271,8 +288,8 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
{
int boffset;
struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
- char *basename = TYPE_NAME (baseclass);
- char *base_valaddr;
+ const char *basename = TYPE_NAME (baseclass);
+ const gdb_byte *base_valaddr;
if (BASETYPE_VIA_VIRTUAL (type, i))
continue;
@@ -282,7 +299,7 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
boffset = 0;
- if (pretty)
+ if (options->prettyformat)
{
fprintf_filtered (stream, "\n");
print_spaces_filtered (2 * (recurse + 1), stream);
@@ -295,14 +312,11 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
base_valaddr = valaddr;
- java_print_value_fields (baseclass, base_valaddr, address + boffset,
- stream, format, recurse + 1, pretty);
+ java_print_value_fields (baseclass, base_valaddr,
+ offset + boffset, address,
+ stream, recurse + 1, val, options);
fputs_filtered (", ", stream);
-
- flush_it:
- ;
}
-
}
if (!len && n_baseclasses == 1)
@@ -314,10 +328,11 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
for (i = n_baseclasses; i < len; i++)
{
/* If requested, skip printing of static fields. */
- if (TYPE_FIELD_STATIC (type, i))
+ if (field_is_static (&TYPE_FIELD (type, i)))
{
- char *name = TYPE_FIELD_NAME (type, i);
- if (!static_field_print)
+ const char *name = TYPE_FIELD_NAME (type, i);
+
+ if (!options->static_field_print)
continue;
if (name != NULL && strcmp (name, "class") == 0)
continue;
@@ -326,7 +341,7 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
fprintf_filtered (stream, ", ");
else if (n_baseclasses > 0)
{
- if (pretty)
+ if (options->prettyformat)
{
fprintf_filtered (stream, "\n");
print_spaces_filtered (2 + 2 * recurse, stream);
@@ -337,7 +352,7 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
}
fields_seen = 1;
- if (pretty)
+ if (options->prettyformat)
{
fprintf_filtered (stream, "\n");
print_spaces_filtered (2 + 2 * recurse, stream);
@@ -346,38 +361,20 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
{
wrap_here (n_spaces (2 + 2 * recurse));
}
- if (inspect_it)
- {
- if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
- fputs_filtered ("\"( ptr \"", stream);
- else
- fputs_filtered ("\"( nodef \"", stream);
- if (TYPE_FIELD_STATIC (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 (TYPE_FIELD_STATIC (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 (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i))
+ 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;
@@ -387,13 +384,29 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
{
fputs_filtered ("", stream);
}
+ else if (value_bits_synthetic_pointer (val,
+ TYPE_FIELD_BITPOS (type,
+ i),
+ TYPE_FIELD_BITSIZE (type,
+ i)))
+ {
+ fputs_filtered (_(""), stream);
+ }
+ else if (!value_bits_valid (val, TYPE_FIELD_BITPOS (type, i),
+ TYPE_FIELD_BITSIZE (type, i)))
+ {
+ val_print_optimized_out (stream);
+ }
else
{
- v = value_from_longest (TYPE_FIELD_TYPE (type, i),
- unpack_field_as_long (type, valaddr, i));
+ struct value_print_options opts;
+
+ v = value_field_bitfield (type, i, valaddr, offset, val);
- val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0,
- 0, stream, format, 0, recurse + 1, pretty);
+ opts = *options;
+ opts.deref_ref = 0;
+ common_val_print (v, stream, recurse + 1,
+ &opts, current_language);
}
}
else
@@ -402,35 +415,43 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
{
fputs_filtered ("", stream);
}
- else if (TYPE_FIELD_STATIC (type, i))
+ else if (field_is_static (&TYPE_FIELD (type, i)))
{
struct value *v = value_static_field (type, i);
+
if (v == NULL)
- fputs_filtered ("", stream);
+ val_print_optimized_out (stream);
else
{
- struct type *t = check_typedef (VALUE_TYPE (v));
+ struct value_print_options opts;
+ struct type *t = check_typedef (value_type (v));
+
if (TYPE_CODE (t) == TYPE_CODE_STRUCT)
v = value_addr (v);
- val_print (VALUE_TYPE (v),
- VALUE_CONTENTS (v), 0, VALUE_ADDRESS (v),
- stream, format, 0, recurse + 1, pretty);
+ 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 ("", 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, format, 0, recurse + 1, pretty);
+ valaddr,
+ offset + TYPE_FIELD_BITPOS (type, i) / 8,
+ address, stream, recurse + 1, val, &opts,
+ current_language);
}
}
annotate_field_end ();
}
- if (pretty)
+ if (options->prettyformat)
{
fprintf_filtered (stream, "\n");
print_spaces_filtered (2 * recurse, stream);
@@ -439,25 +460,17 @@ java_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
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
- FORMAT (a letter or 0 for natural format). The data at VALADDR is in
- target byte order.
-
- If the data are a string pointer, returns the number of string characters
- printed.
-
- If DEREF_REF is nonzero, then dereference references, otherwise just print
- them like pointers.
-
- The PRETTY parameter controls prettyprinting. */
+/* See val_print for a description of the various parameters of this
+ function; they are identical. */
-int
-java_val_print (struct type *type, char *valaddr, int embedded_offset,
- CORE_ADDR address, struct ui_file *stream, int format,
- int deref_ref, int recurse, enum val_prettyprint pretty)
+void
+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 *val,
+ const struct value_print_options *options)
{
- register unsigned int i = 0; /* Number of characters printed */
+ struct gdbarch *gdbarch = get_type_arch (type);
struct type *target_type;
CORE_ADDR addr;
@@ -465,72 +478,66 @@ java_val_print (struct type *type, char *valaddr, int embedded_offset,
switch (TYPE_CODE (type))
{
case TYPE_CODE_PTR:
- if (format && format != 's')
+ if (options->format && options->format != 's')
{
- print_scalar_formatted (valaddr, type, format, 0, stream);
+ val_print_scalar_formatted (type, valaddr, embedded_offset,
+ val, options, 0, stream);
break;
}
-#if 0
- if (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);
+ addr = unpack_pointer (type, valaddr + embedded_offset);
if (addr == 0)
{
fputs_filtered ("null", stream);
- return i;
+ return;
}
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);
+ print_address_demangle (options, gdbarch, addr, stream, demangle);
+ return;
}
- if (addressprint && format != 's')
+ if (options->addressprint && options->format != 's')
{
fputs_filtered ("@", stream);
print_longest (stream, 'x', 0, (ULONGEST) addr);
}
- return i;
+ return;
case TYPE_CODE_CHAR:
case TYPE_CODE_INT:
/* 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);
+ if (options->format || options->output_format)
+ {
+ struct value_print_options opts = *options;
+
+ opts.format = (options->format ? options->format
+ : options->output_format);
+ val_print_scalar_formatted (type, valaddr, embedded_offset,
+ val, &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), stream);
+ LA_PRINT_CHAR ((int) unpack_long (type, valaddr + embedded_offset),
+ type, stream);
else
- val_print_type_code_int (type, valaddr, stream);
+ val_print_type_code_int (type, valaddr + embedded_offset, stream);
break;
case TYPE_CODE_STRUCT:
- java_print_value_fields (type, valaddr, address, stream, format,
- recurse, pretty);
+ java_print_value_fields (type, valaddr, embedded_offset,
+ address, stream, recurse, val, options);
break;
default:
- return c_val_print (type, valaddr, embedded_offset, address, stream,
- format, deref_ref, recurse, pretty);
+ c_val_print (type, valaddr, embedded_offset, address, stream,
+ recurse, val, options);
+ break;
}
-
- return 0;
}