* gdb.threads/thread-find.exp: Support remote targets.

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

diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index b80055b90374985c9d209e5d50c9b75a4b3ecf6b..8d9ebfd9ccd70cfb9f2871bbac77947cd36a0536 100644 (file)
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -1,11 +1,12 @@
 /* Support for printing Java types for GDB, the GNU debugger.
 /* Support for printing Java types for GDB, the GNU debugger.

-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010, 2011
+   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
 
    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 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -14,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 
 #include "defs.h"
 
 
 #include "defs.h"


@@ -29,6 +28,7 @@
 #include "typeprint.h"
 #include "c-lang.h"
 #include "cp-abi.h"
 #include "typeprint.h"
 #include "c-lang.h"
 #include "cp-abi.h"

+#include "gdb_assert.h"

 
 /* Local functions */
 
 
 /* Local functions */
 


@@ -90,8 +90,8 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
   int len;
   char *mangled_name;
   char *demangled_name;
   int len;
   char *mangled_name;
   char *demangled_name;

-  QUIT;

 
 

+  QUIT;

   wrap_here ("    ");
 
   if (type == NULL)
   wrap_here ("    ");
 
   if (type == NULL)


@@ -122,6 +122,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
       if (TYPE_TAG_NAME (type) != NULL && TYPE_TAG_NAME (type)[0] == '[')
        {                       /* array type */
          char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));
       if (TYPE_TAG_NAME (type) != NULL && TYPE_TAG_NAME (type)[0] == '[')
        {                       /* array type */
          char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));

+

          fputs_filtered (name, stream);
          xfree (name);
          break;
          fputs_filtered (name, stream);
          xfree (name);
          break;


@@ -170,7 +171,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
                  && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
                continue;
 
                  && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
                continue;
 

-             /* Don't print the dummy field "class". */
+             /* Don't print the dummy field "class".  */

              if (strncmp (TYPE_FIELD_NAME (type, i), "class", 5) == 0)
                continue;
 
              if (strncmp (TYPE_FIELD_NAME (type, i), "class", 5) == 0)
                continue;
 


@@ -186,7 +187,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
                    fprintf_filtered (stream, "public ");
                }
 
                    fprintf_filtered (stream, "public ");
                }
 

-             if (TYPE_FIELD_STATIC (type, i))
+             if (field_is_static (&TYPE_FIELD (type, i)))

                fprintf_filtered (stream, "static ");
 
              java_print_type (TYPE_FIELD_TYPE (type, i),
                fprintf_filtered (stream, "static ");
 
              java_print_type (TYPE_FIELD_TYPE (type, i),


@@ -196,12 +197,12 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
              fprintf_filtered (stream, ";\n");
            }
 
              fprintf_filtered (stream, ";\n");
            }
 

-         /* If there are both fields and methods, put a space between. */
+         /* If there are both fields and methods, put a space between.  */

          len = TYPE_NFN_FIELDS (type);
          if (len)
            fprintf_filtered (stream, "\n");
 
          len = TYPE_NFN_FIELDS (type);
          if (len)
            fprintf_filtered (stream, "\n");
 

-         /* Print out the methods */
+         /* Print out the methods.  */

 
          for (i = 0; i < len; i++)
            {
 
          for (i = 0; i < len; i++)
            {


@@ -220,10 +221,20 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
 
              for (j = 0; j < n_overloads; j++)
                {
 
              for (j = 0; j < n_overloads; j++)
                {

-                 char *physname;
+                 const char *real_physname;
+                 char *physname, *p;

                  int is_full_physname_constructor;
 
                  int is_full_physname_constructor;
 

-                 physname = TYPE_FN_FIELD_PHYSNAME (f, j);
+                 real_physname = TYPE_FN_FIELD_PHYSNAME (f, j);
+
+                 /* The physname will contain the return type
+                    after the final closing parenthesis.  Strip it off.  */
+                 p = strrchr (real_physname, ')');
+                 gdb_assert (p != NULL);
+                 ++p;   /* Keep the trailing ')'.  */
+                 physname = alloca (p - real_physname + 1);
+                 memcpy (physname, real_physname, p - real_physname);
+                 physname[p - real_physname] = '\0';

 
                  is_full_physname_constructor
                     = (is_constructor_name (physname)
 
                  is_full_physname_constructor
                     = (is_constructor_name (physname)


@@ -269,7 +280,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
                    /* Build something we can demangle.  */
                    mangled_name = gdb_mangle_name (type, i, j);
                  else
                    /* Build something we can demangle.  */
                    mangled_name = gdb_mangle_name (type, i, j);
                  else

-                   mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j);
+                   mangled_name = physname;

 
                  demangled_name =
                    cplus_demangle (mangled_name,
 
                  demangled_name =
                    cplus_demangle (mangled_name,


@@ -322,8 +333,8 @@ extern void c_type_print_varspec_suffix (struct type *, struct ui_file *,
                                         int, int, int);
 
 void
                                         int, int, int);
 
 void

-java_print_type (struct type *type, char *varstring, struct ui_file *stream,
-                int show, int level)
+java_print_type (struct type *type, const char *varstring,
+                struct ui_file *stream, int show, int level)

 {
   int demangled_args;
 
 {
   int demangled_args;
 


@@ -336,8 +347,8 @@ java_print_type (struct type *type, char *varstring, struct ui_file *stream,
     }
 
   /* For demangled function names, we have the arglist as part of the name,
     }
 
   /* For demangled function names, we have the arglist as part of the name,

-     so don't print an additional pair of ()'s */
+     so don't print an additional pair of ()'s.  */

 
 

-  demangled_args = strchr (varstring, '(') != NULL;
+  demangled_args = varstring != NULL && strchr (varstring, '(') != NULL;

   c_type_print_varspec_suffix (type, stream, show, 0, demangled_args);
 }
   c_type_print_varspec_suffix (type, stream, show, 0, demangled_args);
 }