GDB 7.6.50

gdb/cp-valprint.c

 /* Support for printing C++ values for GDB, the GNU debugger.
 
-   Copyright (C) 1986, 1988-1989, 1991-1997, 2000-2003, 2005-2012 Free
-   Software Foundation, Inc.
+   Copyright (C) 1986-2013 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 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "gdb_obstack.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
 #include "value.h"
 #include "command.h"
 #include "gdbcmd.h"
 #include "demangle.h"
 #include "annotate.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "c-lang.h"
 #include "target.h"
 #include "cp-abi.h"
 #include "valprint.h"
 #include "cp-support.h"
 #include "language.h"
 #include "python/python.h"
 #include "exceptions.h"
+#include "typeprint.h"
 
 /* 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);
 }
@@ skipping 153 matching lines @@
 
   /* Second, print out data fields */
 
   /* If there are no data fields, skip this part */
   if (len == n_baseclasses || !len)
     fprintf_filtered (stream, "<No data fields>");
   else
     {
       int statmem_obstack_initial_size = 0;
       int stat_array_obstack_initial_size = 0;
-      
+      struct type *vptr_basetype = NULL;
+      int vptr_fieldno;
+
       if (dont_print_statmem == 0)
         {
           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 (!options->static_field_print
               && field_is_static (&TYPE_FIELD (type, i)))
             continue;
 
           if (fields_seen)
             fprintf_filtered (stream, ", ");
           else if (n_baseclasses > 0)
             {
-              if (options->pretty)
+              if (options->prettyformat)
                 {
                   fprintf_filtered (stream, "\n");
                   print_spaces_filtered (2 + 2 * recurse, stream);
                   fputs_filtered ("members of ", stream);
                   fputs_filtered (type_name_no_tag (type), stream);
                   fputs_filtered (": ", stream);
                 }
             }
           fields_seen = 1;
 
-          if (options->pretty)
+          if (options->prettyformat)
             {
               fprintf_filtered (stream, "\n");
               print_spaces_filtered (2 + 2 * recurse, stream);
             }
           else
             {
               wrap_here (n_spaces (2 + 2 * recurse));
             }
-          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 (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);
-              fputs_filtered ("\" \"", stream);
-              fprintf_symbol_filtered (stream,
-                                       TYPE_FIELD_NAME (type, i),
-                                       current_language->la_language,
-                                       DMGL_PARAMS | DMGL_ANSI);
-              fputs_filtered ("\") \"", stream);
-            }
-          else
-            {
-              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 ();
-            }
+          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.  */
               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 if (!value_bits_valid (val,
                                           TYPE_FIELD_BITPOS (type, i),
                                           TYPE_FIELD_BITSIZE (type, i)))
                 {
-                  val_print_optimized_out (stream);
+                  val_print_optimized_out (val, stream);
                 }
               else
                 {
                   struct value_print_options opts = *options;
 
                   opts.deref_ref = 0;
 
                   v = value_field_bitfield (type, i, valaddr, offset, val);
 
                   common_val_print (v, stream, recurse + 1, &opts,
@@ skipping 14 matching lines @@
 
                   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);
+                  cp_print_static_field (TYPE_FIELD_TYPE (type, i),
+                                         v, stream, recurse + 1,
+                                         options);
                 }
-              else if (i == TYPE_VPTR_FIELDNO (type))
+              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,
@@ skipping 46 matching lines @@
                     - (obstack_final_size
                        - stat_array_obstack_initial_size);
 
                   obstack_free (&dont_print_stat_array_obstack,
                                 free_to_ptr);
                 }
               last_set_recurse = -1;
             }
         }
 
-      if (options->pretty)
+      if (options->prettyformat)
         {
           fprintf_filtered (stream, "\n");
           print_spaces_filtered (2 * recurse, stream);
         }
     }                           /* if there are data fields */
 
   fprintf_filtered (stream, "}");
 }
 
 /* Like cp_print_value_fields, but find the runtime type of the object
@@ skipping 140 matching lines @@
                 }
             }
           else
             {
               base_valaddr = valaddr;
               base_val = val;
             }
         }
 
       /* Now do the printing.  */
-      if (options->pretty)
+      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.  */
       fputs_filtered (basename ? basename : "", stream);
       fputs_filtered ("> = ", stream);
 
@@ skipping 51 matching lines @@
    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 recurse,
                        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 = obstack_object_size (&dont_print_statmem_obstack)
         / sizeof (CORE_ADDR);
@@ skipping 107 matching lines @@
 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;
+  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
@@ skipping 12 matching lines @@
 
   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, fieldno), stream);
     }
   else
     fprintf_filtered (stream, "%ld", (long) val);
 }
 
 
 void
 _initialize_cp_valprint (void)
@@ skipping 22 matching lines @@
                            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 *));
 }