Merge GDB 7.5.1

gdb/jv-valprint.c

 /* Support for printing Java values for GDB, the GNU debugger.
 
    Copyright (C) 1997-2005, 2007-2012 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 3 of the License, or
    (at your option) any later version.
@@ skipping 15 matching lines @@
 #include "demangle.h"
 #include "valprint.h"
 #include "language.h"
 #include "jv-lang.h"
 #include "c-lang.h"
 #include "annotate.h"
 #include "gdb_string.h"
 
 /* Local functions */
 
-int
+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);
 
   if (is_object_type (type))
     {
       CORE_ADDR obj_addr;
+      struct value *tem = val;
 
       /* 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 (gdbarch, java_class_from_object (val));
           type = lookup_pointer_type (type);
 
           val = value_at (type, address);
         }
     }
 
@@ skipping 130 matching lines @@
               things_printed++;
               i += reps;
             }
         }
 
       if (i < length)
         fprintf_filtered (stream, "...");
 
       fprintf_filtered (stream, "}");
 
-      return 0;
+      return;
     }
 
   /* 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
       && (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;
       unsigned long boffset;
       struct value *count_val;
       unsigned long count;
       struct value *mark;
 
+      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);
 
       boffset_val = value_struct_elt (&val, NULL, "boffset", NULL, NULL);
       boffset = value_as_address (boffset_val);
 
       count_val = value_struct_elt (&val, NULL, "count", NULL, NULL);
       count = value_as_address (count_val);
 
       value_free_to_mark (mark);        /* Release unnecessary values.  */
 
       char_type = builtin_java_type (gdbarch)->builtin_char;
       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
    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, const gdb_byte *valaddr,
@@ skipping 12 matching lines @@
   n_baseclasses = TYPE_N_BASECLASSES (type);
 
   if (n_baseclasses > 0)
     {
       int i, n_baseclasses = TYPE_N_BASECLASSES (type);
 
       for (i = 0; i < n_baseclasses; i++)
         {
           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))
             continue;
 
           if (basename != NULL && strcmp (basename, "java.lang.Object") == 0)
             continue;
 
           boffset = 0;
 
@@ skipping 21 matching lines @@
     fprintf_filtered (stream, "<No data fields>");
   else
     {
       int fields_seen = 0;
 
       for (i = n_baseclasses; i < len; i++)
         {
           /* 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;
               if (name != NULL && strcmp (name, "class") == 0)
                 continue;
             }
           if (fields_seen)
             fprintf_filtered (stream, ", ");
           else if (n_baseclasses > 0)
             {
@@ skipping 129 matching lines @@
       if (options->pretty)
         {
           fprintf_filtered (stream, "\n");
           print_spaces_filtered (2 * recurse, stream);
         }
     }
   fprintf_filtered (stream, "}");
 }
 
 /* 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.  */
+   function; they are identical.  */
 
-int
+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)
 {
   struct gdbarch *gdbarch = get_type_arch (type);
   unsigned int i = 0;   /* Number of characters printed.  */
   struct type *target_type;
   CORE_ADDR addr;
 
   CHECK_TYPEDEF (type);
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_PTR:
       if (options->format && options->format != 's')
         {
           val_print_scalar_formatted (type, valaddr, embedded_offset,
                                       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)
         {
           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 (gdbarch, addr, stream, demangle);
-          /* Return value is irrelevant except for string pointers.  */
-          return (0);
+          print_address_demangle (options, gdbarch, addr, stream, demangle);
+          return;
         }
 
       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.  */
       if (options->format || options->output_format)
         {
           struct value_print_options opts = *options;
 
           opts.format = (options->format ? options->format
@@ skipping 10 matching lines @@
       else
         val_print_type_code_int (type, valaddr + embedded_offset, stream);
       break;
 
     case TYPE_CODE_STRUCT:
       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,
-                          recurse, val, options);
+      c_val_print (type, valaddr, embedded_offset, address, stream,
+                   recurse, val, options);
+      break;
     }
-
-  return 0;
 }