gdb: remove TYPE_FIELD_PACKED

Replace with a new equivalent "is_packed" method on struct field.

Change-Id: I78647be3d408b40b63becb6b6f0fca211bede51c
Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 9a1f3d6c9ffe13bde3ae792885e8bd219c331932..eaeca0f6516176527ec752381d14c9e4c9f6a3bb 100644 (file)
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -615,7 +615,7 @@ print_field_values (struct value *value, struct value *outer_value,
       gdb_puts (" => ", stream);
       annotate_field_value ();
 
-      if (TYPE_FIELD_PACKED (type, i))
+      if (type->field (i).is_packed ())
        {
          /* Bitfields require special handling, especially due to byte
             order problems.  */

diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index affb775fb7e27a32f825b385d21ba73675f52867..e6feee677b3de392464fe036540eef60112f4e89 100644 (file)
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -560,7 +560,7 @@ amd64_has_unaligned_fields (struct type *type)
          if (type->field (i).is_static ()
              || (type->field (i).bitsize () == 0
                  && subtype->length () == 0)
-             || TYPE_FIELD_PACKED (type, i))
+             || type->field (i).is_packed ())
            continue;
 
          int bitpos = type->field (i).loc_bitpos ();

diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 068796aa9bcd14e9a4b97e5bdd05b70156c6e8e0..a679c86491508d1ea496de5e51f60c00bf22f67d 100644 (file)
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -1317,7 +1317,7 @@ gen_primitive_field (struct agent_expr *ax, struct axs_value *value,
                     int offset, int fieldno, struct type *type)
 {
   /* Is this a bitfield?  */
-  if (TYPE_FIELD_PACKED (type, fieldno))
+  if (type->field (fieldno).is_packed ())
     gen_bitfield_ref (ax, value, type->field (fieldno).type (),
                      (offset * TARGET_CHAR_BIT
                       + type->field (fieldno).loc_bitpos ()),
@@ -1502,7 +1502,7 @@ gen_struct_elt_for_reference (struct agent_expr *ax, struct axs_value *value,
                       fieldname);
              return 1;
            }
-         if (TYPE_FIELD_PACKED (t, i))
+         if (t->field (i).is_packed ())
            error (_("pointers to bitfield members not allowed"));
 
          /* FIXME we need a way to do "want_address" equivalent */       

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 708250c4801dc1018dc208544a61e8a0d8fb0281..e141a62311ca9dc3185ff88da97d53b2544f5b5c 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -1154,7 +1154,7 @@ c_type_print_base_struct_union (struct type *type, struct ui_file *stream,
                          stream, newshow, level + 4,
                          language, &local_flags, &local_podata);
 
-         if (!is_static && TYPE_FIELD_PACKED (type, i))
+         if (!is_static && type->field (i).is_packed ())
            {
              /* It is a bitfield.  This code does not attempt
                 to look at the bitpos and reconstruct filler,

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index c73764eb5290c17c8f2ea4ac85069019bcb2eac3..820a761054a89bb2474cb928b8aeae910474c8ab 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -259,7 +259,7 @@ cp_print_value_fields (struct value *val, struct ui_file *stream,
          annotate_field_value ();
 
          if (!type->field (i).is_static ()
-             && TYPE_FIELD_PACKED (type, i))
+             && type->field (i).is_packed ())
            {
              struct value *v;
 

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index d2edca51caffaac8a818ce18ba9c800dc586c9d4..f45a957f3443a890324b6f5a1c6b63f01a893120 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -584,6 +584,11 @@ struct field
     m_bitsize = bitsize;
   }
 
+  bool is_packed () const
+  {
+    return m_bitsize != 0;
+  }
+
   /* Return true if this field is static; false if not.  */
   bool is_static () const
   {
@@ -1933,8 +1938,6 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
   (TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits == NULL ? 0 \
     : B_TST(TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits, (index)))
 
-#define TYPE_FIELD_PACKED(thistype, n) (((thistype)->field (n).bitsize ())!=0)
-
 #define TYPE_FIELD_PRIVATE_BITS(thistype) \
   TYPE_CPLUS_SPECIFIC(thistype)->private_field_bits
 #define TYPE_FIELD_PROTECTED_BITS(thistype) \

diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 552c1219dbfc8dac4dd03b1ef8828f66b5e4e049..9a4cb8d6b558bd755e6f061730471f2042adbe9f 100644 (file)
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -570,7 +570,7 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show,
          m2_print_type (type->field (i).type (),
                         "",
                         stream, 0, level + 4, flags);
-         if (TYPE_FIELD_PACKED (type, i))
+         if (type->field (i).is_packed ())
            {
              /* It is a bitfield.  This code does not attempt
                 to look at the bitpos and reconstruct filler,

diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index 356a3a8d2355ed762b5c774a4c4f82046af8d2bc..54ff9661220283e04603b87924b79d7c19cc928a 100644 (file)
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -522,7 +522,7 @@ pascal_language::type_print_base (struct type *type, struct ui_file *stream, int
                                 type->field (i).name (),
                                 stream, show - 1, level + 4, flags);
              if (!type->field (i).is_static ()
-                 && TYPE_FIELD_PACKED (type, i))
+                 && type->field (i).is_packed ())
                {
                  /* It is a bitfield.  This code does not attempt
                     to look at the bitpos and reconstruct filler,

diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index b32c0f17c6b272064eb4b6888d8aa77202a8e418..fb9386293a6f4d790058cd22662a7055ac0f42d8 100644 (file)
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -598,7 +598,7 @@ pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
          annotate_field_value ();
 
          if (!type->field (i).is_static ()
-             && TYPE_FIELD_PACKED (type, i))
+             && type->field (i).is_packed ())
            {
              struct value *v;
 

diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 4a282cbaaa298c9f9de1939b78afacea8c6275a1..259ff132142b31dd4742eaab34037d755e9c7f58 100644 (file)
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -149,7 +149,7 @@ print_offset_data::update (struct type *type, unsigned int field_idx,
 
   maybe_print_hole (stream, bitpos, "hole");
 
-  if (TYPE_FIELD_PACKED (type, field_idx)
+  if (type->field (field_idx).is_packed ()
       || offset_bitpos % TARGET_CHAR_BIT != 0)
     {
       /* We're dealing with a bitfield.  Print the bit offset.  */

diff --git a/gdb/valops.c b/gdb/valops.c
index b007fe08d348ba8eda62c80ca7746386d463dd36..70851cd40b4ff6a70b98e87e7341f624eecce46f 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -3581,7 +3581,7 @@ value_struct_elt_for_reference (struct type *domain, int offset,
                v = value_addr (v);
              return v;
            }
-         if (TYPE_FIELD_PACKED (t, i))
+         if (t->field (i).is_packed ())
            error (_("pointers to bitfield members not allowed"));
 
          if (want_address)