* defs.h (extract_signed_integer, extract_unsigned_integer,

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

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 84b66fe7a81b7f4d9d6f53185b6cb33e84364fce..49d71a4480a3170da0890add3b44e448310a60a2 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -1,13 +1,14 @@
 /* Support for printing C++ values for GDB, the GNU debugger.
 
 /* Support for printing C++ values for GDB, the GNU debugger.
 

-   Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996,
-   1997, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+   2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009
+   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 +17,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"


@@ -37,9 +36,9 @@
 #include "valprint.h"
 #include "cp-support.h"
 #include "language.h"
 #include "valprint.h"
 #include "cp-support.h"
 #include "language.h"

+#include "python/python.h"

 
 /* Controls printing of vtbl's */
 
 /* Controls printing of vtbl's */

-int vtblprint;

 static void
 show_vtblprint (struct ui_file *file, int from_tty,
                struct cmd_list_element *c, const char *value)
 static void
 show_vtblprint (struct ui_file *file, int from_tty,
                struct cmd_list_element *c, const char *value)


@@ -51,7 +50,6 @@ Printing of C++ virtual function tables is %s.\n"),
 
 /* Controls looking up an object's derived type using what we find in
    its vtables.  */
 
 /* Controls looking up an object's derived type using what we find in
    its vtables.  */

-int objectprint;

 static void
 show_objectprint (struct ui_file *file, int from_tty,
                  struct cmd_list_element *c,
 static void
 show_objectprint (struct ui_file *file, int from_tty,
                  struct cmd_list_element *c,


@@ -62,7 +60,6 @@ Printing of object's derived type based on vtable info is %s.\n"),
                    value);
 }
 
                    value);
 }
 

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

 static void
 show_static_field_print (struct ui_file *file, int from_tty,
                         struct cmd_list_element *c, const char *value)
 static void
 show_static_field_print (struct ui_file *file, int from_tty,
                         struct cmd_list_element *c, const char *value)


@@ -78,125 +75,17 @@ static struct obstack dont_print_statmem_obstack;
 extern void _initialize_cp_valprint (void);
 
 static void cp_print_static_field (struct type *, struct value *,
 extern void _initialize_cp_valprint (void);
 
 static void cp_print_static_field (struct type *, struct value *,

-                                  struct ui_file *, int, int,
-                                  enum val_prettyprint);
+                                  struct ui_file *, int,
+                                  const struct value_print_options *);

 
 static void cp_print_value (struct type *, struct type *, const gdb_byte *,
 
 static void cp_print_value (struct type *, struct type *, const gdb_byte *,

-                           int, CORE_ADDR, struct ui_file *, int, int,
-                           enum val_prettyprint, struct type **);
+                           int, CORE_ADDR, struct ui_file *, int,
+                           const struct value_print_options *, struct type **);

 
 

-static void cp_print_hpacc_virtual_table_entries (struct type *, int *,
-                                                 struct value *,
-                                                 struct ui_file *, int,
-                                                 int,
-                                                 enum val_prettyprint);
-
-
-void
-cp_print_class_method (const gdb_byte *valaddr,
-                      struct type *type,
-                      struct ui_file *stream)
-{
-  struct type *domain;
-  struct fn_field *f = NULL;
-  int j = 0;
-  int len2;
-  int offset;
-  char *kind = "";
-  CORE_ADDR addr;
-  struct symbol *sym;
-  unsigned len;
-  unsigned int i;
-  struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
-
-  domain = TYPE_DOMAIN_TYPE (target_type);
-  if (domain == (struct type *) NULL)
-    {
-      fprintf_filtered (stream, "<unknown>");
-      return;
-    }
-  addr = unpack_pointer (type, valaddr);
-  if (METHOD_PTR_IS_VIRTUAL (addr))
-    {
-      offset = METHOD_PTR_TO_VOFFSET (addr);
-      len = TYPE_NFN_FIELDS (domain);
-      for (i = 0; i < len; i++)
-       {
-         f = TYPE_FN_FIELDLIST1 (domain, i);
-         len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);
-
-         check_stub_method_group (domain, i);
-         for (j = 0; j < len2; j++)
-           {
-             if (TYPE_FN_FIELD_VOFFSET (f, j) == offset)
-               {
-                 kind = "virtual ";
-                 goto common;
-               }
-           }
-       }
-    }
-  else
-    {
-      sym = find_pc_function (addr);
-      if (sym == 0)
-       {
-         /* 1997-08-01 Currently unsupported with HP aCC */
-         if (deprecated_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);
-      for (i = 0; i < len; i++)
-       {
-         f = TYPE_FN_FIELDLIST1 (domain, i);
-         len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);
-
-         check_stub_method_group (domain, i);
-         for (j = 0; j < len2; j++)
-           {
-             if (strcmp (DEPRECATED_SYMBOL_NAME (sym), TYPE_FN_FIELD_PHYSNAME (f, j))
-                 == 0)
-               goto common;
-           }
-       }
-    }
- common:
-  if (i < len)
-    {
-      char *demangled_name;
-
-      fprintf_filtered (stream, "&");
-      fputs_filtered (kind, stream);
-      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
-       {
-         fputs_filtered (demangled_name, stream);
-         xfree (demangled_name);
-       }
-    }
-  else
-    {
-      fprintf_filtered (stream, "(");
-      type_print (type, "", stream, -1);
-      fprintf_filtered (stream, ") %d", (int) addr >> 3);
-    }
-}

 
 /* GCC versions after 2.4.5 use this.  */
 const char vtbl_ptr_name[] = "__vtbl_ptr_type";
 
 
 /* GCC versions after 2.4.5 use this.  */
 const char vtbl_ptr_name[] = "__vtbl_ptr_type";
 

-/* HP aCC uses different names.  */
-const char hpacc_vtbl_ptr_name[] = "__vfp";
-const char hpacc_vtbl_ptr_type_name[] = "__vftyp";
-

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


@@ -248,7 +137,7 @@ cp_is_vtbl_member (struct type *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
+   TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS 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
    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


@@ -260,12 +149,11 @@ cp_is_vtbl_member (struct type *type)
 void
 cp_print_value_fields (struct type *type, struct type *real_type,
                       const gdb_byte *valaddr, int offset, CORE_ADDR address,
 void
 cp_print_value_fields (struct type *type, struct type *real_type,
                       const gdb_byte *valaddr, int offset, CORE_ADDR address,

-                      struct ui_file *stream, int format, int recurse,
-                      enum val_prettyprint pretty,
-                      struct type **dont_print_vb,int dont_print_statmem)
+                      struct ui_file *stream, int recurse,
+                      const struct value_print_options *options,
+                      struct type **dont_print_vb, int dont_print_statmem)

 {
   int i, len, n_baseclasses;
 {
   int i, len, n_baseclasses;

-  struct obstack tmp_obstack;

   char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
   int fields_seen = 0;
 
   char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
   int fields_seen = 0;
 


@@ -280,47 +168,37 @@ cp_print_value_fields (struct type *type, struct type *real_type,
 
   if (n_baseclasses > 0)
     cp_print_value (type, real_type, valaddr, offset, address, stream,
 
   if (n_baseclasses > 0)
     cp_print_value (type, real_type, valaddr, offset, address, stream,

-                   format, recurse + 1, pretty, dont_print_vb);
+                   recurse + 1, options, dont_print_vb);

 
   /* Second, print out data fields */
 
 
   /* 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)
-         && strncmp (TYPE_FIELD_NAME (type, n_baseclasses),
-                     hpacc_vtbl_ptr_name, 5) == 0)
-      || !len)
+  /* If there are no data fields, skip this part */
+  if (len == n_baseclasses || !len)

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

+      struct obstack tmp_obstack = dont_print_statmem_obstack;
+

       if (dont_print_statmem == 0)
        {
          /* If we're at top level, carve out a completely fresh
             chunk of the obstack and use that until this particular
             invocation returns.  */
       if (dont_print_statmem == 0)
        {
          /* If we're at top level, carve out a completely fresh
             chunk of the obstack and use that until this particular
             invocation returns.  */

-         tmp_obstack = dont_print_statmem_obstack;

          obstack_finish (&dont_print_statmem_obstack);
        }
 
       for (i = n_baseclasses; i < len; i++)
        {
          /* If requested, skip printing of static fields.  */
          obstack_finish (&dont_print_statmem_obstack);
        }
 
       for (i = n_baseclasses; i < len; i++)
        {
          /* 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)
-             && strncmp (TYPE_FIELD_NAME (type, i), hpacc_vtbl_ptr_name,
-                         5) == 0)
+         if (!options->static_field_print
+             && field_is_static (&TYPE_FIELD (type, i)))

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

-             if (pretty)
+             if (options->pretty)

                {
                  fprintf_filtered (stream, "\n");
                  print_spaces_filtered (2 + 2 * recurse, stream);
                {
                  fprintf_filtered (stream, "\n");
                  print_spaces_filtered (2 + 2 * recurse, stream);


@@ -331,7 +209,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
            }
          fields_seen = 1;
 
            }
          fields_seen = 1;
 

-         if (pretty)
+         if (options->pretty)

            {
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);
            {
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);


@@ -340,13 +218,13 @@ cp_print_value_fields (struct type *type, struct type *real_type,
            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }
            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }

-         if (inspect_it)
+         if (options->inspect_it)

            {
              if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
                fputs_filtered ("\"( ptr \"", stream);
              else
                fputs_filtered ("\"( nodef \"", stream);
            {
              if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
                fputs_filtered ("\"( ptr \"", stream);
              else
                fputs_filtered ("\"( nodef \"", stream);

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

                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       current_language->la_language,
                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       current_language->la_language,


@@ -361,7 +239,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
            {
              annotate_field_begin (TYPE_FIELD_TYPE (type, i));
 
            {
              annotate_field_begin (TYPE_FIELD_TYPE (type, i));
 

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

                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       current_language->la_language,
                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       current_language->la_language,


@@ -373,7 +251,8 @@ cp_print_value_fields (struct type *type, struct type *real_type,
              annotate_field_value ();
            }
 
              annotate_field_value ();
            }
 

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

            {
              struct value *v;
 
            {
              struct value *v;
 


@@ -385,11 +264,14 @@ cp_print_value_fields (struct type *type, struct type *real_type,
                }
              else
                {
                }
              else
                {

+                 struct value_print_options opts = *options;
+                 opts.deref_ref = 0;

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

-                 common_val_print (v, stream, format, 0, recurse + 1, pretty);
+                 common_val_print (v, stream, recurse + 1, &opts,
+                                   current_language);

                }
            }
          else
                }
            }
          else


@@ -398,22 +280,24 @@ cp_print_value_fields (struct type *type, struct type *real_type,
                {
                  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 (field_is_static (&TYPE_FIELD (type, i)))

                {
                  struct value *v = value_static_field (type, i);
                  if (v == NULL)
                    fputs_filtered ("<optimized out>", stream);
                  else
                    cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
                {
                  struct value *v = value_static_field (type, i);
                  if (v == NULL)
                    fputs_filtered ("<optimized out>", stream);
                  else
                    cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,

-                                          stream, format, recurse + 1,
-                                          pretty);
+                                          stream, recurse + 1, options);

                }
              else
                {
                }
              else
                {

+                 struct value_print_options opts = *options;
+                 opts.deref_ref = 0;

                  val_print (TYPE_FIELD_TYPE (type, i),
                             valaddr, offset + TYPE_FIELD_BITPOS (type, i) / 8,
                             address + TYPE_FIELD_BITPOS (type, i) / 8,
                  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);
+                            stream, recurse + 1, &opts,
+                            current_language);

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


@@ -427,90 +311,12 @@ cp_print_value_fields (struct type *type, struct type *real_type,
          dont_print_statmem_obstack = tmp_obstack;
        }
 
          dont_print_statmem_obstack = tmp_obstack;
        }
 

-      if (pretty)
+      if (options->pretty)

        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);
        }
     }                          /* if there are data fields */
        {
          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)
-      && strncmp (TYPE_FIELD_NAME (type, n_baseclasses),
-                 hpacc_vtbl_ptr_name, 5) == 0)
-    {
-      struct value *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_pointer (lookup_pointer_type (builtin_type_unsigned_long),
-                             *(unsigned long *) (valaddr + offset));
-
-      common_val_print (v, 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 -- see 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, "}");
 }


@@ -521,12 +327,13 @@ cp_print_value_fields (struct type *type, struct type *real_type,
 static void
 cp_print_value (struct type *type, struct type *real_type,
                const gdb_byte *valaddr, int offset, CORE_ADDR address,
 static void
 cp_print_value (struct type *type, struct type *real_type,
                const gdb_byte *valaddr, int offset, CORE_ADDR address,

-               struct ui_file *stream, int format, int recurse,
-               enum val_prettyprint pretty, struct type **dont_print_vb)
+               struct ui_file *stream, int recurse,
+               const struct value_print_options *options,
+               struct type **dont_print_vb)

 {
 {

-  struct obstack tmp_obstack;

   struct type **last_dont_print
     = (struct type **) obstack_next_free (&dont_print_vb_obstack);
   struct type **last_dont_print
     = (struct type **) obstack_next_free (&dont_print_vb_obstack);

+  struct obstack tmp_obstack = dont_print_vb_obstack;

   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
   int thisoffset;
   struct type *thistype;
   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
   int thisoffset;
   struct type *thistype;


@@ -536,7 +343,6 @@ cp_print_value (struct type *type, struct type *real_type,
       /* If we're at top level, carve out a completely fresh
          chunk of the obstack and use that until this particular
          invocation returns.  */
       /* If we're at top level, carve out a completely fresh
          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);
     }
       /* Bump up the high-water mark.  Now alpha is omega.  */
       obstack_finish (&dont_print_vb_obstack);
     }


@@ -566,53 +372,39 @@ cp_print_value (struct type *type, struct type *real_type,
 
       thisoffset = offset;
       thistype = real_type;
 
       thisoffset = offset;
       thistype = real_type;

-      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);
+      skip = ((boffset == -1) || (boffset + offset) < 0) ? 1 : -1;
+
+      if (BASETYPE_VIA_VIRTUAL (type, i))

        {
        {

-         boffset = baseclass_offset (type, i,
-                                     valaddr + offset,
-                                     address);
-         skip = ((boffset == -1) || (boffset + offset) < 0) ? 1 : -1;
+         /* 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 (BASETYPE_VIA_VIRTUAL (type, i))
+         if (boffset != -1
+             && ((boffset + offset) < 0
+                 || (boffset + offset) >= TYPE_LENGTH (type)))

            {
            {

-             /* 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)))
-               {
-                 /* FIXME (alloca): unsafe if baseclass is really really large. */
-                 gdb_byte *buf = alloca (TYPE_LENGTH (baseclass));
-                 base_valaddr = buf;
-                 if (target_read_memory (address + boffset, buf,
-                                         TYPE_LENGTH (baseclass)) != 0)
-                   skip = 1;
-                 address = address + boffset;
-                 thisoffset = 0;
-                 boffset = 0;
-                 thistype = baseclass;
-               }
-             else
-               base_valaddr = valaddr;
+             /* FIXME (alloca): unsafe if baseclass is really really large. */
+             gdb_byte *buf = alloca (TYPE_LENGTH (baseclass));
+             base_valaddr = buf;
+             if (target_read_memory (address + boffset, buf,
+                                     TYPE_LENGTH (baseclass)) != 0)
+               skip = 1;
+             address = address + boffset;
+             thisoffset = 0;
+             boffset = 0;
+             thistype = baseclass;

            }
          else
            base_valaddr = valaddr;
        }
            }
          else
            base_valaddr = valaddr;
        }

+      else
+       base_valaddr = valaddr;

 
       /* now do the printing */
 
       /* now do the printing */

-      if (pretty)
+      if (options->pretty)

        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);
        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);


@@ -627,13 +419,27 @@ cp_print_value (struct type *type, struct type *real_type,
       if (skip >= 1)
        fprintf_filtered (stream, "<invalid address>");
       else
       if (skip >= 1)
        fprintf_filtered (stream, "<invalid address>");
       else

-       cp_print_value_fields (baseclass, thistype, base_valaddr,
-                              thisoffset + boffset, address + boffset,
-                              stream, format,
-                              recurse, pretty,
-                              ((struct type **)
-                               obstack_base (&dont_print_vb_obstack)),
-                              0);
+       {
+         int result = 0;
+
+         /* Attempt to run the Python pretty-printers on the
+            baseclass if possible.  */
+         if (!options->raw)
+           result = apply_val_pretty_printer (baseclass, base_valaddr,
+                                              thisoffset + boffset,
+                                              address + boffset,
+                                              stream, recurse,
+                                              options,
+                                              current_language);
+                 
+         if (!result)
+           cp_print_value_fields (baseclass, thistype, base_valaddr,
+                                  thisoffset + boffset, address + boffset,
+                                  stream, recurse, options,
+                                  ((struct type **)
+                                   obstack_base (&dont_print_vb_obstack)),
+                                  0);
+       }

       fputs_filtered (", ", stream);
 
     flush_it:
       fputs_filtered (", ", stream);
 
     flush_it:


@@ -657,20 +463,21 @@ cp_print_value (struct type *type, struct type *real_type,
    static member classes in an obstack and refuse to print them more
    than once.
 
    static member classes in an obstack and refuse to print them more
    than once.
 

-   VAL contains the value to print, TYPE, STREAM, RECURSE, and PRETTY
+   VAL contains the value to print, TYPE, STREAM, RECURSE, and OPTIONS

    have the same meanings as in c_val_print.  */
 
 static void
 cp_print_static_field (struct type *type,
                       struct value *val,
                       struct ui_file *stream,
    have the same meanings as in c_val_print.  */
 
 static void
 cp_print_static_field (struct type *type,
                       struct value *val,
                       struct ui_file *stream,

-                      int format,

                       int recurse,
                       int recurse,

-                      enum val_prettyprint pretty)
+                      const struct value_print_options *options)

 {
 {

+  struct value_print_options opts;

   if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
     {
       CORE_ADDR *first_dont_print;
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
     {
       CORE_ADDR *first_dont_print;

+      CORE_ADDR addr;

       int i;
 
       first_dont_print
       int i;
 
       first_dont_print


@@ -680,7 +487,7 @@ cp_print_static_field (struct type *type,
 
       while (--i >= 0)
        {
 
       while (--i >= 0)
        {

-         if (VALUE_ADDRESS (val) == first_dont_print[i])
+         if (value_address (val) == first_dont_print[i])

            {
              fputs_filtered ("<same as static member of an already"
                              " seen type>",
            {
              fputs_filtered ("<same as static member of an already"
                              " seen type>",


@@ -689,62 +496,104 @@ cp_print_static_field (struct type *type,
            }
        }
 
            }
        }
 

-      obstack_grow (&dont_print_statmem_obstack, (char *) &VALUE_ADDRESS (val),
+      addr = value_address (val);
+      obstack_grow (&dont_print_statmem_obstack, (char *) &addr,

                    sizeof (CORE_ADDR));
 
       CHECK_TYPEDEF (type);
       cp_print_value_fields (type, type, value_contents_all (val),
                    sizeof (CORE_ADDR));
 
       CHECK_TYPEDEF (type);
       cp_print_value_fields (type, type, value_contents_all (val),

-                            value_embedded_offset (val), VALUE_ADDRESS (val),
-                            stream, format, recurse, pretty, NULL, 1);
+                            value_embedded_offset (val), addr,
+                            stream, recurse, options, NULL, 1);

       return;
     }
       return;
     }

+
+  opts = *options;
+  opts.deref_ref = 0;

   val_print (type, value_contents_all (val), 
   val_print (type, value_contents_all (val), 

-            value_embedded_offset (val), VALUE_ADDRESS (val),
-            stream, format, 0, recurse, pretty);
+            value_embedded_offset (val), value_address (val),
+            stream, recurse, &opts, current_language);

 }
 
 }
 

-void
-cp_print_class_member (const gdb_byte *valaddr, struct type *domain,
-                      struct ui_file *stream, char *prefix)
-{

 
 

-  /* VAL is a byte offset into the structure type DOMAIN.
-     Find the name of the field for that offset and
-     print it.  */
-  int extra = 0;
-  int bits = 0;
-  unsigned int i;
-  unsigned len = TYPE_NFIELDS (domain);
+/* Find the field in *DOMAIN, or its non-virtual base classes, with bit offset
+   OFFSET.  Set *DOMAIN to the containing type and *FIELDNO to the containing
+   field number.  If OFFSET is not exactly at the start of some field, set
+   *DOMAIN to NULL.  */

 
 

-  /* @@ 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! */
+static void
+cp_find_class_member (struct type **domain_p, int *fieldno,
+                     LONGEST offset)
+{
+  struct type *domain;
+  unsigned int i;
+  unsigned len;

 
 

-  /* Note: HP cfront uses a constant bias of 1; if we support this
-     compiler ever, we will have to adjust the computation below */
+  *domain_p = check_typedef (*domain_p);
+  domain = *domain_p;
+  len = TYPE_NFIELDS (domain);

 
 

-  LONGEST val = unpack_long (builtin_type_int, valaddr) << 3;

   for (i = TYPE_N_BASECLASSES (domain); i < len; i++)
     {
   for (i = TYPE_N_BASECLASSES (domain); i < len; i++)
     {

-      int bitpos = TYPE_FIELD_BITPOS (domain, i);
+      LONGEST bitpos = TYPE_FIELD_BITPOS (domain, i);
+

       QUIT;
       QUIT;

-      if (val == bitpos)
-       break;
-      if (val < bitpos && i != 0)
+      if (offset == bitpos)

        {
        {

-         /* Somehow pointing into a field.  */
-         i -= 1;
-         extra = (val - TYPE_FIELD_BITPOS (domain, i));
-         if (extra & 0x7)
-           bits = 1;
-         else
-           extra >>= 3;
-         break;
+         *fieldno = i;
+         return;

        }
     }
        }
     }

-  if (i < len)
+
+  for (i = 0; i < TYPE_N_BASECLASSES (domain); i++)
+    {
+      LONGEST bitpos = TYPE_FIELD_BITPOS (domain, i);
+      LONGEST bitsize = 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (domain, i));
+
+      if (offset >= bitpos && offset < bitpos + bitsize)
+       {
+         *domain_p = TYPE_FIELD_TYPE (domain, i);
+         cp_find_class_member (domain_p, fieldno, offset - bitpos);
+         return;
+       }
+    }
+
+  *domain_p = NULL;
+}
+
+void
+cp_print_class_member (const gdb_byte *valaddr, struct type *type,
+                      struct ui_file *stream, char *prefix)
+{
+  enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));
+
+  /* VAL is a byte offset into the structure type DOMAIN.
+     Find the name of the field for that offset and
+     print it.  */
+  struct type *domain = TYPE_DOMAIN_TYPE (type);
+  LONGEST val;
+  unsigned int fieldno;
+
+  val = extract_signed_integer (valaddr, TYPE_LENGTH (type), byte_order);
+
+  /* Pointers to data members are usually byte offsets into an object.
+     Because a data member can have offset zero, and a NULL pointer to
+     member must be distinct from any valid non-NULL pointer to
+     member, either the value is biased or the NULL value has a
+     special representation; both are permitted by ISO C++.  HP aCC
+     used a bias of 0x20000000; HP cfront used a bias of 1; g++ 3.x
+     and other compilers which use the Itanium ABI use -1 as the NULL
+     value.  GDB only supports that last form; to add support for
+     another form, make this into a cp-abi hook.  */
+
+  if (val == -1)
+    {
+      fprintf_filtered (stream, "NULL");
+      return;
+    }
+
+  cp_find_class_member (&domain, &fieldno, val << 3);
+
+  if (domain != NULL)

     {
       char *name;
       fputs_filtered (prefix, stream);
     {
       char *name;
       fputs_filtered (prefix, stream);


@@ -754,115 +603,40 @@ cp_print_class_member (const gdb_byte *valaddr, struct type *domain,
       else
        c_type_print_base (domain, stream, 0, 0);
       fprintf_filtered (stream, "::");
       else
        c_type_print_base (domain, stream, 0, 0);
       fprintf_filtered (stream, "::");

-      fputs_filtered (TYPE_FIELD_NAME (domain, i), stream);
-      if (extra)
-       fprintf_filtered (stream, " + %d bytes", extra);
-      if (bits)
-       fprintf_filtered (stream, " (offset in bits)");
+      fputs_filtered (TYPE_FIELD_NAME (domain, fieldno), stream);

     }
   else
     }
   else

-    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 (struct type *type, int *vfuncs,
-                                     struct value *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;
-         const char *field_physname;
-
-         /* virtual function offset */
-         int vx = (TYPE_FN_FIELD_VOFFSET (TYPE_FN_FIELDLIST1 (type, fn), oi)
-                   - 1);
-
-         /* Get the address of the vfunction entry */
-         struct value *vf = value_copy (v);
-         if (value_lazy (vf))
-           (void) value_fetch_lazy (vf);
-         /* adjust by offset */
-         /* NOTE: cagney/2005-01-02: THIS IS BOGUS.  */
-         value_contents_writeable (vf)[0] += 4 * (HP_ACC_VFUNC_START + vx);
-         vf = value_ind (vf);  /* get the entry */
-         /* make it a pointer */
-         deprecated_set_value_type (vf, value_type (v));
-
-         /* print out the entry */
-         common_val_print (vf, stream, format, 0, recurse + 1, pretty);
-         field_physname
-           = TYPE_FN_FIELD_PHYSNAME (TYPE_FN_FIELDLIST1 (type, fn), oi);
-         /* pai: (temp) FIXME Maybe this should be DMGL_ANSI */
-         vf_name = cplus_demangle (field_physname, DMGL_ARM);
-         fprintf_filtered (stream, " %s", vf_name);
-         if (--(*vfuncs) > 0)
-           fputs_filtered (", ", stream);
-       }
+    fprintf_filtered (stream, "%ld", (long) val);

 }
 
 
 }
 
 

-

 void
 _initialize_cp_valprint (void)
 {
   add_setshow_boolean_cmd ("static-members", class_support,
 void
 _initialize_cp_valprint (void)
 {
   add_setshow_boolean_cmd ("static-members", class_support,

-                          &static_field_print, _("\
+                          &user_print_options.static_field_print, _("\

 Set printing of C++ static members."), _("\
 Show printing of C++ static members."), NULL,
                           NULL,
                           show_static_field_print,
                           &setprintlist, &showprintlist);
 Set printing of C++ static members."), _("\
 Show printing of C++ static members."), NULL,
                           NULL,
                           show_static_field_print,
                           &setprintlist, &showprintlist);

-  /* Turn on printing of static fields.  */
-  static_field_print = 1;

 
 

-  add_setshow_boolean_cmd ("vtbl", class_support, &vtblprint, _("\
+  add_setshow_boolean_cmd ("vtbl", class_support,
+                          &user_print_options.vtblprint, _("\

 Set printing of C++ virtual function tables."), _("\
 Show printing of C++ virtual function tables."), NULL,
                           NULL,
                           show_vtblprint,
                           &setprintlist, &showprintlist);
 
 Set printing of C++ virtual function tables."), _("\
 Show printing of C++ virtual function tables."), NULL,
                           NULL,
                           show_vtblprint,
                           &setprintlist, &showprintlist);
 

-  add_setshow_boolean_cmd ("object", class_support, &objectprint, _("\
+  add_setshow_boolean_cmd ("object", class_support,
+                          &user_print_options.objectprint, _("\

 Set printing of object's derived type based on vtable info."), _("\
 Show printing of object's derived type based on vtable info."), NULL,
                           NULL,
                           show_objectprint,
                           &setprintlist, &showprintlist);
 
 Set printing of object's derived type based on vtable info."), _("\
 Show printing of object's derived type based on vtable info."), NULL,
                           NULL,
                           show_objectprint,
                           &setprintlist, &showprintlist);
 

-  /* Give people the defaults which they are used to.  */
-  objectprint = 0;
-  vtblprint = 0;

   obstack_begin (&dont_print_vb_obstack, 32 * sizeof (struct type *));
   obstack_specify_allocation (&dont_print_statmem_obstack,
                              32 * sizeof (CORE_ADDR), sizeof (CORE_ADDR),
   obstack_begin (&dont_print_vb_obstack, 32 * sizeof (struct type *));
   obstack_specify_allocation (&dont_print_statmem_obstack,
                              32 * sizeof (CORE_ADDR), sizeof (CORE_ADDR),