Changes for GNU/Linux PPC native port of gdb.

[binutils.git] / gdb / cp-valprint.c

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index f68b7530138216b6434af166c30a5a84138a385c..b70ef219d6c37021d72350246894dbf775c6a327 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -1,22 +1,23 @@
 /* Support for printing C++ values for GDB, the GNU debugger.
 /* Support for printing C++ values for GDB, the GNU debugger.

-   Copyright 1986, 1988, 1989, 1991, 1994, 1995
+   Copyright 1986, 1988, 1989, 1991, 1994-1996, 2000

    Free Software Foundation, Inc.
 
    Free Software Foundation, Inc.
 

-This file is part of GDB.
+   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
-(at your option) any later version.
+   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
+   (at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

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


@@ -30,28 +31,42 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "annotate.h"
 #include "gdb_string.h"
 #include "c-lang.h"
 #include "annotate.h"
 #include "gdb_string.h"
 #include "c-lang.h"

+#include "target.h"
+
+/* Indication of presence of HP-compiled object files */
+extern int hp_som_som_object_present;  /* defined in symtab.c */
+

 
 int vtblprint;                 /* Controls printing of vtbl's */
 int objectprint;               /* Controls looking up an object's derived type
                                   using what we find in its vtables.  */
 
 int vtblprint;                 /* Controls printing of vtbl's */
 int objectprint;               /* Controls looking up an object's derived type
                                   using what we find in its vtables.  */

-static int static_field_print; /* Controls printing of static fields. */
+int static_field_print;                /* Controls printing of static fields. */

 
 static struct obstack dont_print_vb_obstack;
 static struct obstack dont_print_statmem_obstack;
 
 
 static struct obstack dont_print_vb_obstack;
 static struct obstack dont_print_statmem_obstack;
 

-static void
-cp_print_static_field PARAMS ((struct type *, value_ptr, GDB_FILE *, int, int,
-                              enum val_prettyprint));
+extern void _initialize_cp_valprint PARAMS ((void));
+
+static void cp_print_static_field (struct type *, value_ptr,
+                                  struct ui_file *, int, int,
+                                  enum val_prettyprint);
+
+static void cp_print_value (struct type *, struct type *, char *, int,
+                           CORE_ADDR, struct ui_file *, int, int,
+                           enum val_prettyprint, struct type **);
+
+static void cp_print_hpacc_virtual_table_entries (struct type *, int *,
+                                                 value_ptr,
+                                                 struct ui_file *, int,
+                                                 int,
+                                                 enum val_prettyprint);

 
 

-static void
-cp_print_value PARAMS ((struct type *, char *, CORE_ADDR, GDB_FILE *,
-                       int, int, enum val_prettyprint, struct type **));

 
 void
 cp_print_class_method (valaddr, type, stream)
      char *valaddr;
      struct type *type;
 
 void
 cp_print_class_method (valaddr, type, stream)
      char *valaddr;
      struct type *type;

-     GDB_FILE *stream;
+     struct ui_file *stream;

 {
   struct type *domain;
   struct fn_field *f = NULL;
 {
   struct type *domain;
   struct fn_field *f = NULL;


@@ -66,7 +81,7 @@ cp_print_class_method (valaddr, type, stream)
   struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
 
   domain = TYPE_DOMAIN_TYPE (target_type);
   struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
 
   domain = TYPE_DOMAIN_TYPE (target_type);

-  if (domain == (struct type *)NULL)
+  if (domain == (struct type *) NULL)

     {
       fprintf_filtered (stream, "<unknown>");
       return;
     {
       fprintf_filtered (stream, "<unknown>");
       return;


@@ -80,12 +95,14 @@ cp_print_class_method (valaddr, type, stream)
        {
          f = TYPE_FN_FIELDLIST1 (domain, i);
          len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);
        {
          f = TYPE_FN_FIELDLIST1 (domain, i);
          len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);

-         
+

          for (j = 0; j < len2; j++)
            {
              QUIT;
              if (TYPE_FN_FIELD_VOFFSET (f, j) == offset)
                {
          for (j = 0; j < len2; j++)
            {
              QUIT;
              if (TYPE_FN_FIELD_VOFFSET (f, j) == offset)
                {

+                 if (TYPE_FN_FIELD_STUB (f, j))
+                   check_stub_method (domain, i, j);

                  kind = "virtual ";
                  goto common;
                }
                  kind = "virtual ";
                  goto common;
                }


@@ -97,6 +114,12 @@ cp_print_class_method (valaddr, type, stream)
       sym = find_pc_function (addr);
       if (sym == 0)
        {
       sym = find_pc_function (addr);
       if (sym == 0)
        {

+         /* 1997-08-01 Currently unsupported with HP aCC */
+         if (hp_som_som_object_present)
+           {
+             fputs_filtered ("?? <not supported with HP aCC>", stream);
+             return;
+           }

          error ("invalid pointer to member function");
        }
       len = TYPE_NFN_FIELDS (domain);
          error ("invalid pointer to member function");
        }
       len = TYPE_NFN_FIELDS (domain);


@@ -104,7 +127,7 @@ cp_print_class_method (valaddr, type, stream)
        {
          f = TYPE_FN_FIELDLIST1 (domain, i);
          len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);
        {
          f = TYPE_FN_FIELDLIST1 (domain, i);
          len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);

-         
+

          for (j = 0; j < len2; j++)
            {
              QUIT;
          for (j = 0; j < len2; j++)
            {
              QUIT;


@@ -117,24 +140,22 @@ cp_print_class_method (valaddr, type, stream)
            }
        }
     }
            }
        }
     }

-  common:
+common:

   if (i < len)
     {
   if (i < len)
     {

+      char *demangled_name;
+

       fprintf_filtered (stream, "&");
       fprintf_filtered (stream, "&");

-      c_type_print_varspec_prefix (TYPE_FN_FIELD_TYPE (f, j), stream, 0, 0);
-      fprintf_unfiltered (stream, kind);
-      if (TYPE_FN_FIELD_PHYSNAME (f, j)[0] == '_'
-         && TYPE_FN_FIELD_PHYSNAME (f, j)[1] == CPLUS_MARKER)
-       {
-         cp_type_print_method_args (TYPE_FN_FIELD_ARGS (f, j) + 1, "~",
-                                    TYPE_FN_FIELDLIST_NAME (domain, i),
-                                    0, stream);
-       }
+      fprintf_filtered (stream, kind);
+      demangled_name = cplus_demangle (TYPE_FN_FIELD_PHYSNAME (f, j),
+                                      DMGL_ANSI | DMGL_PARAMS);
+      if (demangled_name == NULL)
+       fprintf_filtered (stream, "<badly mangled name %s>",
+                         TYPE_FN_FIELD_PHYSNAME (f, j));

       else
        {
       else
        {

-         cp_type_print_method_args (TYPE_FN_FIELD_ARGS (f, j), "",
-                                    TYPE_FN_FIELDLIST_NAME (domain, i),
-                                    0, stream);
+         fputs_filtered (demangled_name, stream);
+         free (demangled_name);

        }
     }
   else
        }
     }
   else


@@ -147,16 +168,23 @@ cp_print_class_method (valaddr, type, stream)
 
 /* This was what it was for gcc 2.4.5 and earlier.  */
 static const char vtbl_ptr_name_old[] =
 
 /* This was what it was for gcc 2.4.5 and earlier.  */
 static const char vtbl_ptr_name_old[] =

-  { CPLUS_MARKER,'v','t','b','l','_','p','t','r','_','t','y','p','e', 0 };
+{CPLUS_MARKER, 'v', 't', 'b', 'l', '_', 'p', 't', 'r', '_', 't', 'y', 'p', 'e', 0};

 /* It was changed to this after 2.4.5.  */
 const char vtbl_ptr_name[] =
 /* It was changed to this after 2.4.5.  */
 const char vtbl_ptr_name[] =

-  { '_','_','v','t','b','l','_','p','t','r','_','t','y','p','e', 0 };
+{'_', '_', 'v', 't', 'b', 'l', '_', 'p', 't', 'r', '_', 't', 'y', 'p', 'e', 0};
+
+/* HP aCC uses different names */
+const char hpacc_vtbl_ptr_name[] =
+{'_', '_', 'v', 'f', 'p', 0};
+const char hpacc_vtbl_ptr_type_name[] =
+{'_', '_', 'v', 'f', 't', 'y', 'p', 0};
+

 
 /* Return truth value for assertion that TYPE is of the type
    "pointer to virtual function".  */
 
 int
 
 /* Return truth value for assertion that TYPE is of the type
    "pointer to virtual function".  */
 
 int

-cp_is_vtbl_ptr_type(type)
+cp_is_vtbl_ptr_type (type)

      struct type *type;
 {
   char *typename = type_name_no_tag (type);
      struct type *type;
 {
   char *typename = type_name_no_tag (type);


@@ -170,7 +198,7 @@ cp_is_vtbl_ptr_type(type)
    "pointer to virtual function table".  */
 
 int
    "pointer to virtual function table".  */
 
 int

-cp_is_vtbl_member(type)
+cp_is_vtbl_member (type)

      struct type *type;
 {
   if (TYPE_CODE (type) == TYPE_CODE_PTR)
      struct type *type;
 {
   if (TYPE_CODE (type) == TYPE_CODE_PTR)


@@ -179,11 +207,11 @@ cp_is_vtbl_member(type)
       if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
        {
          type = TYPE_TARGET_TYPE (type);
       if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
        {
          type = TYPE_TARGET_TYPE (type);

-         if (TYPE_CODE (type) == TYPE_CODE_STRUCT /* if not using thunks */
-             || TYPE_CODE (type) == TYPE_CODE_PTR) /* if using thunks */
+         if (TYPE_CODE (type) == TYPE_CODE_STRUCT      /* if not using thunks */
+             || TYPE_CODE (type) == TYPE_CODE_PTR)     /* if using thunks */

            {
              /* Virtual functions tables are full of pointers
            {
              /* Virtual functions tables are full of pointers

-                to virtual functions. */
+                to virtual functions. */

              return cp_is_vtbl_ptr_type (type);
            }
        }
              return cp_is_vtbl_ptr_type (type);
            }
        }


@@ -193,20 +221,25 @@ cp_is_vtbl_member(type)
 
 /* Mutually recursive subroutines of cp_print_value and c_val_print to
    print out a structure's fields: cp_print_value_fields and cp_print_value.
 
 /* Mutually recursive subroutines of cp_print_value and c_val_print to
    print out a structure's fields: cp_print_value_fields and cp_print_value.

-  
+

    TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and PRETTY have the
    same meanings as in cp_print_value and c_val_print.
 
    TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and PRETTY have the
    same meanings as in cp_print_value and c_val_print.
 

+   2nd argument REAL_TYPE is used to carry over the type of the derived
+   class across the recursion to base classes. 
+

    DONT_PRINT is an array of baseclass types that we
    should not print, or zero if called from top level.  */
 
 void
    DONT_PRINT is an array of baseclass types that we
    should not print, or zero if called from top level.  */
 
 void

-cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty,
+cp_print_value_fields (type, real_type, valaddr, offset, address, stream, format, recurse, pretty,

                       dont_print_vb, dont_print_statmem)
      struct type *type;
                       dont_print_vb, dont_print_statmem)
      struct type *type;

+     struct type *real_type;

      char *valaddr;
      char *valaddr;

+     int offset;

      CORE_ADDR address;
      CORE_ADDR address;

-     GDB_FILE *stream;
+     struct ui_file *stream;

      int format;
      int recurse;
      enum val_prettyprint pretty;
      int format;
      int recurse;
      enum val_prettyprint pretty;


@@ -216,6 +249,7 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty,
   int i, len, n_baseclasses;
   struct obstack tmp_obstack;
   char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
   int i, len, n_baseclasses;
   struct obstack tmp_obstack;
   char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);

+  int fields_seen = 0;

 
   CHECK_TYPEDEF (type);
 
 
   CHECK_TYPEDEF (type);
 


@@ -223,18 +257,26 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty,
   len = TYPE_NFIELDS (type);
   n_baseclasses = TYPE_N_BASECLASSES (type);
 
   len = TYPE_NFIELDS (type);
   n_baseclasses = TYPE_N_BASECLASSES (type);
 

-  /* Print out baseclasses such that we don't print
+  /* First, print out baseclasses such that we don't print

      duplicates of virtual baseclasses.  */
      duplicates of virtual baseclasses.  */

-  if (n_baseclasses > 0)
-    cp_print_value (type, valaddr, address, stream,
-                   format, recurse+1, pretty, dont_print_vb);

 
 

-  if (!len && n_baseclasses == 1)
+  if (n_baseclasses > 0)
+    cp_print_value (type, real_type, valaddr, offset, address, stream,
+                   format, recurse + 1, pretty, dont_print_vb);
+
+  /* Second, print out data fields */
+
+  /* If there are no data fields, or if the only field is the
+   * vtbl pointer, skip this part */
+  if ((len == n_baseclasses) ||
+      ((len - n_baseclasses == 1) &&
+       TYPE_HAS_VTABLE (type) &&
+  STREQN (TYPE_FIELD_NAME (type, n_baseclasses), hpacc_vtbl_ptr_name, 5)) ||
+      !len)

     fprintf_filtered (stream, "<No data fields>");
   else
     {
       extern int inspect_it;
     fprintf_filtered (stream, "<No data fields>");
   else
     {
       extern int inspect_it;

-      int fields_seen = 0;

 
       if (dont_print_statmem == 0)
        {
 
       if (dont_print_statmem == 0)
        {


@@ -250,6 +292,11 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty,
          /* If requested, skip printing of static fields.  */
          if (!static_field_print && TYPE_FIELD_STATIC (type, i))
            continue;
          /* If requested, skip printing of static fields.  */
          if (!static_field_print && TYPE_FIELD_STATIC (type, i))
            continue;

+
+         /* If a vtable pointer appears, we'll print it out later */
+         if (TYPE_HAS_VTABLE (type) && STREQN (TYPE_FIELD_NAME (type, i), hpacc_vtbl_ptr_name, 5))
+           continue;
+

          if (fields_seen)
            fprintf_filtered (stream, ", ");
          else if (n_baseclasses > 0)
          if (fields_seen)
            fprintf_filtered (stream, ", ");
          else if (n_baseclasses > 0)


@@ -270,7 +317,7 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty,
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);
            }
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);
            }

-         else 
+         else

            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }
            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }


@@ -301,7 +348,9 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty,
                                       language_cplus,
                                       DMGL_PARAMS | DMGL_ANSI);
              annotate_field_name_end ();
                                       language_cplus,
                                       DMGL_PARAMS | DMGL_ANSI);
              annotate_field_name_end ();

-             fputs_filtered (" = ", stream);
+             /* do not print leading '=' in case of anonymous unions */
+             if (strcmp (TYPE_FIELD_NAME (type, i), ""))
+               fputs_filtered (" = ", stream);

              annotate_field_value ();
            }
 
              annotate_field_value ();
            }
 


@@ -310,48 +359,42 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty,
              value_ptr v;
 
              /* Bitfields require special handling, especially due to byte
              value_ptr v;
 
              /* Bitfields require special handling, especially due to byte

-                order problems.  */
+                order problems.  */

              if (TYPE_FIELD_IGNORE (type, i))
                {
              if (TYPE_FIELD_IGNORE (type, i))
                {

-                  fputs_filtered ("<optimized out or zero length>", stream);
+                 fputs_filtered ("<optimized out or zero length>", stream);

                }
              else
                {
                }
              else
                {

-                  v = value_from_longest (TYPE_FIELD_TYPE (type, i),
-                                  unpack_field_as_long (type, valaddr, i));
+                 v = value_from_longest (TYPE_FIELD_TYPE (type, i),
+                         unpack_field_as_long (type, valaddr + offset, i));

 
 

-                   val_print (TYPE_FIELD_TYPE(type, i), VALUE_CONTENTS (v), 0,
-                             stream, format, 0, recurse + 1, pretty);
+                 val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0, 0,
+                            stream, format, 0, recurse + 1, pretty);

                }
            }
          else
            {
              if (TYPE_FIELD_IGNORE (type, i))
                {
                }
            }
          else
            {
              if (TYPE_FIELD_IGNORE (type, i))
                {

-                  fputs_filtered ("<optimized out or zero length>", stream);
+                 fputs_filtered ("<optimized out or zero length>", stream);

                }
              else if (TYPE_FIELD_STATIC (type, i))
                {
                }
              else if (TYPE_FIELD_STATIC (type, i))
                {

-                 value_ptr v;
-                 char *phys_name = TYPE_FIELD_STATIC_PHYSNAME (type, i);
-                 struct symbol *sym =
-                     lookup_symbol (phys_name, 0, VAR_NAMESPACE, 0, NULL);
-                 if (sym == NULL)
+                 value_ptr v = value_static_field (type, i);
+                 if (v == NULL)

                    fputs_filtered ("<optimized out>", stream);
                  else
                    fputs_filtered ("<optimized out>", stream);
                  else

-                   {
-                     v = value_at (TYPE_FIELD_TYPE (type, i),
-                                   (CORE_ADDR)SYMBOL_BLOCK_VALUE (sym));
-                     cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-                                            stream, format, recurse + 1,
-                                            pretty);
-                   }
+                   cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
+                                          stream, format, recurse + 1,
+                                          pretty);

                }
              else
                {
                }
              else
                {

-                  val_print (TYPE_FIELD_TYPE (type, i), 
-                             valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
-                             0, stream, format, 0, recurse + 1, pretty);
+                 val_print (TYPE_FIELD_TYPE (type, i),
+                         valaddr, offset + TYPE_FIELD_BITPOS (type, i) / 8,
+                            address + TYPE_FIELD_BITPOS (type, i) / 8,
+                            stream, format, 0, recurse + 1, pretty);

                }
            }
          annotate_field_end ();
                }
            }
          annotate_field_end ();


@@ -370,7 +413,81 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty,
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);
        }
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);
        }

-    }
+    }                          /* if there are data fields */
+  /* Now print out the virtual table pointer if there is one */
+  if (TYPE_HAS_VTABLE (type) && STREQN (TYPE_FIELD_NAME (type, n_baseclasses), hpacc_vtbl_ptr_name, 5))
+    {
+      value_ptr v;
+      /* First get the virtual table pointer and print it out */
+
+#if 0
+      fputs_filtered ("__vfp = ", stream);
+#endif
+
+      fputs_filtered (", Virtual table at ", stream);
+
+      /* pai: FIXME 32x64 problem? */
+      /* Not sure what the best notation is in the case where there is no
+         baseclass name.  */
+      v = value_from_longest (lookup_pointer_type (builtin_type_unsigned_long),
+                             *(unsigned long *) (valaddr + offset));
+
+      val_print (VALUE_TYPE (v), VALUE_CONTENTS (v), 0, 0,
+                stream, format, 0, recurse + 1, pretty);
+      fields_seen = 1;
+
+      if (vtblprint)
+       {
+         /* Print out function pointers in vtable. */
+
+         /* FIXME: then-clause is for non-RRBC layout of virtual
+          * table.  The RRBC case in the else-clause is yet to be
+          * implemented.  The if (1) below should be changed to a
+          * test for whether the executable we have was compiled
+          * with a version of HP aCC that doesn't have RRBC
+          * support. */
+
+         if (1)
+           {
+             /* no RRBC support; function pointers embedded directly in vtable */
+
+             int vfuncs = count_virtual_fns (real_type);
+
+             fputs_filtered (" {", stream);
+
+             /* FIXME : doesn't work at present */
+#if 0
+             fprintf_filtered (stream, "%d entr%s: ", vfuncs, vfuncs == 1 ? "y" : "ies");
+#else
+             fputs_filtered ("not implemented", stream);
+
+
+#endif
+
+             /* recursive function that prints all virtual function entries */
+#if 0
+             cp_print_hpacc_virtual_table_entries (real_type, &vfuncs, v, stream, format, recurse, pretty);
+#endif
+             fputs_filtered ("}", stream);
+           }                   /* non-RRBC case */
+         else
+           {
+             /* FIXME -- seem comments above */
+             /* RRBC support present; function pointers are found
+              * by indirection through the class segment entries. */
+
+
+           }                   /* RRBC case */
+       }                       /* if vtblprint */
+
+      if (pretty)
+       {
+         fprintf_filtered (stream, "\n");
+         print_spaces_filtered (2 * recurse, stream);
+       }
+
+    }                          /* if vtable exists */
+

   fprintf_filtered (stream, "}");
 }
 
   fprintf_filtered (stream, "}");
 }
 


@@ -378,12 +495,14 @@ cp_print_value_fields (type, valaddr, address, stream, format, recurse, pretty,
    baseclasses.  */
 
 static void
    baseclasses.  */
 
 static void

-cp_print_value (type, valaddr, address, stream, format, recurse, pretty,
+cp_print_value (type, real_type, valaddr, offset, address, stream, format, recurse, pretty,

                dont_print_vb)
      struct type *type;
                dont_print_vb)
      struct type *type;

+     struct type *real_type;

      char *valaddr;
      char *valaddr;

+     int offset;

      CORE_ADDR address;
      CORE_ADDR address;

-     GDB_FILE *stream;
+     struct ui_file *stream;

      int format;
      int recurse;
      enum val_prettyprint pretty;
      int format;
      int recurse;
      enum val_prettyprint pretty;


@@ -391,14 +510,14 @@ cp_print_value (type, valaddr, address, stream, format, recurse, pretty,
 {
   struct obstack tmp_obstack;
   struct type **last_dont_print
 {
   struct obstack tmp_obstack;
   struct type **last_dont_print

-    = (struct type **)obstack_next_free (&dont_print_vb_obstack);
+  = (struct type **) obstack_next_free (&dont_print_vb_obstack);

   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
 
   if (dont_print_vb == 0)
     {
       /* If we're at top level, carve out a completely fresh
   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
 
   if (dont_print_vb == 0)
     {
       /* If we're at top level, carve out a completely fresh

-        chunk of the obstack and use that until this particular
-        invocation returns.  */
+         chunk of the obstack and use that until this particular
+         invocation returns.  */

       tmp_obstack = dont_print_vb_obstack;
       /* Bump up the high-water mark.  Now alpha is omega.  */
       obstack_finish (&dont_print_vb_obstack);
       tmp_obstack = dont_print_vb_obstack;
       /* Bump up the high-water mark.  Now alpha is omega.  */
       obstack_finish (&dont_print_vb_obstack);


@@ -407,16 +526,18 @@ cp_print_value (type, valaddr, address, stream, format, recurse, pretty,
   for (i = 0; i < n_baseclasses; i++)
     {
       int boffset;
   for (i = 0; i < n_baseclasses; i++)
     {
       int boffset;

+      int skip;

       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
       char *basename = TYPE_NAME (baseclass);
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
       char *basename = TYPE_NAME (baseclass);

+      char *base_valaddr;

 
       if (BASETYPE_VIA_VIRTUAL (type, i))
        {
          struct type **first_dont_print
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
        {
          struct type **first_dont_print

-           = (struct type **)obstack_base (&dont_print_vb_obstack);
+         = (struct type **) obstack_base (&dont_print_vb_obstack);

 
 

-         int j = (struct type **)obstack_next_free (&dont_print_vb_obstack)
-           - first_dont_print;
+         int j = (struct type **) obstack_next_free (&dont_print_vb_obstack)
+         - first_dont_print;

 
          while (--j >= 0)
            if (baseclass == first_dont_print[j])
 
          while (--j >= 0)
            if (baseclass == first_dont_print[j])


@@ -425,8 +546,41 @@ cp_print_value (type, valaddr, address, stream, format, recurse, pretty,
          obstack_ptr_grow (&dont_print_vb_obstack, baseclass);
        }
 
          obstack_ptr_grow (&dont_print_vb_obstack, baseclass);
        }
 

-      boffset = baseclass_offset (type, i , valaddr, address);
+      if (TYPE_HAS_VTABLE (type) && BASETYPE_VIA_VIRTUAL (type, i))
+       {
+         /* Assume HP/Taligent runtime convention */
+         find_rt_vbase_offset (type, TYPE_BASECLASS (type, i),
+                               valaddr, offset, &boffset, &skip);
+         if (skip >= 0)
+           error ("Virtual base class offset not found from vtable while printing");
+         base_valaddr = valaddr;
+       }
+      else
+       {
+         boffset = baseclass_offset (type, i, valaddr + offset, address + offset);
+         skip = ((boffset == -1) || (boffset + offset) < 0) ? 1 : -1;

 
 

+         if (BASETYPE_VIA_VIRTUAL (type, i))
+           {
+             /* The virtual base class pointer might have been clobbered by the
+                user program. Make sure that it still points to a valid memory
+                location.  */
+
+             if (boffset != -1 && ((boffset + offset) < 0 || (boffset + offset) >= TYPE_LENGTH (type)))
+               {
+                 base_valaddr = (char *) alloca (TYPE_LENGTH (baseclass));
+                 if (target_read_memory (address + boffset, base_valaddr,
+                                         TYPE_LENGTH (baseclass)) != 0)
+                   skip = 1;
+               }
+             else
+               base_valaddr = valaddr;
+           }
+         else
+           base_valaddr = valaddr;
+       }
+
+      /* now do the printing */

       if (pretty)
        {
          fprintf_filtered (stream, "\n");
       if (pretty)
        {
          fprintf_filtered (stream, "\n");


@@ -434,15 +588,17 @@ cp_print_value (type, valaddr, address, stream, format, recurse, pretty,
        }
       fputs_filtered ("<", stream);
       /* Not sure what the best notation is in the case where there is no
        }
       fputs_filtered ("<", stream);
       /* Not sure what the best notation is in the case where there is no

-        baseclass name.  */
+         baseclass name.  */

       fputs_filtered (basename ? basename : "", stream);
       fputs_filtered ("> = ", stream);
       fputs_filtered (basename ? basename : "", stream);
       fputs_filtered ("> = ", stream);

-      if (boffset == -1)
+
+
+      if (skip >= 1)

        fprintf_filtered (stream, "<invalid address>");
       else
        fprintf_filtered (stream, "<invalid address>");
       else

-       cp_print_value_fields (baseclass, valaddr + boffset, address + boffset,
+       cp_print_value_fields (baseclass, real_type, base_valaddr, offset + boffset, address,

                               stream, format, recurse, pretty,
                               stream, format, recurse, pretty,

-                              (struct type **) obstack_base (&dont_print_vb_obstack),
+                    (struct type **) obstack_base (&dont_print_vb_obstack),

                               0);
       fputs_filtered (", ", stream);
 
                               0);
       fputs_filtered (", ", stream);
 


@@ -453,10 +609,10 @@ cp_print_value (type, valaddr, address, stream, format, recurse, pretty,
   if (dont_print_vb == 0)
     {
       /* Free the space used to deal with the printing
   if (dont_print_vb == 0)
     {
       /* Free the space used to deal with the printing

-        of this type from top level.  */
+         of this type from top level.  */

       obstack_free (&dont_print_vb_obstack, last_dont_print);
       /* Reset watermark so that we can continue protecting
       obstack_free (&dont_print_vb_obstack, last_dont_print);
       /* Reset watermark so that we can continue protecting

-        ourselves from whatever we were protecting ourselves.  */
+         ourselves from whatever we were protecting ourselves.  */

       dont_print_vb_obstack = tmp_obstack;
     }
 }
       dont_print_vb_obstack = tmp_obstack;
     }
 }


@@ -474,7 +630,7 @@ static void
 cp_print_static_field (type, val, stream, format, recurse, pretty)
      struct type *type;
      value_ptr val;
 cp_print_static_field (type, val, stream, format, recurse, pretty)
      struct type *type;
      value_ptr val;

-     GDB_FILE *stream;
+     struct ui_file *stream;

      int format;
      int recurse;
      enum val_prettyprint pretty;
      int format;
      int recurse;
      enum val_prettyprint pretty;


@@ -485,8 +641,8 @@ cp_print_static_field (type, val, stream, format, recurse, pretty)
       int i;
 
       first_dont_print
       int i;
 
       first_dont_print

-       = (CORE_ADDR *)obstack_base (&dont_print_statmem_obstack);
-      i = (CORE_ADDR *)obstack_next_free (&dont_print_statmem_obstack)
+       = (CORE_ADDR *) obstack_base (&dont_print_statmem_obstack);
+      i = (CORE_ADDR *) obstack_next_free (&dont_print_statmem_obstack)

        - first_dont_print;
 
       while (--i >= 0)
        - first_dont_print;
 
       while (--i >= 0)


@@ -499,15 +655,15 @@ cp_print_static_field (type, val, stream, format, recurse, pretty)
            }
        }
 
            }
        }
 

-      obstack_grow (&dont_print_statmem_obstack, &VALUE_ADDRESS (val),
+      obstack_grow (&dont_print_statmem_obstack, (char *) &VALUE_ADDRESS (val),

                    sizeof (CORE_ADDR));
 
       CHECK_TYPEDEF (type);
                    sizeof (CORE_ADDR));
 
       CHECK_TYPEDEF (type);

-      cp_print_value_fields (type, VALUE_CONTENTS (val), VALUE_ADDRESS (val),
+      cp_print_value_fields (type, type, VALUE_CONTENTS_ALL (val), VALUE_EMBEDDED_OFFSET (val), VALUE_ADDRESS (val),

                             stream, format, recurse, pretty, NULL, 1);
       return;
     }
                             stream, format, recurse, pretty, NULL, 1);
       return;
     }

-  val_print (type, VALUE_CONTENTS (val), VALUE_ADDRESS (val),
+  val_print (type, VALUE_CONTENTS_ALL (val), VALUE_EMBEDDED_OFFSET (val), VALUE_ADDRESS (val),

             stream, format, 0, recurse, pretty);
 }
 
             stream, format, 0, recurse, pretty);
 }
 


@@ -515,10 +671,10 @@ void
 cp_print_class_member (valaddr, domain, stream, prefix)
      char *valaddr;
      struct type *domain;
 cp_print_class_member (valaddr, domain, stream, prefix)
      char *valaddr;
      struct type *domain;

-     GDB_FILE *stream;
+     struct ui_file *stream;

      char *prefix;
 {
      char *prefix;
 {

-  
+

   /* VAL is a byte offset into the structure type DOMAIN.
      Find the name of the field for that offset and
      print it.  */
   /* VAL is a byte offset into the structure type DOMAIN.
      Find the name of the field for that offset and
      print it.  */


@@ -526,7 +682,16 @@ cp_print_class_member (valaddr, domain, stream, prefix)
   int bits = 0;
   register unsigned int i;
   unsigned len = TYPE_NFIELDS (domain);
   int bits = 0;
   register unsigned int i;
   unsigned len = TYPE_NFIELDS (domain);

+

   /* @@ Make VAL into bit offset */
   /* @@ Make VAL into bit offset */

+
+  /* Note: HP aCC generates offsets that are the real byte offsets added
+     to a constant bias 0x20000000 (1 << 29).  This constant bias gets
+     shifted out in the code below -- joyous happenstance! */
+
+  /* Note: HP cfront uses a constant bias of 1; if we support this
+     compiler ever, we will have to adjust the computation below */
+

   LONGEST val = unpack_long (builtin_type_int, valaddr) << 3;
   for (i = TYPE_N_BASECLASSES (domain); i < len; i++)
     {
   LONGEST val = unpack_long (builtin_type_int, valaddr) << 3;
   for (i = TYPE_N_BASECLASSES (domain); i < len; i++)
     {


@@ -552,7 +717,7 @@ cp_print_class_member (valaddr, domain, stream, prefix)
       fprintf_filtered (stream, prefix);
       name = type_name_no_tag (domain);
       if (name)
       fprintf_filtered (stream, prefix);
       name = type_name_no_tag (domain);
       if (name)

-        fputs_filtered (name, stream);
+       fputs_filtered (name, stream);

       else
        c_type_print_base (domain, stream, 0, 0);
       fprintf_filtered (stream, "::");
       else
        c_type_print_base (domain, stream, 0, 0);
       fprintf_filtered (stream, "::");


@@ -563,15 +728,81 @@ cp_print_class_member (valaddr, domain, stream, prefix)
        fprintf_filtered (stream, " (offset in bits)");
     }
   else
        fprintf_filtered (stream, " (offset in bits)");
     }
   else

-    fprintf_filtered (stream, "%d", val >> 3);
+    fprintf_filtered (stream, "%ld", (long) (val >> 3));

 }
 
 }
 

+
+/* This function prints out virtual table entries for a class; it
+ * recurses on the base classes to find all virtual functions
+ * available in a class.
+ *
+ * pai/1997-05-21 Note: As the name suggests, it's currently
+ * implemented for HP aCC runtime only. g++ objects are handled
+ * differently and I have made no attempt to fold that logic in
+ * here. The runtime layout is different for the two cases.  Also,
+ * this currently has only the code for non-RRBC layouts generated by
+ * the HP aCC compiler; RRBC code is stubbed out and will have to be
+ * added later. */
+
+
+static void
+cp_print_hpacc_virtual_table_entries (type, vfuncs, v, stream, format, recurse, pretty)
+     struct type *type;
+     int *vfuncs;
+     value_ptr v;
+     struct ui_file *stream;
+     int format;
+     int recurse;
+     enum val_prettyprint pretty;
+{
+  int fn, oi;
+
+  /* pai: FIXME this function doesn't work. It should handle a given
+   * virtual function only once (latest redefinition in class hierarchy)
+   */
+
+  /* Recursion on other classes that can share the same vtable */
+  struct type *pbc = primary_base_class (type);
+  if (pbc)
+    cp_print_hpacc_virtual_table_entries (pbc, vfuncs, v, stream, format, recurse, pretty);
+
+  /* Now deal with vfuncs declared in this class */
+  for (fn = 0; fn < TYPE_NFN_FIELDS (type); fn++)
+    for (oi = 0; oi < TYPE_FN_FIELDLIST_LENGTH (type, fn); oi++)
+      if (TYPE_FN_FIELD_VIRTUAL_P (TYPE_FN_FIELDLIST1 (type, fn), oi))
+       {
+         char *vf_name;
+
+         /* virtual function offset */
+         int vx = TYPE_FN_FIELD_VOFFSET (TYPE_FN_FIELDLIST1 (type, fn), oi) - 1;
+
+         /* Get the address of the vfunction entry */
+         value_ptr vf = value_copy (v);
+         if (VALUE_LAZY (vf))
+           (void) value_fetch_lazy (vf);
+         vf->aligner.contents[0] += 4 * (HP_ACC_VFUNC_START + vx);     /* adjust by offset */
+         vf = value_ind (vf);  /* get the entry */
+         VALUE_TYPE (vf) = VALUE_TYPE (v);     /* make it a pointer */
+
+         /* print out the entry */
+         val_print (VALUE_TYPE (vf), VALUE_CONTENTS (vf), 0, 0,
+                    stream, format, 0, recurse + 1, pretty);
+         vf_name = cplus_demangle (TYPE_FN_FIELD_PHYSNAME (TYPE_FN_FIELDLIST1 (type, fn), oi),
+                                   DMGL_ARM);  /* pai: (temp) FIXME Maybe this should be DMGL_ANSI */
+         fprintf_filtered (stream, " %s", vf_name);
+         if (--(*vfuncs) > 0)
+           fputs_filtered (", ", stream);
+       }
+}
+
+
+

 void
 _initialize_cp_valprint ()
 {
   add_show_from_set
     (add_set_cmd ("static-members", class_support, var_boolean,
 void
 _initialize_cp_valprint ()
 {
   add_show_from_set
     (add_set_cmd ("static-members", class_support, var_boolean,

-                 (char *)&static_field_print,
+                 (char *) &static_field_print,

                  "Set printing of C++ static members.",
                  &setprintlist),
      &showprintlist);
                  "Set printing of C++ static members.",
                  &setprintlist),
      &showprintlist);


@@ -579,14 +810,14 @@ _initialize_cp_valprint ()
   static_field_print = 1;
 
   add_show_from_set
   static_field_print = 1;
 
   add_show_from_set

-    (add_set_cmd ("vtbl", class_support, var_boolean, (char *)&vtblprint,
+    (add_set_cmd ("vtbl", class_support, var_boolean, (char *) &vtblprint,

                  "Set printing of C++ virtual function tables.",
                  &setprintlist),
      &showprintlist);
 
   add_show_from_set
                  "Set printing of C++ virtual function tables.",
                  &setprintlist),
      &showprintlist);
 
   add_show_from_set

-    (add_set_cmd ("object", class_support, var_boolean, (char *)&objectprint,
-         "Set printing of object's derived type based on vtable info.",
+    (add_set_cmd ("object", class_support, var_boolean, (char *) &objectprint,
+             "Set printing of object's derived type based on vtable info.",

                  &setprintlist),
      &showprintlist);
 
                  &setprintlist),
      &showprintlist);