/* Support for printing Java values for GDB, the GNU debugger.
- Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+
+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
+ Software Foundation, Inc.
This file is part of GDB.
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. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
#include "defs.h"
#include "symtab.h"
/* 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)
int i;
char *name;
- type = VALUE_TYPE (val);
- address = VALUE_ADDRESS (val) + VALUE_OFFSET (val);
+ type = value_type (val);
+ address = VALUE_ADDRESS (val) + value_offset (val);
if (is_object_type (type))
{
/* Get the run-time type, and cast the object into that */
- obj_addr = unpack_pointer (type, VALUE_CONTENTS (val));
+ 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, NULL);
+ val = value_at (type, address);
}
}
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;
while (i < length && things_printed < print_max)
{
- char *buf;
+ gdb_byte *buf;
buf = alloca (TARGET_PTR_BIT / HOST_CHAR_BIT);
fputs_filtered (", ", stream);
{
read_memory (address, buf, sizeof (buf));
address += TARGET_PTR_BIT / HOST_CHAR_BIT;
- element = extract_address (buf, sizeof (buf));
+ /* 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 += TARGET_PTR_BIT / HOST_CHAR_BIT;
- next_element = extract_address (buf, sizeof (buf));
+ /* 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;
}
}
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),
+ 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;
}
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);
+ common_val_print (v, stream, format, 2, 1, pretty);
things_printed++;
i += reps;
return 0;
}
- return (val_print (type, VALUE_CONTENTS (val), 0, address,
- stream, format, 1, 0, pretty));
+ return common_val_print (val, stream, format, 1, 0, pretty);
}
/* TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and PRETTY have the
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,
+ CORE_ADDR address, struct ui_file *stream,
+ int format, int recurse, enum val_prettyprint pretty)
{
int i, len, n_baseclasses;
int boffset;
struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
char *basename = TYPE_NAME (baseclass);
- char *base_valaddr;
+ const gdb_byte *base_valaddr;
if (BASETYPE_VIA_VIRTUAL (type, i))
continue;
java_print_value_fields (baseclass, base_valaddr, address + boffset,
stream, format, recurse + 1, pretty);
fputs_filtered (", ", stream);
-
- flush_it:
- ;
}
}
fprintf_filtered (stream, "<No data fields>");
else
{
- extern int inspect_it;
int fields_seen = 0;
for (i = n_baseclasses; i < len; i++)
v = value_from_longest (TYPE_FIELD_TYPE (type, i),
unpack_field_as_long (type, valaddr, i));
- val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0,
- 0, stream, format, 0, recurse + 1, pretty);
+ common_val_print (v, stream, format, 0, recurse + 1, pretty);
}
}
else
fputs_filtered ("<optimized out>", stream);
else
{
- struct type *t = check_typedef (VALUE_TYPE (v));
+ 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);
+ common_val_print (v, stream, format, 0, recurse + 1,
+ pretty);
}
}
else if (TYPE_FIELD_TYPE (type, i) == NULL)
The PRETTY parameter controls prettyprinting. */
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)
+java_val_print (struct type *type, const gdb_byte *valaddr,
+ int embedded_offset, CORE_ADDR address,
+ struct ui_file *stream, int format, int deref_ref,
+ int recurse, enum val_prettyprint pretty)
{
- register unsigned int i = 0; /* Number of characters printed */
+ unsigned int i = 0; /* Number of characters printed */
struct type *target_type;
CORE_ADDR addr;
/* 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.) */
- print_address_demangle (extract_address (valaddr, TYPE_LENGTH (type)),
+ /* Extract an address, assume that it is unsigned. */
+ print_address_demangle (extract_unsigned_integer (valaddr, TYPE_LENGTH (type)),
stream, demangle);
break;
}
projects / deliverable / binutils-gdb.git / blobdiff