doc/gdbinv-s.m4.in: remove text on special procedures to continue after

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

diff --git a/gdb/valprint.c b/gdb/valprint.c
index db6f7fc655918cbafec6bd70384a8c844f6c7e3a..9170805150bb8977e7498eb1ae977bf6fedab2ea 100644 (file)
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -510,7 +510,7 @@ val_print_fields (type, valaddr, stream, format, recurse, pretty, dont_print)
       for (i = n_baseclasses; i < len; i++)
        {
          /* Check if static field */
-         if (TYPE_FIELD_STATIC (type, i) || TYPE_FIELD_NESTED (type, i))
+         if (TYPE_FIELD_STATIC (type, i))
            continue;
          if (fields_seen)
            fprintf_filtered (stream, ", ");
@@ -628,7 +628,6 @@ cplus_val_print (type, valaddr, stream, format, recurse, pretty, dont_print)
          obstack_ptr_grow (&dont_print_obstack, TYPE_BASECLASS (type, i));
        }
 
-      /* Fix to use baseclass_offset instead. FIXME */
       baddr = baseclass_addr (type, i, valaddr, 0, &err);
       if (err == 0 && baddr == 0)
        error ("could not find virtual baseclass `%s'\n",
@@ -868,9 +867,8 @@ val_print (type, valaddr, address, stream, format, deref_ref, recurse, pretty)
 
          addr = unpack_pointer (lookup_pointer_type (builtin_type_void),
                                valaddr);
-         if (METHOD_PTR_IS_VIRTUAL(addr))
+         if (addr < 128)                       /* FIXME!  What is this 128? */
            {
-             int offset = METHOD_PTR_TO_VOFFSET(addr);
              len = TYPE_NFN_FIELDS (domain);
              for (i = 0; i < len; i++)
                {
@@ -880,9 +878,9 @@ val_print (type, valaddr, address, stream, format, deref_ref, recurse, pretty)
                  for (j = 0; j < len2; j++)
                    {
                      QUIT;
-                     if (TYPE_FN_FIELD_VOFFSET (f, j) == offset)
+                     if (TYPE_FN_FIELD_VOFFSET (f, j) == addr)
                        {
-                         kind = "virtual ";
+                         kind = "virtual";
                          goto common;
                        }
                    }
@@ -1847,14 +1845,10 @@ type_print_base (type, stream, show, level)
                {
                  fprintf_filtered (stream, "static ");
                }
-             if (TYPE_FIELD_NESTED (type, i))
-               {
-                 fprintf_filtered (stream, "typedef ");
-               }
              type_print_1 (TYPE_FIELD_TYPE (type, i),
                            TYPE_FIELD_NAME (type, i),
                            stream, show - 1, level + 4);
-             if (!TYPE_FIELD_STATIC (type, i) && !TYPE_FIELD_NESTED (type, i)
+             if (!TYPE_FIELD_STATIC (type, i)
                  && TYPE_FIELD_PACKED (type, i))
                {
                  /* It is a bitfield.  This code does not attempt
@@ -1868,13 +1862,8 @@ type_print_base (type, stream, show, level)
              fprintf_filtered (stream, ";\n");
            }
 
-         /* If there are both fields and methods, put a space between. */
-         len = TYPE_NFN_FIELDS (type);
-         if (len && section_type != s_none)
-            fprintf_filtered (stream, "\n");
-
          /* C++: print out the methods */
-
+         len = TYPE_NFN_FIELDS (type);
          for (i = 0; i < len; i++)
            {
              struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);