daily update

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

diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index d345685f970aedc925e6d5dadecb2ddbd280649f..f49b17202372cf2435aae594702f89fff2da7f9c 100644 (file)
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -179,8 +179,11 @@ java_value_print (struct value *val, struct ui_file *stream,
                  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)
+                 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;
                }
 
@@ -259,6 +262,7 @@ java_value_print (struct value *val, struct ui_file *stream,
 
 static void
 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,
@@ -304,11 +308,11 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
 
          base_valaddr = valaddr;
 
-         java_print_value_fields (baseclass, base_valaddr, address + boffset,
+         java_print_value_fields (baseclass, base_valaddr,
+                                  offset + boffset, address,
                                   stream, recurse + 1, val, options);
          fputs_filtered (", ", stream);
        }
-
     }
 
   if (!len && n_baseclasses == 1)
@@ -406,14 +410,13 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
              else if (!value_bits_valid (val, TYPE_FIELD_BITPOS (type, i),
                                          TYPE_FIELD_BITSIZE (type, i)))
                {
-                 fputs_filtered (_("<value optimized out>"), stream);
+                 val_print_optimized_out (stream);
                }
              else
                {
                  struct value_print_options opts;
 
-                 v = value_from_longest (TYPE_FIELD_TYPE (type, i),
-                                  unpack_field_as_long (type, valaddr, i));
+                 v = value_field_bitfield (type, i, valaddr, offset, val);
 
                  opts = *options;
                  opts.deref_ref = 0;
@@ -432,7 +435,7 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
                  struct value *v = value_static_field (type, i);
 
                  if (v == NULL)
-                   fputs_filtered ("<optimized out>", stream);
+                   val_print_optimized_out (stream);
                  else
                    {
                      struct value_print_options opts;
@@ -454,9 +457,9 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
 
                  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, val, &opts,
+                            valaddr,
+                            offset + TYPE_FIELD_BITPOS (type, i) / 8,
+                            address, stream, recurse + 1, val, &opts,
                             current_language);
                }
            }
@@ -472,12 +475,9 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
   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.  */
+/* See val_print for a description of the various parameters of this
+   function; they are identical.  The semantics of the return value is
+   also identical to val_print.  */
 
 int
 java_val_print (struct type *type, const gdb_byte *valaddr,
@@ -497,7 +497,8 @@ java_val_print (struct type *type, const gdb_byte *valaddr,
     case TYPE_CODE_PTR:
       if (options->format && options->format != 's')
        {
-         print_scalar_formatted (valaddr, type, options, 0, stream);
+         val_print_scalar_formatted (type, valaddr, embedded_offset,
+                                     val, options, 0, stream);
          break;
        }
 #if 0
@@ -507,14 +508,15 @@ java_val_print (struct type *type, const gdb_byte *valaddr,
          /* 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 (gdbarch,
-                                 extract_unsigned_integer (valaddr,
-                                                           TYPE_LENGTH (type)),
-                                 stream, demangle);
+         print_address_demangle
+           (gdbarch,
+            extract_unsigned_integer (valaddr + embedded_offset,
+                                      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);
@@ -548,20 +550,22 @@ java_val_print (struct type *type, const gdb_byte *valaddr,
 
          opts.format = (options->format ? options->format
                         : options->output_format);
-         print_scalar_formatted (valaddr, type, &opts, 0, stream);
+         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), type, 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, recurse,
-                              val, options);
+      java_print_value_fields (type, valaddr, embedded_offset,
+                              address, stream, recurse, val, options);
       break;
 
     default: