fixed optimzation for Atom
[platform/upstream/binutils.git] / gdb / cp-valprint.c
index 9a32e9c..42010c2 100644 (file)
@@ -1,13 +1,12 @@
 /* Support for printing C++ values for GDB, the GNU debugger.
-   Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   2000, 2001, 2002, 2003
-   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
-   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,
@@ -16,9 +15,7 @@
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "gdb_obstack.h"
 #include "gdbcmd.h"
 #include "demangle.h"
 #include "annotate.h"
-#include "gdb_string.h"
 #include "c-lang.h"
 #include "target.h"
 #include "cp-abi.h"
+#include "valprint.h"
+#include "cp-support.h"
+#include "language.h"
+#include "extension.h"
+#include "typeprint.h"
 
-/* Indication of presence of HP-compiled object files */
-extern int hp_som_som_object_present;  /* defined in symtab.c */
+/* Controls printing of vtbl's.  */
+static void
+show_vtblprint (struct ui_file *file, int from_tty,
+               struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("\
+Printing of C++ virtual function tables is %s.\n"),
+                   value);
+}
 
+/* Controls looking up an object's derived type using what we find in
+   its vtables.  */
+static void
+show_objectprint (struct ui_file *file, int from_tty,
+                 struct cmd_list_element *c,
+                 const char *value)
+{
+  fprintf_filtered (file, _("\
+Printing of object's derived type based on vtable info is %s.\n"),
+                   value);
+}
+
+static void
+show_static_field_print (struct ui_file *file, int from_tty,
+                        struct cmd_list_element *c,
+                        const char *value)
+{
+  fprintf_filtered (file,
+                   _("Printing of C++ static members is %s.\n"),
+                   value);
+}
 
-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 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_stat_array_obstack;
 
 extern void _initialize_cp_valprint (void);
 
 static void cp_print_static_field (struct type *, struct value *,
-                                  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 *,
-                                                 struct value *,
-                                                 struct ui_file *, int,
-                                                 int,
-                                                 enum val_prettyprint);
-
-
-void
-cp_print_class_method (char *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);
+                                  struct ui_file *, int,
+                                  const struct value_print_options *);
 
-         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 (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);
+static void cp_print_value (struct type *, struct type *,
+                           const gdb_byte *, int,
+                           CORE_ADDR, struct ui_file *,
+                           int, const struct value *,
+                           const struct value_print_options *,
+                           struct type **);
 
-         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, "&");
-      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
-       {
-         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";
 
-/* 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".  */
 
 int
 cp_is_vtbl_ptr_type (struct type *type)
 {
-  char *typename = type_name_no_tag (type);
+  const char *typename = type_name_no_tag (type);
 
   return (typename != NULL && !strcmp (typename, vtbl_ptr_name));
 }
@@ -186,19 +107,19 @@ cp_is_vtbl_ptr_type (struct type *type)
 int
 cp_is_vtbl_member (struct type *type)
 {
-  /* With older versions of g++, the vtbl field pointed to an array
-     of structures.  Nowadays it points directly to the structure. */
+  /* With older versions of g++, the vtbl field pointed to an array of
+     structures.  Nowadays it points directly to the structure.  */
   if (TYPE_CODE (type) == TYPE_CODE_PTR)
     {
       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
-                to virtual functions. */
+                to virtual functions.  */
              return cp_is_vtbl_ptr_type (type);
            }
        }
@@ -208,9 +129,10 @@ cp_is_vtbl_member (struct type *type)
        }
       else if (TYPE_CODE (type) == TYPE_CODE_PTR)     /* if using thunks */
        {
-         /* The type name of the thunk pointer is NULL when using dwarf2.
-            We could test for a pointer to a function, but there is
-            no type info for the virtual table either, so it wont help.  */
+         /* The type name of the thunk pointer is NULL when using
+            dwarf2.  We could test for a pointer to a function, but
+            there is no type info for the virtual table either, so it
+            wont help.  */
          return cp_is_vtbl_ptr_type (type);
        }
     }
@@ -218,29 +140,51 @@ 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.
+   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 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
-   class across the recursion to base classes. 
+   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.  */
+   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 (struct type *type, struct type *real_type, char *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)
+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 recurse, const struct value *val,
+                      const struct value_print_options *options,
+                      struct type **dont_print_vb,
+                      int dont_print_statmem)
 {
   int i, len, n_baseclasses;
-  struct obstack tmp_obstack;
-  char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
   int fields_seen = 0;
+  static int last_set_recurse = -1;
 
   CHECK_TYPEDEF (type);
+  
+  if (recurse == 0)
+    {
+      /* Any object can be left on obstacks only during an unexpected
+        error.  */
+
+      if (obstack_object_size (&dont_print_statmem_obstack) > 0)
+       {
+         obstack_free (&dont_print_statmem_obstack, NULL);
+         obstack_begin (&dont_print_statmem_obstack,
+                        32 * sizeof (CORE_ADDR));
+       }
+      if (obstack_object_size (&dont_print_stat_array_obstack) > 0)
+       {
+         obstack_free (&dont_print_stat_array_obstack, NULL);
+         obstack_begin (&dont_print_stat_array_obstack,
+                        32 * sizeof (struct type *));
+       }
+    }
 
   fprintf_filtered (stream, "{");
   len = TYPE_NFIELDS (type);
@@ -250,50 +194,50 @@ cp_print_value_fields (struct type *type, struct type *real_type, char *valaddr,
      duplicates of virtual baseclasses.  */
 
   if (n_baseclasses > 0)
-    cp_print_value (type, real_type, valaddr, offset, address, stream,
-                   format, recurse + 1, pretty, dont_print_vb);
+    cp_print_value (type, real_type, valaddr, 
+                   offset, address, stream,
+                   recurse + 1, val, options,
+                   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)
-         && 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
     {
-      extern int inspect_it;
+      size_t statmem_obstack_initial_size = 0;
+      size_t stat_array_obstack_initial_size = 0;
+      struct type *vptr_basetype = NULL;
+      int vptr_fieldno;
 
       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);
+         statmem_obstack_initial_size =
+           obstack_object_size (&dont_print_statmem_obstack);
+
+         if (last_set_recurse != recurse)
+           {
+             stat_array_obstack_initial_size =
+               obstack_object_size (&dont_print_stat_array_obstack);
+
+             last_set_recurse = recurse;
+           }
        }
 
+      vptr_fieldno = get_vptr_fieldno (type, &vptr_basetype);
       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)
            {
-             if (pretty)
+             if (options->prettyformat)
                {
                  fprintf_filtered (stream, "\n");
                  print_spaces_filtered (2 + 2 * recurse, stream);
@@ -304,7 +248,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, char *valaddr,
            }
          fields_seen = 1;
 
-         if (pretty)
+         if (options->prettyformat)
            {
              fprintf_filtered (stream, "\n");
              print_spaces_filtered (2 + 2 * recurse, stream);
@@ -313,81 +257,104 @@ cp_print_value_fields (struct type *type, struct type *real_type, char *valaddr,
            {
              wrap_here (n_spaces (2 + 2 * recurse));
            }
-         if (inspect_it)
-           {
-             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))
-               fputs_filtered ("static ", stream);
-             fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
-                                      language_cplus,
-                                      DMGL_PARAMS | DMGL_ANSI);
-             fputs_filtered ("\" \"", stream);
-             fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
-                                      language_cplus,
-                                      DMGL_PARAMS | DMGL_ANSI);
-             fputs_filtered ("\") \"", stream);
-           }
-         else
-           {
-             annotate_field_begin (TYPE_FIELD_TYPE (type, i));
-
-             if (TYPE_FIELD_STATIC (type, i))
-               fputs_filtered ("static ", stream);
-             fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
-                                      language_cplus,
-                                      DMGL_PARAMS | DMGL_ANSI);
-             annotate_field_name_end ();
-             /* do not print leading '=' in case of anonymous unions */
-             if (strcmp (TYPE_FIELD_NAME (type, i), ""))
-               fputs_filtered (" = ", stream);
-             annotate_field_value ();
-           }
 
-         if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i))
+         annotate_field_begin (TYPE_FIELD_TYPE (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,
+                                  DMGL_PARAMS | DMGL_ANSI);
+         annotate_field_name_end ();
+         /* Do not print leading '=' in case of anonymous
+            unions.  */
+         if (strcmp (TYPE_FIELD_NAME (type, i), ""))
+           fputs_filtered (" = ", stream);
+         annotate_field_value ();
+
+         if (!field_is_static (&TYPE_FIELD (type, i))
+             && TYPE_FIELD_PACKED (type, i))
            {
              struct value *v;
 
-             /* Bitfields require special handling, especially due to byte
-                order problems.  */
+             /* Bitfields require special handling, especially due to
+                byte order problems.  */
              if (TYPE_FIELD_IGNORE (type, i))
                {
                  fputs_filtered ("<optimized out or zero length>", stream);
                }
+             else if (value_bits_synthetic_pointer (val,
+                                                    TYPE_FIELD_BITPOS (type,
+                                                                       i),
+                                                    TYPE_FIELD_BITSIZE (type,
+                                                                        i)))
+               {
+                 fputs_filtered (_("<synthetic pointer>"), stream);
+               }
              else
                {
-                 v = value_from_longest
-                   (TYPE_FIELD_TYPE (type, i), 
-                    unpack_field_as_long (type, valaddr + offset, i));
+                 struct value_print_options opts = *options;
 
-                 val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v),
-                            0, 0, stream, format, 0, recurse + 1, pretty);
+                 opts.deref_ref = 0;
+
+                 v = value_field_bitfield (type, i, valaddr, offset, val);
+
+                 common_val_print (v, stream, recurse + 1, &opts,
+                                   current_language);
                }
            }
          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 (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,
-                                          stream, format, recurse + 1,
-                                          pretty);
+                 volatile struct gdb_exception ex;
+                 struct value *v = NULL;
+
+                 TRY_CATCH (ex, RETURN_MASK_ERROR)
+                   {
+                     v = value_static_field (type, i);
+                   }
+
+                 if (ex.reason < 0)
+                   fprintf_filtered (stream,
+                                     _("<error reading variable: %s>"),
+                                     ex.message);
+                 cp_print_static_field (TYPE_FIELD_TYPE (type, i),
+                                        v, stream, recurse + 1,
+                                        options);
+               }
+             else if (i == vptr_fieldno && type == vptr_basetype)
+               {
+                 int i_offset = offset + TYPE_FIELD_BITPOS (type, i) / 8;
+                 struct type *i_type = TYPE_FIELD_TYPE (type, i);
+
+                 if (valprint_check_validity (stream, i_type, i_offset, val))
+                   {
+                     CORE_ADDR addr;
+                     
+                     addr = extract_typed_address (valaddr + i_offset, i_type);
+                     print_function_pointer_address (options,
+                                                     get_type_arch (type),
+                                                     addr, stream);
+                   }
                }
              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,
-                            stream, format, 0, recurse + 1, pretty);
+                            valaddr, 
+                            offset + TYPE_FIELD_BITPOS (type, i) / 8,
+                            address,
+                            stream, recurse + 1, val, &opts,
+                            current_language);
                }
            }
          annotate_field_end ();
@@ -395,142 +362,139 @@ cp_print_value_fields (struct type *type, struct type *real_type, char *valaddr,
 
       if (dont_print_statmem == 0)
        {
-         /* Free the space used to deal with the printing
-            of the members from top level.  */
-         obstack_free (&dont_print_statmem_obstack, last_dont_print);
-         dont_print_statmem_obstack = tmp_obstack;
-       }
+         size_t obstack_final_size =
+           obstack_object_size (&dont_print_statmem_obstack);
 
-      if (pretty)
-       {
-         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));
-
-      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)
+         if (obstack_final_size > statmem_obstack_initial_size)
            {
-             /* no RRBC support; function pointers embedded directly
-                 in vtable */
-
-             int vfuncs = count_virtual_fns (real_type);
+             /* In effect, a pop of the printed-statics stack.  */
 
-             fputs_filtered (" {", stream);
+             void *free_to_ptr =
+               obstack_next_free (&dont_print_statmem_obstack) -
+               (obstack_final_size - statmem_obstack_initial_size);
 
-             /* 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
+             obstack_free (&dont_print_statmem_obstack,
+                           free_to_ptr);
+           }
 
-             /* 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
+         if (last_set_recurse != recurse)
            {
-             /* FIXME -- see comments above */
-             /* RRBC support present; function pointers are found
-              * by indirection through the class segment entries. */
-
+             size_t obstack_final_size =
+               obstack_object_size (&dont_print_stat_array_obstack);
+             
+             if (obstack_final_size > stat_array_obstack_initial_size)
+               {
+                 void *free_to_ptr =
+                   obstack_next_free (&dont_print_stat_array_obstack)
+                   - (obstack_final_size
+                      - stat_array_obstack_initial_size);
 
-           }                   /* RRBC case */
-       }                       /* if vtblprint */
+                 obstack_free (&dont_print_stat_array_obstack,
+                               free_to_ptr);
+               }
+             last_set_recurse = -1;
+           }
+       }
 
-      if (pretty)
+      if (options->prettyformat)
        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);
        }
-
-    }                          /* if vtable exists */
+    }                          /* if there are data fields */
 
   fprintf_filtered (stream, "}");
 }
 
-/* Special val_print routine to avoid printing multiple copies of virtual
-   baseclasses.  */
+/* Like cp_print_value_fields, but find the runtime type of the object
+   and pass it as the `real_type' argument to cp_print_value_fields.
+   This function is a hack to work around the fact that
+   common_val_print passes the embedded offset to val_print, but not
+   the enclosing type.  */
+
+void
+cp_print_value_fields_rtti (struct type *type,
+                           const gdb_byte *valaddr, int offset,
+                           CORE_ADDR address,
+                           struct ui_file *stream, int recurse,
+                           const struct value *val,
+                           const struct value_print_options *options,
+                           struct type **dont_print_vb, 
+                           int dont_print_statmem)
+{
+  struct type *real_type = NULL;
+
+  /* We require all bits to be valid in order to attempt a
+     conversion.  */
+  if (!value_bits_any_optimized_out (val,
+                                    TARGET_CHAR_BIT * offset,
+                                    TARGET_CHAR_BIT * TYPE_LENGTH (type)))
+    {
+      struct value *value;
+      int full, top, using_enc;
+
+      /* Ugh, we have to convert back to a value here.  */
+      value = value_from_contents_and_address (type, valaddr + offset,
+                                              address + offset);
+      type = value_type (value);
+      /* We don't actually care about most of the result here -- just
+        the type.  We already have the correct offset, due to how
+        val_print was initially called.  */
+      real_type = value_rtti_type (value, &full, &top, &using_enc);
+    }
+
+  if (!real_type)
+    real_type = type;
+
+  cp_print_value_fields (type, real_type, valaddr, offset,
+                        address, stream, recurse, val, options,
+                        dont_print_vb, dont_print_statmem);
+}
+
+/* Special val_print routine to avoid printing multiple copies of
+   virtual baseclasses.  */
 
 static void
-cp_print_value (struct type *type, struct type *real_type, char *valaddr,
-               int offset, CORE_ADDR address, struct ui_file *stream,
-               int format, int recurse, enum val_prettyprint pretty,
+cp_print_value (struct type *type, struct type *real_type,
+               const gdb_byte *valaddr, int offset,
+               CORE_ADDR address, struct ui_file *stream,
+               int recurse, const struct value *val,
+               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 obstack tmp_obstack = dont_print_vb_obstack;
   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
   int thisoffset;
   struct type *thistype;
 
   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.  */
-      tmp_obstack = dont_print_vb_obstack;
+      /* If we're at top level, carve out a completely fresh chunk of
+         the obstack and use that until this particular invocation
+         returns.  */
       /* Bump up the high-water mark.  Now alpha is omega.  */
       obstack_finish (&dont_print_vb_obstack);
     }
 
   for (i = 0; i < n_baseclasses; i++)
     {
-      int boffset;
+      int boffset = 0;
       int skip;
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
-      char *basename = TYPE_NAME (baseclass);
-      char *base_valaddr;
+      const char *basename = TYPE_NAME (baseclass);
+      const gdb_byte *base_valaddr = NULL;
+      const struct value *base_val = NULL;
+      volatile struct gdb_exception ex;
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
        {
          struct type **first_dont_print
            = (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])
@@ -541,71 +505,100 @@ cp_print_value (struct type *type, struct type *real_type, char *valaddr,
 
       thisoffset = offset;
       thistype = real_type;
-      if (TYPE_HAS_VTABLE (type) && BASETYPE_VIA_VIRTUAL (type, i))
+
+      TRY_CATCH (ex, RETURN_MASK_ERROR)
        {
-         /* 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;
+         boffset = baseclass_offset (type, i, valaddr, offset, address, val);
        }
+      if (ex.reason < 0 && ex.error == NOT_AVAILABLE_ERROR)
+       skip = -1;
+      else if (ex.reason < 0)
+       skip = 1;
       else
-       {
-         boffset = baseclass_offset (type, i,
-                                     valaddr + offset,
-                                     address + offset);
-         skip = ((boffset == -1) || (boffset + offset) < 0) ? 1 : -1;
+       {
+         skip = 0;
 
          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.  */
+                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)))
+             if ((boffset + offset) < 0
+                 || (boffset + offset) >= TYPE_LENGTH (real_type))
                {
-                 /* FIXME (alloca): unsafe if baseclass is really really large. */
-                 base_valaddr = (char *) alloca (TYPE_LENGTH (baseclass));
-                 if (target_read_memory (address + offset + boffset, base_valaddr,
+                 gdb_byte *buf;
+                 struct cleanup *back_to;
+
+                 buf = xmalloc (TYPE_LENGTH (baseclass));
+                 back_to = make_cleanup (xfree, buf);
+
+                 if (target_read_memory (address + boffset, buf,
                                          TYPE_LENGTH (baseclass)) != 0)
                    skip = 1;
+                 base_val = value_from_contents_and_address (baseclass,
+                                                             buf,
+                                                             address + boffset);
+                 baseclass = value_type (base_val);
                  thisoffset = 0;
                  boffset = 0;
                  thistype = baseclass;
+                 base_valaddr = value_contents_for_printing_const (base_val);
+                 do_cleanups (back_to);
                }
              else
-               base_valaddr = valaddr;
+               {
+                 base_valaddr = valaddr;
+                 base_val = val;
+               }
            }
          else
-           base_valaddr = valaddr;
+           {
+             base_valaddr = valaddr;
+             base_val = val;
+           }
        }
 
-      /* now do the printing */
-      if (pretty)
+      /* Now do the printing.  */
+      if (options->prettyformat)
        {
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 * recurse, stream);
        }
       fputs_filtered ("<", stream);
-      /* Not sure what the best notation is in the case where there is no
-         baseclass name.  */
+      /* Not sure what the best notation is in the case where there is
+         no baseclass name.  */
       fputs_filtered (basename ? basename : "", stream);
       fputs_filtered ("> = ", stream);
 
-
-      if (skip >= 1)
-       fprintf_filtered (stream, "<invalid address>");
+      if (skip < 0)
+       val_print_unavailable (stream);
+      else if (skip > 0)
+       val_print_invalid_address (stream);
       else
-       cp_print_value_fields (baseclass, thistype, base_valaddr,
-                              thisoffset + boffset, address, stream, format,
-                              recurse, pretty,
-                              ((struct type **)
-                               obstack_base (&dont_print_vb_obstack)),
-                              0);
+       {
+         int result = 0;
+
+         /* Attempt to run an extension language pretty-printer on the
+            baseclass if possible.  */
+         if (!options->raw)
+           result
+             = apply_ext_lang_val_pretty_printer (baseclass, base_valaddr,
+                                                  thisoffset + boffset,
+                                                  value_address (base_val),
+                                                  stream, recurse,
+                                                  base_val, options,
+                                                  current_language);
+
+         if (!result)
+           cp_print_value_fields (baseclass, thistype, base_valaddr,
+                                  thisoffset + boffset,
+                                  value_address (base_val),
+                                  stream, recurse, base_val, options,
+                                  ((struct type **)
+                                   obstack_base (&dont_print_vb_obstack)),
+                                  0);
+       }
       fputs_filtered (", ", stream);
 
     flush_it:
@@ -623,36 +616,43 @@ cp_print_value (struct type *type, struct type *real_type, char *valaddr,
     }
 }
 
-/* Print value of a static member.
-   To avoid infinite recursion when printing a class that contains
-   a static instance of the class, we keep the addresses of all printed
-   static member classes in an obstack and refuse to print them more
-   than once.
+/* Print value of a static member.  To avoid infinite recursion when
+   printing a class that contains a static instance of the class, we
+   keep the addresses of all printed 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,
-                      int format,
                       int recurse,
-                      enum val_prettyprint pretty)
+                      const struct value_print_options *options)
 {
+  struct value_print_options opts;
+
+  if (value_entirely_optimized_out (val))
+    {
+      val_print_optimized_out (val, stream);
+      return;
+    }
+
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
     {
       CORE_ADDR *first_dont_print;
+      CORE_ADDR addr;
       int i;
 
       first_dont_print
        = (CORE_ADDR *) obstack_base (&dont_print_statmem_obstack);
-      i = (CORE_ADDR *) obstack_next_free (&dont_print_statmem_obstack)
-       - first_dont_print;
+      i = obstack_object_size (&dont_print_statmem_obstack)
+       / sizeof (CORE_ADDR);
 
       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>",
@@ -661,178 +661,184 @@ 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),
-                            VALUE_EMBEDDED_OFFSET (val), VALUE_ADDRESS (val),
-                            stream, format, recurse, pretty, NULL, 1);
+      cp_print_value_fields (type, value_enclosing_type (val),
+                            value_contents_for_printing (val),
+                            value_embedded_offset (val), addr,
+                            stream, recurse, val,
+                            options, NULL, 1);
       return;
     }
-  val_print (type, VALUE_CONTENTS_ALL (val), 
-            VALUE_EMBEDDED_OFFSET (val), VALUE_ADDRESS (val),
-            stream, format, 0, recurse, pretty);
-}
 
-void
-cp_print_class_member (char *valaddr, struct type *domain,
-                      struct ui_file *stream, char *prefix)
-{
+  if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
+    {
+      struct type **first_dont_print;
+      int i;
+      struct type *target_type = TYPE_TARGET_TYPE (type);
 
-  /* 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;
-  register unsigned int i;
-  unsigned len = TYPE_NFIELDS (domain);
+      first_dont_print
+       = (struct type **) obstack_base (&dont_print_stat_array_obstack);
+      i = obstack_object_size (&dont_print_stat_array_obstack)
+       / sizeof (struct type *);
 
-  /* @@ Make VAL into bit offset */
+      while (--i >= 0)
+       {
+         if (target_type == first_dont_print[i])
+           {
+             fputs_filtered ("<same as static member of an already"
+                             " seen type>",
+                             stream);
+             return;
+           }
+       }
 
-  /* 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! */
+      obstack_grow (&dont_print_stat_array_obstack,
+                   (char *) &target_type,
+                   sizeof (struct type *));
+    }
+
+  opts = *options;
+  opts.deref_ref = 0;
+  val_print (type, value_contents_for_printing (val), 
+            value_embedded_offset (val),
+            value_address (val),
+            stream, recurse, val,
+            &opts, current_language);
+}
 
-  /* 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;
+/* 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.  */
+
+static void
+cp_find_class_member (struct type **domain_p, int *fieldno,
+                     LONGEST offset)
+{
+  struct type *domain;
+  unsigned int i;
+  unsigned len;
+
+  *domain_p = check_typedef (*domain_p);
+  domain = *domain_p;
+  len = TYPE_NFIELDS (domain);
+
   for (i = TYPE_N_BASECLASSES (domain); i < len; i++)
     {
-      int bitpos = TYPE_FIELD_BITPOS (domain, i);
+      LONGEST bitpos = TYPE_FIELD_BITPOS (domain, i);
+
       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++)
     {
-      char *name;
-      fprintf_filtered (stream, prefix);
+      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;
+  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)
+    {
+      const char *name;
+
+      fputs_filtered (prefix, stream);
       name = type_name_no_tag (domain);
       if (name)
        fputs_filtered (name, stream);
       else
-       c_type_print_base (domain, stream, 0, 0);
+       c_type_print_base (domain, stream, 0, 0, &type_print_raw_options);
       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
-    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 */
-         vf->aligner.contents[0] += 4 * (HP_ACC_VFUNC_START + vx);
-         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);
-         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_show_from_set
-    (add_set_cmd ("static-members", class_support, var_boolean,
-                 (char *) &static_field_print,
-                 "Set printing of C++ static members.",
-                 &setprintlist),
-     &showprintlist);
-  /* Turn on printing of static fields.  */
-  static_field_print = 1;
-
-  add_show_from_set
-    (add_set_cmd ("vtbl", class_support, var_boolean, (char *) &vtblprint,
-                 "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.",
-                 &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),
-                             xmalloc, xfree);
+  add_setshow_boolean_cmd ("static-members", class_support,
+                          &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);
+
+  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);
+
+  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);
+
+  obstack_begin (&dont_print_stat_array_obstack,
+                32 * sizeof (struct type *));
+  obstack_begin (&dont_print_statmem_obstack,
+                32 * sizeof (CORE_ADDR));
+  obstack_begin (&dont_print_vb_obstack,
+                32 * sizeof (struct type *));
 }