Use target_xfer_partial_ftype for rs6000_xfer_shared_libraries

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

diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index b0de0ab011937422f90b78f82a8f938f711a4370..8356aab7d6de922e5b91e545a2f937d776263aa3 100644 (file)
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -1,7 +1,6 @@
 /* Support for printing Fortran types for GDB, the GNU debugger.
 
 /* Support for printing Fortran types for GDB, the GNU debugger.
 

-   Copyright (C) 1986, 1988, 1989, 1991, 1993, 1994, 1995, 1996, 1998,
-   2000, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.

 
    Contributed by Motorola.  Adapted from the C version by Farooq Butt
    (fmbutt@engage.sps.mot.com).
 
    Contributed by Motorola.  Adapted from the C version by Farooq Butt
    (fmbutt@engage.sps.mot.com).


@@ -10,7 +9,7 @@
 
    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 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,


@@ -19,9 +18,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 "gdb_obstack.h"
 
 #include "defs.h"
 #include "gdb_obstack.h"


@@ -34,17 +31,14 @@
 #include "target.h"
 #include "f-lang.h"
 
 #include "target.h"
 #include "f-lang.h"
 

-#include "gdb_string.h"
+#include <string.h>

 #include <errno.h>
 
 #include <errno.h>
 

-#if 0                          /* Currently unused */
+#if 0                          /* Currently unused.  */

 static void f_type_print_args (struct type *, struct ui_file *);
 #endif
 
 static void f_type_print_args (struct type *, struct ui_file *);
 #endif
 

-static void print_equivalent_f77_float_type (int level, struct type *,
-                                            struct ui_file *);
-
-static void f_type_print_varspec_suffix (struct type *, struct ui_file *,
+static void f_type_print_varspec_suffix (struct type *, struct ui_file *, int,

                                         int, int, int);
 
 void f_type_print_varspec_prefix (struct type *, struct ui_file *,
                                         int, int, int);
 
 void f_type_print_varspec_prefix (struct type *, struct ui_file *,


@@ -56,8 +50,8 @@ void f_type_print_base (struct type *, struct ui_file *, int, int);
 /* LEVEL is the depth to indent lines by.  */
 
 void
 /* LEVEL is the depth to indent lines by.  */
 
 void

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

 {
   enum type_code code;
   int demangled_args;
 {
   enum type_code code;
   int demangled_args;


@@ -65,26 +59,26 @@ f_print_type (struct type *type, char *varstring, struct ui_file *stream,
   f_type_print_base (type, stream, show, level);
   code = TYPE_CODE (type);
   if ((varstring != NULL && *varstring != '\0')
   f_type_print_base (type, stream, show, level);
   code = TYPE_CODE (type);
   if ((varstring != NULL && *varstring != '\0')

-      ||

   /* Need a space if going to print stars or brackets;
      but not if we will print just a type name.  */
   /* Need a space if going to print stars or brackets;
      but not if we will print just a type name.  */

-      ((show > 0 || TYPE_NAME (type) == 0)
-       &&
-       (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
-       || code == TYPE_CODE_METHOD
-       || code == TYPE_CODE_ARRAY
-       || code == TYPE_CODE_MEMBER
-       || code == TYPE_CODE_REF)))
+      || ((show > 0 || TYPE_NAME (type) == 0)
+          && (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
+             || code == TYPE_CODE_METHOD
+             || code == TYPE_CODE_ARRAY
+             || code == TYPE_CODE_REF)))

     fputs_filtered (" ", stream);
   f_type_print_varspec_prefix (type, stream, show, 0);
 
     fputs_filtered (" ", stream);
   f_type_print_varspec_prefix (type, stream, show, 0);
 

-  fputs_filtered (varstring, stream);
+  if (varstring != NULL)
+    {
+      fputs_filtered (varstring, stream);

 
 

-  /* For demangled function names, we have the arglist as part of the name,
-     so don't print an additional pair of ()'s */
+      /* For demangled function names, we have the arglist as part of the name,
+         so don't print an additional pair of ()'s.  */

 
 

-  demangled_args = varstring[strlen (varstring) - 1] == ')';
-  f_type_print_varspec_suffix (type, stream, show, 0, demangled_args);
+      demangled_args = varstring[strlen (varstring) - 1] == ')'; 
+      f_type_print_varspec_suffix (type, stream, show, 0, demangled_args, 0);
+   }

 }
 
 /* Print any asterisks or open-parentheses needed before the
 }
 
 /* Print any asterisks or open-parentheses needed before the


@@ -136,9 +130,7 @@ f_type_print_varspec_prefix (struct type *type, struct ui_file *stream,
     case TYPE_CODE_SET:
     case TYPE_CODE_RANGE:
     case TYPE_CODE_STRING:
     case TYPE_CODE_SET:
     case TYPE_CODE_RANGE:
     case TYPE_CODE_STRING:

-    case TYPE_CODE_BITSTRING:

     case TYPE_CODE_METHOD:
     case TYPE_CODE_METHOD:

-    case TYPE_CODE_MEMBER:

     case TYPE_CODE_REF:
     case TYPE_CODE_COMPLEX:
     case TYPE_CODE_TYPEDEF:
     case TYPE_CODE_REF:
     case TYPE_CODE_COMPLEX:
     case TYPE_CODE_TYPEDEF:


@@ -154,12 +146,13 @@ f_type_print_varspec_prefix (struct type *type, struct ui_file *stream,
 
 static void
 f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
 
 static void
 f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,

-                            int show, int passed_a_ptr, int demangled_args)
+                            int show, int passed_a_ptr, int demangled_args,
+                            int arrayprint_recurse_level)

 {
   int upper_bound, lower_bound;
 {
   int upper_bound, lower_bound;

-  int lower_bound_was_default = 0;
-  static int arrayprint_recurse_level = 0;
-  int retcode;
+
+  /* No static variables are permitted as an error call may occur during
+     execution of this function.  */

 
   if (type == 0)
     return;
 
   if (type == 0)
     return;


@@ -178,41 +171,27 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
        fprintf_filtered (stream, "(");
 
       if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY)
        fprintf_filtered (stream, "(");
 
       if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY)

-       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0);
-
-      retcode = f77_get_dynamic_lowerbound (type, &lower_bound);
+       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0,
+                                    arrayprint_recurse_level);

 
 

-      lower_bound_was_default = 0;
-
-      if (retcode == BOUND_FETCH_ERROR)
-       fprintf_filtered (stream, "???");
-      else if (lower_bound == 1)       /* The default */
-       lower_bound_was_default = 1;
-      else
-       fprintf_filtered (stream, "%d", lower_bound);
-
-      if (lower_bound_was_default)
-       lower_bound_was_default = 0;
-      else
-       fprintf_filtered (stream, ":");
+      lower_bound = f77_get_lowerbound (type);
+      if (lower_bound != 1)    /* Not the default.  */
+       fprintf_filtered (stream, "%d:", lower_bound);

 
       /* Make sure that, if we have an assumed size array, we
 
       /* Make sure that, if we have an assumed size array, we

-         print out a warning and print the upperbound as '*' */
+         print out a warning and print the upperbound as '*'.  */

 
 

-      if (TYPE_ARRAY_UPPER_BOUND_TYPE (type) == BOUND_CANNOT_BE_DETERMINED)
+      if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))

        fprintf_filtered (stream, "*");
       else
        {
        fprintf_filtered (stream, "*");
       else
        {

-         retcode = f77_get_dynamic_upperbound (type, &upper_bound);
-
-         if (retcode == BOUND_FETCH_ERROR)
-           fprintf_filtered (stream, "???");
-         else
-           fprintf_filtered (stream, "%d", upper_bound);
+         upper_bound = f77_get_upperbound (type);
+         fprintf_filtered (stream, "%d", upper_bound);

        }
 
       if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY)
        }
 
       if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY)

-       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0);
+       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0,
+                                    arrayprint_recurse_level);

       if (arrayprint_recurse_level == 1)
        fprintf_filtered (stream, ")");
       else
       if (arrayprint_recurse_level == 1)
        fprintf_filtered (stream, ")");
       else


@@ -222,13 +201,14 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
 
     case TYPE_CODE_PTR:
     case TYPE_CODE_REF:
 
     case TYPE_CODE_PTR:
     case TYPE_CODE_REF:

-      f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 1, 0);
+      f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 1, 0,
+                                  arrayprint_recurse_level);

       fprintf_filtered (stream, ")");
       break;
 
     case TYPE_CODE_FUNC:
       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,
       fprintf_filtered (stream, ")");
       break;
 
     case TYPE_CODE_FUNC:
       f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,

-                                  passed_a_ptr, 0);
+                                  passed_a_ptr, 0, arrayprint_recurse_level);

       if (passed_a_ptr)
        fprintf_filtered (stream, ")");
 
       if (passed_a_ptr)
        fprintf_filtered (stream, ")");
 


@@ -248,9 +228,7 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
     case TYPE_CODE_SET:
     case TYPE_CODE_RANGE:
     case TYPE_CODE_STRING:
     case TYPE_CODE_SET:
     case TYPE_CODE_RANGE:
     case TYPE_CODE_STRING:

-    case TYPE_CODE_BITSTRING:

     case TYPE_CODE_METHOD:
     case TYPE_CODE_METHOD:

-    case TYPE_CODE_MEMBER:

     case TYPE_CODE_COMPLEX:
     case TYPE_CODE_TYPEDEF:
       /* These types do not need a suffix.  They are listed so that
     case TYPE_CODE_COMPLEX:
     case TYPE_CODE_TYPEDEF:
       /* These types do not need a suffix.  They are listed so that


@@ -259,17 +237,6 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
     }
 }
 
     }
 }
 

-static void
-print_equivalent_f77_float_type (int level, struct type *type,
-                                struct ui_file *stream)
-{
-  /* Override type name "float" and make it the
-     appropriate real. XLC stupidly outputs -12 as a type
-     for real when it really should be outputting -18 */
-
-  fprintfi_filtered (level, stream, "real*%d", TYPE_LENGTH (type));
-}
-

 /* Print the name of the type (or the ultimate pointer target,
    function value or array element), or the description of a
    structure or union.
 /* Print the name of the type (or the ultimate pointer target,
    function value or array element), or the description of a
    structure or union.


@@ -287,9 +254,7 @@ void
 f_type_print_base (struct type *type, struct ui_file *stream, int show,
                   int level)
 {
 f_type_print_base (struct type *type, struct ui_file *stream, int show,
                   int level)
 {

-  int retcode;

   int upper_bound;
   int upper_bound;

-

   int index;
 
   QUIT;
   int index;
 
   QUIT;


@@ -302,14 +267,11 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
     }
 
   /* When SHOW is zero or less, and there is a valid type name, then always
     }
 
   /* When SHOW is zero or less, and there is a valid type name, then always

-     just print the type name directly from the type. */
+     just print the type name directly from the type.  */

 
   if ((show <= 0) && (TYPE_NAME (type) != NULL))
     {
 
   if ((show <= 0) && (TYPE_NAME (type) != NULL))
     {

-      if (TYPE_CODE (type) == TYPE_CODE_FLT)
-       print_equivalent_f77_float_type (level, type, stream);
-      else
-       fputs_filtered (TYPE_NAME (type), stream);
+      fputs_filtered (TYPE_NAME (type), stream);

       return;
     }
 
       return;
     }
 


@@ -346,19 +308,15 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
       break;
 
     case TYPE_CODE_ERROR:
       break;
 
     case TYPE_CODE_ERROR:

-      fprintfi_filtered (level, stream, "<unknown type>");
+      fprintfi_filtered (level, stream, "%s", TYPE_ERROR_NAME (type));

       break;
 
     case TYPE_CODE_RANGE:
       break;
 
     case TYPE_CODE_RANGE:

-      /* This should not occur */
+      /* This should not occur.  */

       fprintfi_filtered (level, stream, "<range type>");
       break;
 
     case TYPE_CODE_CHAR:
       fprintfi_filtered (level, stream, "<range type>");
       break;
 
     case TYPE_CODE_CHAR:

-      /* Override name "char" and make it "character" */
-      fprintfi_filtered (level, stream, "character");
-      break;
-

     case TYPE_CODE_INT:
       /* There may be some character types that attempt to come
          through as TYPE_CODE_INT since dbxstclass.h is so
     case TYPE_CODE_INT:
       /* There may be some character types that attempt to come
          through as TYPE_CODE_INT since dbxstclass.h is so


@@ -370,53 +328,52 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show,
        goto default_case;
       break;
 
        goto default_case;
       break;
 

-    case TYPE_CODE_COMPLEX:
-      fprintfi_filtered (level, stream, "complex*%d", TYPE_LENGTH (type));
-      break;
-
-    case TYPE_CODE_FLT:
-      print_equivalent_f77_float_type (level, type, stream);
-      break;
-

     case TYPE_CODE_STRING:
     case TYPE_CODE_STRING:

-      /* Strings may have dynamic upperbounds (lengths) like arrays. */
+      /* Strings may have dynamic upperbounds (lengths) like arrays.  */

 
 

-      if (TYPE_ARRAY_UPPER_BOUND_TYPE (type) == BOUND_CANNOT_BE_DETERMINED)
+      if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))

        fprintfi_filtered (level, stream, "character*(*)");
       else
        {
        fprintfi_filtered (level, stream, "character*(*)");
       else
        {

-         retcode = f77_get_dynamic_upperbound (type, &upper_bound);
-
-         if (retcode == BOUND_FETCH_ERROR)
-           fprintf_filtered (stream, "character*???");
-         else
-           fprintf_filtered (stream, "character*%d", upper_bound);
+         upper_bound = f77_get_upperbound (type);
+         fprintf_filtered (stream, "character*%d", upper_bound);

        }
       break;
 
     case TYPE_CODE_STRUCT:
        }
       break;
 
     case TYPE_CODE_STRUCT:

-      fprintfi_filtered (level, stream, "Type ");
+    case TYPE_CODE_UNION:
+      if (TYPE_CODE (type) == TYPE_CODE_UNION)
+       fprintfi_filtered (level, stream, "Type, C_Union :: ");
+      else
+       fprintfi_filtered (level, stream, "Type ");

       fputs_filtered (TYPE_TAG_NAME (type), stream);
       fputs_filtered ("\n", stream);
       for (index = 0; index < TYPE_NFIELDS (type); index++)
        {
       fputs_filtered (TYPE_TAG_NAME (type), stream);
       fputs_filtered ("\n", stream);
       for (index = 0; index < TYPE_NFIELDS (type); index++)
        {

-         f_print_type (TYPE_FIELD_TYPE (type, index), "", stream, show, level + 4);
+         f_type_print_base (TYPE_FIELD_TYPE (type, index), stream, show,
+                            level + 4);

          fputs_filtered (" :: ", stream);
          fputs_filtered (TYPE_FIELD_NAME (type, index), stream);
          fputs_filtered (" :: ", stream);
          fputs_filtered (TYPE_FIELD_NAME (type, index), stream);

+         f_type_print_varspec_suffix (TYPE_FIELD_TYPE (type, index),
+                                      stream, 0, 0, 0, 0);

          fputs_filtered ("\n", stream);
        } 
       fprintfi_filtered (level, stream, "End Type ");
       fputs_filtered (TYPE_TAG_NAME (type), stream);
       break;
 
          fputs_filtered ("\n", stream);
        } 
       fprintfi_filtered (level, stream, "End Type ");
       fputs_filtered (TYPE_TAG_NAME (type), stream);
       break;
 

+    case TYPE_CODE_MODULE:
+      fprintfi_filtered (level, stream, "module %s", TYPE_TAG_NAME (type));
+      break;
+

     default_case:
     default:
       /* Handle types not explicitly handled by the other cases,
          such as fundamental types.  For these, just print whatever
          the type name is, as recorded in the type itself.  If there
     default_case:
     default:
       /* Handle types not explicitly handled by the other cases,
          such as fundamental types.  For these, just print whatever
          the type name is, as recorded in the type itself.  If there

-         is no type name, then complain. */
+         is no type name, then complain.  */

       if (TYPE_NAME (type) != NULL)
       if (TYPE_NAME (type) != NULL)

-       fprintfi_filtered (level, stream, "%s ", TYPE_NAME (type));
+       fprintfi_filtered (level, stream, "%s", TYPE_NAME (type));

       else
        error (_("Invalid type code (%d) in symbol table."), TYPE_CODE (type));
       break;
       else
        error (_("Invalid type code (%d) in symbol table."), TYPE_CODE (type));
       break;