2009-05-27 Tom Tromey <tromey@redhat.com>

[deliverable/binutils-gdb.git] / gdb / jv-valprint.c

diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index a1b8a715174844622b04a51f75e33aae03ac6f90..cdcb440b0d57cca07d149eb04c187caa2f964e94 100644 (file)
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -45,7 +45,7 @@ java_value_print (struct value *val, struct ui_file *stream,
   struct value_print_options opts;
 
   type = value_type (val);
-  address = VALUE_ADDRESS (val) + value_offset (val);
+  address = value_address (val);
 
   if (is_object_type (type))
     {
@@ -143,8 +143,8 @@ java_value_print (struct value *val, struct ui_file *stream,
          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 + JAVA_OBJECT_SIZE + 4);
+         set_value_address (next_v, value_raw_address (v));
 
          while (i < length && things_printed < options->print_max)
            {