Add myself as write after approval maintainer

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

diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 1f26438b90221c1aa398bff5cd39dce52a806c49..72c107b52bbe7a415a697f004540a7cd119e2674 100644 (file)
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -1,13 +1,11 @@
 /* Support for printing Modula 2 types for GDB, the GNU debugger.
 /* Support for printing Modula 2 types for GDB, the GNU debugger.

-   Copyright (C) 1986, 1988, 1989, 1991, 1992, 1995, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 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,


@@ -16,9 +14,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"


@@ -36,44 +32,49 @@
 #include "typeprint.h"
 #include "cp-abi.h"
 
 #include "typeprint.h"
 #include "cp-abi.h"
 

-#include "gdb_string.h"
-#include <errno.h>
-

 static void m2_print_bounds (struct type *type,
                             struct ui_file *stream, int show, int level,
                             int print_high);
 
 static void m2_print_bounds (struct type *type,
                             struct ui_file *stream, int show, int level,
                             int print_high);
 

-static void m2_typedef (struct type *, struct ui_file *, int, int);
-static void m2_array (struct type *, struct ui_file *, int, int);
-static void m2_pointer (struct type *, struct ui_file *, int, int);
-static void m2_ref (struct type *, struct ui_file *, int, int);
-static void m2_procedure (struct type *, struct ui_file *, int, int);
+static void m2_typedef (struct type *, struct ui_file *, int, int,
+                       const struct type_print_options *);
+static void m2_array (struct type *, struct ui_file *, int, int,
+                     const struct type_print_options *);
+static void m2_pointer (struct type *, struct ui_file *, int, int,
+                       const struct type_print_options *);
+static void m2_ref (struct type *, struct ui_file *, int, int,
+                   const struct type_print_options *);
+static void m2_procedure (struct type *, struct ui_file *, int, int,
+                         const struct type_print_options *);

 static void m2_union (struct type *, struct ui_file *);
 static void m2_enum (struct type *, struct ui_file *, int, int);
 static void m2_union (struct type *, struct ui_file *);
 static void m2_enum (struct type *, struct ui_file *, int, int);

-static void m2_range (struct type *, struct ui_file *, int, int);
+static void m2_range (struct type *, struct ui_file *, int, int,
+                     const struct type_print_options *);

 static void m2_type_name (struct type *type, struct ui_file *stream);
 static void m2_short_set (struct type *type, struct ui_file *stream,
                          int show, int level);
 static int m2_long_set (struct type *type, struct ui_file *stream,
 static void m2_type_name (struct type *type, struct ui_file *stream);
 static void m2_short_set (struct type *type, struct ui_file *stream,
                          int show, int level);
 static int m2_long_set (struct type *type, struct ui_file *stream,

-                       int show, int level);
+                       int show, int level, const struct type_print_options *flags);
+static int m2_unbounded_array (struct type *type, struct ui_file *stream,
+                              int show, int level,
+                              const struct type_print_options *flags);

 static void m2_record_fields (struct type *type, struct ui_file *stream,
 static void m2_record_fields (struct type *type, struct ui_file *stream,

-                             int show, int level);
+                             int show, int level, const struct type_print_options *flags);

 static void m2_unknown (const char *s, struct type *type,
                        struct ui_file *stream, int show, int level);
 
 int m2_is_long_set (struct type *type);
 int m2_is_long_set_of_type (struct type *type, struct type **of_type);
 static void m2_unknown (const char *s, struct type *type,
                        struct ui_file *stream, int show, int level);
 
 int m2_is_long_set (struct type *type);
 int m2_is_long_set_of_type (struct type *type, struct type **of_type);

+int m2_is_unbounded_array (struct type *type);

 
 
 void
 
 
 void

-m2_print_type (struct type *type, char *varstring, struct ui_file *stream,
-              int show, int level)
+m2_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;
-

   CHECK_TYPEDEF (type);
   CHECK_TYPEDEF (type);

-  code = TYPE_CODE (type);

 
   QUIT;
 
 
   QUIT;
 


@@ -91,25 +92,26 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream,
       break;
 
     case TYPE_CODE_STRUCT:
       break;
 
     case TYPE_CODE_STRUCT:

-      if (m2_long_set (type, stream, show, level))
+      if (m2_long_set (type, stream, show, level, flags)
+         || m2_unbounded_array (type, stream, show, level, flags))

        break;
        break;

-      m2_record_fields (type, stream, show, level);
+      m2_record_fields (type, stream, show, level, flags);

       break;
 
     case TYPE_CODE_TYPEDEF:
       break;
 
     case TYPE_CODE_TYPEDEF:

-      m2_typedef (type, stream, show, level);
+      m2_typedef (type, stream, show, level, flags);

       break;
 
     case TYPE_CODE_ARRAY:
       break;
 
     case TYPE_CODE_ARRAY:

-      m2_array (type, stream, show, level);
+      m2_array (type, stream, show, level, flags);

       break;
 
     case TYPE_CODE_PTR:
       break;
 
     case TYPE_CODE_PTR:

-      m2_pointer (type, stream, show, level);
+      m2_pointer (type, stream, show, level, flags);

       break;
 
     case TYPE_CODE_REF:
       break;
 
     case TYPE_CODE_REF:

-      m2_ref (type, stream, show, level);
+      m2_ref (type, stream, show, level, flags);

       break;
 
     case TYPE_CODE_METHOD:
       break;
 
     case TYPE_CODE_METHOD:


@@ -117,7 +119,7 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream,
       break;
 
     case TYPE_CODE_FUNC:
       break;
 
     case TYPE_CODE_FUNC:

-      m2_procedure (type, stream, show, level);
+      m2_procedure (type, stream, show, level, flags);

       break;
 
     case TYPE_CODE_UNION:
       break;
 
     case TYPE_CODE_UNION:


@@ -132,7 +134,7 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream,
       break;
 
     case TYPE_CODE_UNDEF:
       break;
 
     case TYPE_CODE_UNDEF:

-      /* i18n: Do not translate the "struct" part! */
+      /* i18n: Do not translate the "struct" part!  */

       m2_unknown (_("undef"), type, stream, show, level);
       break;
 
       m2_unknown (_("undef"), type, stream, show, level);
       break;
 


@@ -141,10 +143,7 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream,
       break;
 
     case TYPE_CODE_RANGE:
       break;
 
     case TYPE_CODE_RANGE:

-      m2_range (type, stream, show, level);
-      break;
-
-    case TYPE_CODE_TEMPLATE:
+      m2_range (type, stream, show, level, flags);

       break;
 
     default:
       break;
 
     default:


@@ -153,9 +152,27 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream,
     }
 }
 
     }
 }
 

-/*
- *  m2_type_name - if a, type, has a name then print it.
- */
+/* Print a typedef using M2 syntax.  TYPE is the underlying type.
+   NEW_SYMBOL is the symbol naming the type.  STREAM is the stream on
+   which to print.  */
+
+void
+m2_print_typedef (struct type *type, struct symbol *new_symbol,
+                 struct ui_file *stream)
+{
+  CHECK_TYPEDEF (type);
+  fprintf_filtered (stream, "TYPE ");
+  if (!TYPE_NAME (SYMBOL_TYPE (new_symbol))
+      || strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
+                SYMBOL_LINKAGE_NAME (new_symbol)) != 0)
+    fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new_symbol));
+  else
+    fprintf_filtered (stream, "<builtin> = ");
+  type_print (type, "", stream, 0);
+  fprintf_filtered (stream, ";\n");
+}
+
+/* m2_type_name - if a, type, has a name then print it.  */

 
 void
 m2_type_name (struct type *type, struct ui_file *stream)
 
 void
 m2_type_name (struct type *type, struct ui_file *stream)


@@ -164,16 +181,15 @@ m2_type_name (struct type *type, struct ui_file *stream)
     fputs_filtered (TYPE_NAME (type), stream);
 }
 
     fputs_filtered (TYPE_NAME (type), stream);
 }
 

-/*
- *  m2_range - displays a Modula-2 subrange type.
- */
+/* m2_range - displays a Modula-2 subrange type.  */

 
 void
 m2_range (struct type *type, struct ui_file *stream, int show,
 
 void
 m2_range (struct type *type, struct ui_file *stream, int show,

-         int level)
+         int level, const struct type_print_options *flags)

 {
   if (TYPE_HIGH_BOUND (type) == TYPE_LOW_BOUND (type))
 {
   if (TYPE_HIGH_BOUND (type) == TYPE_LOW_BOUND (type))

-    m2_print_type (TYPE_DOMAIN_TYPE (type), "", stream, show, level);
+    m2_print_type (TYPE_DOMAIN_TYPE (type), "", stream, show, level,
+                  flags);

   else
     {
       struct type *target = TYPE_TARGET_TYPE (type);
   else
     {
       struct type *target = TYPE_TARGET_TYPE (type);


@@ -188,26 +204,24 @@ m2_range (struct type *type, struct ui_file *stream, int show,
 
 static void
 m2_typedef (struct type *type, struct ui_file *stream, int show,
 
 static void
 m2_typedef (struct type *type, struct ui_file *stream, int show,

-           int level)
+           int level, const struct type_print_options *flags)

 {
   if (TYPE_NAME (type) != NULL)
     {
       fputs_filtered (TYPE_NAME (type), stream);
       fputs_filtered (" = ", stream);
     }
 {
   if (TYPE_NAME (type) != NULL)
     {
       fputs_filtered (TYPE_NAME (type), stream);
       fputs_filtered (" = ", stream);
     }

-  m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+  m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);

 }
 
 }
 

-/*
- *  m2_array - prints out a Modula-2 ARRAY ... OF type
- */
+/* m2_array - prints out a Modula-2 ARRAY ... OF type.  */

 
 static void m2_array (struct type *type, struct ui_file *stream,
 
 static void m2_array (struct type *type, struct ui_file *stream,

-                     int show, int level)
+                     int show, int level, const struct type_print_options *flags)

 {
   fprintf_filtered (stream, "ARRAY [");
   if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
 {
   fprintf_filtered (stream, "ARRAY [");
   if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0

-      && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED)
+      && !TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))

     {
       if (TYPE_INDEX_TYPE (type) != 0)
        {
     {
       if (TYPE_INDEX_TYPE (type) != 0)
        {


@@ -221,27 +235,27 @@ static void m2_array (struct type *type, struct ui_file *stream,
                           / TYPE_LENGTH (TYPE_TARGET_TYPE (type))));
     }
   fprintf_filtered (stream, "] OF ");
                           / TYPE_LENGTH (TYPE_TARGET_TYPE (type))));
     }
   fprintf_filtered (stream, "] OF ");

-  m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+  m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);

 }
 
 static void
 m2_pointer (struct type *type, struct ui_file *stream, int show,
 }
 
 static void
 m2_pointer (struct type *type, struct ui_file *stream, int show,

-           int level)
+           int level, const struct type_print_options *flags)

 {
   if (TYPE_CONST (type))
     fprintf_filtered (stream, "[...] : ");
   else
     fprintf_filtered (stream, "POINTER TO ");
 
 {
   if (TYPE_CONST (type))
     fprintf_filtered (stream, "[...] : ");
   else
     fprintf_filtered (stream, "POINTER TO ");
 

-  m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+  m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);

 }
 
 static void
 m2_ref (struct type *type, struct ui_file *stream, int show,
 }
 
 static void
 m2_ref (struct type *type, struct ui_file *stream, int show,

-       int level)
+       int level, const struct type_print_options *flags)

 {
   fprintf_filtered (stream, "VAR");
 {
   fprintf_filtered (stream, "VAR");

-  m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+  m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);

 }
 
 static void
 }
 
 static void


@@ -258,7 +272,7 @@ static void m2_union (struct type *type, struct ui_file *stream)
 
 static void
 m2_procedure (struct type *type, struct ui_file *stream,
 
 static void
 m2_procedure (struct type *type, struct ui_file *stream,

-             int show, int level)
+             int show, int level, const struct type_print_options *flags)

 {
   fprintf_filtered (stream, "PROCEDURE ");
   m2_type_name (type, stream);
 {
   fprintf_filtered (stream, "PROCEDURE ");
   m2_type_name (type, stream);


@@ -274,12 +288,12 @@ m2_procedure (struct type *type, struct ui_file *stream,
              fputs_filtered (", ", stream);
              wrap_here ("    ");
            }
              fputs_filtered (", ", stream);
              wrap_here ("    ");
            }

-         m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0);
+         m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, flags);

        }
       if (TYPE_TARGET_TYPE (type) != NULL)
        {
          fprintf_filtered (stream, " : ");
        }
       if (TYPE_TARGET_TYPE (type) != NULL)
        {
          fprintf_filtered (stream, " : ");

-         m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0);
+         m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0, flags);

        }
     }
 }
        }
     }
 }


@@ -291,9 +305,6 @@ m2_print_bounds (struct type *type,
 {
   struct type *target = TYPE_TARGET_TYPE (type);
 
 {
   struct type *target = TYPE_TARGET_TYPE (type);
 

-  if (target == NULL)
-    target = builtin_type_int;
-

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


@@ -319,17 +330,16 @@ m2_short_set (struct type *type, struct ui_file *stream, int show, int level)
 int
 m2_is_long_set (struct type *type)
 {
 int
 m2_is_long_set (struct type *type)
 {

-  LONGEST previous_high = 0;  /* unnecessary initialization
-                                keeps gcc -Wall happy */
+  LONGEST previous_high = 0;  /* Unnecessary initialization
+                                keeps gcc -Wall happy.  */

   int len, i;
   struct type *range;
 
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
     {
 
   int len, i;
   struct type *range;
 
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
     {
 

-      /*
-       *  check if all fields of the RECORD are consecutive sets
-       */
+      /* check if all fields of the RECORD are consecutive sets.  */
+

       len = TYPE_NFIELDS (type);
       for (i = TYPE_N_BASECLASSES (type); i < len; i++)
        {
       len = TYPE_NFIELDS (type);
       for (i = TYPE_N_BASECLASSES (type); i < len; i++)
        {


@@ -351,14 +361,12 @@ m2_is_long_set (struct type *type)
   return 0;
 }
 
   return 0;
 }
 

-/*
- *  m2_get_discrete_bounds - a wrapper for get_discrete_bounds which
- *                           understands that CHARs might be signed.
- *                           This should be integrated into gdbtypes.c
- *                           inside get_discrete_bounds.
- */
+/* m2_get_discrete_bounds - a wrapper for get_discrete_bounds which
+                            understands that CHARs might be signed.
+                            This should be integrated into gdbtypes.c
+                            inside get_discrete_bounds.  */

 
 

-int
+static int

 m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp)
 {
   CHECK_TYPEDEF (type);
 m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp)
 {
   CHECK_TYPEDEF (type);


@@ -380,11 +388,9 @@ m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp)
     }
 }
 
     }
 }
 

-/*
- *  m2_is_long_set_of_type - returns TRUE if the long set was declared as
- *                           SET OF <oftype> of_type is assigned to the
- *                           subtype.
- */
+/* m2_is_long_set_of_type - returns TRUE if the long set was declared as
+                            SET OF <oftype> of_type is assigned to the
+                            subtype.  */

 
 int
 m2_is_long_set_of_type (struct type *type, struct type **of_type)
 
 int
 m2_is_long_set_of_type (struct type *type, struct type **of_type)


@@ -403,8 +409,6 @@ m2_is_long_set_of_type (struct type *type, struct type **of_type)
        return 0;
       range = TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, i));
       target = TYPE_TARGET_TYPE (range);
        return 0;
       range = TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, i));
       target = TYPE_TARGET_TYPE (range);

-      if (target == NULL)
-       target = builtin_type_int;

 
       l1 = TYPE_LOW_BOUND (TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, i)));
       h1 = TYPE_HIGH_BOUND (TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, len-1)));
 
       l1 = TYPE_LOW_BOUND (TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, i)));
       h1 = TYPE_HIGH_BOUND (TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, len-1)));


@@ -419,10 +423,9 @@ m2_is_long_set_of_type (struct type *type, struct type **of_type)
 }
 
 static int
 }
 
 static int

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

 {
 {

-  struct type *index_type;
-  struct type *range_type;

   struct type *of_type;
   int i;
   int len = TYPE_NFIELDS (type);
   struct type *of_type;
   int i;
   int len = TYPE_NFIELDS (type);


@@ -452,7 +455,7 @@ m2_long_set (struct type *type, struct ui_file *stream, int show, int level)
          fprintf_filtered(stream, "SET OF ");
          i = TYPE_N_BASECLASSES (type);
          if (m2_is_long_set_of_type (type, &of_type))
          fprintf_filtered(stream, "SET OF ");
          i = TYPE_N_BASECLASSES (type);
          if (m2_is_long_set_of_type (type, &of_type))

-           m2_print_type (of_type, "", stream, show - 1, level);
+           m2_print_type (of_type, "", stream, show - 1, level, flags);

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


@@ -467,7 +470,7 @@ m2_long_set (struct type *type, struct ui_file *stream, int show, int level)
            }
        }
       else
            }
        }
       else

-       /* i18n: Do not translate the "SET OF" part! */
+       /* i18n: Do not translate the "SET OF" part!  */

        fprintf_filtered(stream, _("SET OF <unknown>"));
 
       return 1;
        fprintf_filtered(stream, _("SET OF <unknown>"));
 
       return 1;


@@ -475,12 +478,60 @@ m2_long_set (struct type *type, struct ui_file *stream, int show, int level)
   return 0;
 }
 
   return 0;
 }
 

+/* m2_is_unbounded_array - returns TRUE if, type, should be regarded
+                           as a Modula-2 unbounded ARRAY type.  */
+
+int
+m2_is_unbounded_array (struct type *type)
+{
+  if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+    {
+      /*
+       *  check if we have a structure with exactly two fields named
+       *  _m2_contents and _m2_high.  It also checks to see if the
+       *  type of _m2_contents is a pointer.  The TYPE_TARGET_TYPE
+       *  of the pointer determines the unbounded ARRAY OF type.
+       */
+      if (TYPE_NFIELDS (type) != 2)
+       return 0;
+      if (strcmp (TYPE_FIELD_NAME (type, 0), "_m2_contents") != 0)
+       return 0;
+      if (strcmp (TYPE_FIELD_NAME (type, 1), "_m2_high") != 0)
+       return 0;
+      if (TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) != TYPE_CODE_PTR)
+       return 0;
+      return 1;
+    }
+  return 0;
+}
+
+/* m2_unbounded_array - if the struct type matches a Modula-2 unbounded
+                        parameter type then display the type as an
+                        ARRAY OF type.  Returns TRUE if an unbounded
+                        array type was detected.  */
+
+static int
+m2_unbounded_array (struct type *type, struct ui_file *stream, int show,
+                   int level, const struct type_print_options *flags)
+{
+  if (m2_is_unbounded_array (type))
+    {
+      if (show > 0)
+       {
+         fputs_filtered ("ARRAY OF ", stream);
+         m2_print_type (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0)),
+                        "", stream, 0, level, flags);
+       }
+      return 1;
+    }
+  return 0;
+}
+

 void
 m2_record_fields (struct type *type, struct ui_file *stream, int show,
 void
 m2_record_fields (struct type *type, struct ui_file *stream, int show,

-                 int level)
+                 int level, const struct type_print_options *flags)

 {
 {

-  /* Print the tag if it exists. 
-   */
+  /* Print the tag if it exists.  */

   if (TYPE_TAG_NAME (type) != NULL)
     {
       if (strncmp (TYPE_TAG_NAME (type), "$$", 2) != 0)
   if (TYPE_TAG_NAME (type) != NULL)
     {
       if (strncmp (TYPE_TAG_NAME (type), "$$", 2) != 0)


@@ -493,9 +544,9 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show,
   wrap_here ("    ");
   if (show < 0)
     {
   wrap_here ("    ");
   if (show < 0)
     {

-      if (TYPE_CODE (type) == DECLARED_TYPE_STRUCT)
+      if (TYPE_CODE (type) == TYPE_CODE_STRUCT)

        fprintf_filtered (stream, "RECORD ... END ");
        fprintf_filtered (stream, "RECORD ... END ");

-      else if (TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_UNION)
+      else if (TYPE_CODE (type) == TYPE_CODE_UNION)

        fprintf_filtered (stream, "CASE ... END ");
     }
   else if (show > 0)
        fprintf_filtered (stream, "CASE ... END ");
     }
   else if (show > 0)


@@ -506,7 +557,7 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show,
       if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
        fprintf_filtered (stream, "RECORD\n");
       else if (TYPE_CODE (type) == TYPE_CODE_UNION)
       if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
        fprintf_filtered (stream, "RECORD\n");
       else if (TYPE_CODE (type) == TYPE_CODE_UNION)

-       /* i18n: Do not translate "CASE" and "OF" */
+       /* i18n: Do not translate "CASE" and "OF".  */

        fprintf_filtered (stream, _("CASE <variant> OF\n"));
 
       for (i = TYPE_N_BASECLASSES (type); i < len; i++)
        fprintf_filtered (stream, _("CASE <variant> OF\n"));
 
       for (i = TYPE_N_BASECLASSES (type); i < len; i++)


@@ -518,7 +569,7 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show,
          fputs_filtered (" : ", stream);
          m2_print_type (TYPE_FIELD_TYPE (type, i),
                         "",
          fputs_filtered (" : ", stream);
          m2_print_type (TYPE_FIELD_TYPE (type, i),
                         "",

-                        stream, 0, level + 4);
+                        stream, 0, level + 4, flags);

          if (TYPE_FIELD_PACKED (type, i))
            {
              /* It is a bitfield.  This code does not attempt
          if (TYPE_FIELD_PACKED (type, i))
            {
              /* It is a bitfield.  This code does not attempt


@@ -539,7 +590,8 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show,
 void
 m2_enum (struct type *type, struct ui_file *stream, int show, int level)
 {
 void
 m2_enum (struct type *type, struct ui_file *stream, int show, int level)
 {

-  int lastval, i, len;
+  LONGEST lastval;
+  int i, len;

 
   if (show < 0)
     {
 
   if (show < 0)
     {


@@ -559,10 +611,11 @@ m2_enum (struct type *type, struct ui_file *stream, int show, int level)
            fprintf_filtered (stream, ", ");
          wrap_here ("    ");
          fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
            fprintf_filtered (stream, ", ");
          wrap_here ("    ");
          fputs_filtered (TYPE_FIELD_NAME (type, i), stream);

-         if (lastval != TYPE_FIELD_BITPOS (type, i))
+         if (lastval != TYPE_FIELD_ENUMVAL (type, i))

            {
            {

-             fprintf_filtered (stream, " = %d", TYPE_FIELD_BITPOS (type, i));
-             lastval = TYPE_FIELD_BITPOS (type, i);
+             fprintf_filtered (stream, " = %s",
+                               plongest (TYPE_FIELD_ENUMVAL (type, i)));
+             lastval = TYPE_FIELD_ENUMVAL (type, i);

            }
          lastval++;
        }
            }
          lastval++;
        }