i386: Align branches within a fixed boundary

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

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index d3a38d885d86639044420d9112a048a9a6d15b71..0ec84f6799e7d1c7da309b5abf0ef6da7e941951 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -35,7 +35,9 @@
 #include "language.h"
 #include "extension.h"
 #include "typeprint.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbarch.h"
+#include "cli/cli-style.h"
 
 static struct obstack dont_print_vb_obstack;
 static struct obstack dont_print_statmem_obstack;
@@ -54,7 +56,7 @@ static void cp_print_value (struct type *, struct type *,
 
 
 /* GCC versions after 2.4.5 use this.  */
-extern const char vtbl_ptr_name[] = "__vtbl_ptr_type";
+const char vtbl_ptr_name[] = "__vtbl_ptr_type";
 
 /* Return truth value for assertion that TYPE is of the type
    "pointer to virtual function".  */
@@ -169,7 +171,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
 
   /* If there are no data fields, skip this part */
   if (len == n_baseclasses || !len)
-    fprintf_filtered (stream, "<No data fields>");
+    fprintf_styled (stream, metadata_style.style (), "<No data fields>");
   else
     {
       size_t statmem_obstack_initial_size = 0;
@@ -267,7 +269,8 @@ cp_print_value_fields (struct type *type, struct type *real_type,
                 byte order problems.  */
              if (TYPE_FIELD_IGNORE (type, i))
                {
-                 fputs_filtered ("<optimized out or zero length>", stream);
+                 fputs_styled ("<optimized out or zero length>",
+                               metadata_style.style (), stream);
                }
              else if (value_bits_synthetic_pointer (val,
                                                     TYPE_FIELD_BITPOS (type,
@@ -275,7 +278,8 @@ cp_print_value_fields (struct type *type, struct type *real_type,
                                                     TYPE_FIELD_BITSIZE (type,
                                                                         i)))
                {
-                 fputs_filtered (_("<synthetic pointer>"), stream);
+                 fputs_styled (_("<synthetic pointer>"),
+                               metadata_style.style (), stream);
                }
              else
                {
@@ -291,8 +295,8 @@ cp_print_value_fields (struct type *type, struct type *real_type,
            {
              if (TYPE_FIELD_IGNORE (type, i))
                {
-                 fputs_filtered ("<optimized out or zero length>",
-                                 stream);
+                 fputs_styled ("<optimized out or zero length>",
+                               metadata_style.style (), stream);
                }
              else if (field_is_static (&TYPE_FIELD (type, i)))
                {
@@ -306,9 +310,9 @@ cp_print_value_fields (struct type *type, struct type *real_type,
                    }
                  catch (const gdb_exception_error &ex)
                    {
-                     fprintf_filtered (stream,
-                                       _("<error reading variable: %s>"),
-                                       ex.what ());
+                     fprintf_styled (stream, metadata_style.style (),
+                                     _("<error reading variable: %s>"),
+                                     ex.what ());
                    }
                }
              else if (i == vptr_fieldno && type == vptr_basetype)
@@ -634,9 +638,9 @@ cp_print_static_field (struct type *type,
        {
          if (value_address (val) == first_dont_print[i])
            {
-             fputs_filtered ("<same as static member of an already"
-                             " seen type>",
-                             stream);
+             fputs_styled (_("<same as static member of an already"
+                             " seen type>"),
+                           metadata_style.style (), stream);
              return;
            }
        }
@@ -666,9 +670,9 @@ cp_print_static_field (struct type *type,
        {
          if (target_type == first_dont_print[i])
            {
-             fputs_filtered ("<same as static member of an already"
-                             " seen type>",
-                             stream);
+             fputs_styled (_("<same as static member of an already"
+                             " seen type>"),
+                           metadata_style.style (), stream);
              return;
            }
        }
@@ -736,7 +740,7 @@ void
 cp_print_class_member (const gdb_byte *valaddr, struct type *type,
                       struct ui_file *stream, const char *prefix)
 {
-  enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));
+  enum bfd_endian byte_order = type_byte_order (type);
 
   /* VAL is a byte offset into the structure type SELF_TYPE.
      Find the name of the field for that offset and