*** empty log message ***

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

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 255e9ce22361efade6caf9de6aa78f799a4d6121..7dd13bbfcec662fc33c5258965a13903fcfd11fa 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -1,8 +1,7 @@
 /* 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, 2006, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1986, 1988-1989, 1991-1997, 2000-2003, 2005-2012 Free
+   Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -99,7 +98,7 @@ const char vtbl_ptr_name[] = "__vtbl_ptr_type";
 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));
 }
@@ -340,15 +339,40 @@ cp_print_value_fields (struct type *type, struct type *real_type,
                }
              else if (field_is_static (&TYPE_FIELD (type, i)))
                {
-                 struct value *v = value_static_field (type, i);
-
-                 if (v == NULL)
+                 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);
+                 else if (v == NULL)
                    val_print_optimized_out (stream);
                  else
                    cp_print_static_field (TYPE_FIELD_TYPE (type, i),
                                           v, stream, recurse + 1,
                                           options);
                }
+             else if (i == TYPE_VPTR_FIELDNO (type))
+               {
+                 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 (get_type_arch (type),
+                                                     addr, stream,
+                                                     options->addressprint);
+                   }
+               }
              else
                {
                  struct value_print_options opts = *options;
@@ -486,7 +510,7 @@ cp_print_value (struct type *type, struct type *real_type,
       int boffset = 0;
       int skip;
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
-      char *basename = TYPE_NAME (baseclass);
+      const char *basename = TYPE_NAME (baseclass);
       const gdb_byte *base_valaddr = NULL;
       const struct value *base_val = NULL;
       volatile struct gdb_exception ex;
@@ -785,7 +809,7 @@ cp_print_class_member (const gdb_byte *valaddr, struct type *type,
 
   if (domain != NULL)
     {
-      char *name;
+      const char *name;
 
       fputs_filtered (prefix, stream);
       name = type_name_no_tag (domain);