* value.h (value_print): Return void.

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

diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index 0e5b97f10ccda85a67179a85cf1757caa3675d12..125e611388f95392866288c78ce9ff4adcc9e7ed 100644 (file)
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -1,7 +1,6 @@
 /* Support for printing Java values for GDB, the GNU debugger.
 
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
-   2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-2005, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -34,7 +33,7 @@
 
 /* Local functions */
 
-int
+void
 java_value_print (struct value *val, struct ui_file *stream, 
                  const struct value_print_options *options)
 {
@@ -43,7 +42,7 @@ java_value_print (struct value *val, struct ui_file *stream,
   struct type *type;
   CORE_ADDR address;
   int i;
-  char *name;
+  const char *name;
   struct value_print_options opts;
 
   type = value_type (val);
@@ -179,8 +178,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;
                }
 
@@ -203,7 +205,7 @@ java_value_print (struct value *val, struct ui_file *stream,
 
       fprintf_filtered (stream, "}");
 
-      return 0;
+      return;
     }
 
   /* If it's type String, print it.  */
@@ -243,12 +245,12 @@ java_value_print (struct value *val, struct ui_file *stream,
       val_print_string (char_type, NULL, data + boffset, count, stream,
                        options);
 
-      return 0;
+      return;
     }
 
   opts = *options;
   opts.deref_ref = 1;
-  return common_val_print (val, stream, 0, &opts, current_language);
+  common_val_print (val, stream, 0, &opts, current_language);
 }
 
 /* TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the
@@ -281,7 +283,7 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
        {
          int boffset;
          struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
-         char *basename = TYPE_NAME (baseclass);
+         const char *basename = TYPE_NAME (baseclass);
          const gdb_byte *base_valaddr;
 
          if (BASETYPE_VIA_VIRTUAL (type, i))
@@ -323,7 +325,7 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
          /* If requested, skip printing of static fields.  */
          if (field_is_static (&TYPE_FIELD (type, i)))
            {
-             char *name = TYPE_FIELD_NAME (type, i);
+             const char *name = TYPE_FIELD_NAME (type, i);
 
              if (!options->static_field_print)
                continue;
@@ -413,9 +415,7 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
                {
                  struct value_print_options opts;
 
-                 v = value_from_longest
-                   (TYPE_FIELD_TYPE (type, i),
-                    unpack_field_as_long (type, valaddr + offset, i));
+                 v = value_field_bitfield (type, i, valaddr, offset, val);
 
                  opts = *options;
                  opts.deref_ref = 0;
@@ -500,21 +500,6 @@ java_val_print (struct type *type, const gdb_byte *valaddr,
                                      val, 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
-           (gdbarch,
-            extract_unsigned_integer (valaddr + embedded_offset,
-                                      TYPE_LENGTH (type)),
-            stream, demangle);
-         break;
-       }
-#endif
       addr = unpack_pointer (type, valaddr + embedded_offset);
       if (addr == 0)
        {