gdb: convert TYPE_DATA_SPACE macro to type::is_data_space

Convert the TYPE_DATA_SPACE macro to a method of the type class.  This
is a refactoring.

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

diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 26b786c68b747d9c6975bd12bb32cfbc81fa8cf7..682b7e8586dd8b02b3a6408f2e0ce495d716a2a9 100644 (file)
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -361,7 +361,7 @@ avr_integer_to_address (struct gdbarch *gdbarch,
 {
   ULONGEST addr = unpack_long (type, buf);
 
-  if (TYPE_DATA_SPACE (type))
+  if (type->is_data_space ())
     return avr_make_saddr (addr);
   else
     return avr_make_iaddr (addr);

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index a8927e0ac43e021c50d99302dcc89bf45215c229..d26640e10e6bd83559effceb1dbe6da00fe01e1a 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -487,7 +487,7 @@ c_type_print_modifier (struct type *type, struct ui_file *stream,
 
   if (type->is_code_space ())
     address_space_id = "code";
-  else if (TYPE_DATA_SPACE (type))
+  else if (type->is_data_space ())
     address_space_id = "data";
   else if (gdbarch_address_class_id_to_name_p (type->arch ()))
     address_space_id

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 465af4790fd89ffb2653ca2fb30c85f15f57d45a..731c7436dc6aa94a97e1768aae9b34a9d9eb9dcd 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -5027,10 +5027,8 @@ recursive_dump_type (struct type *type, int spaces)
     gdb_puts (" TYPE_VOLATILE");
   if (type->is_code_space ())
     gdb_puts (" TYPE_CODE_SPACE");
-  if (TYPE_DATA_SPACE (type))
-    {
-      gdb_puts (" TYPE_DATA_SPACE");
-    }
+  if (type->is_data_space ())
+    gdb_puts (" TYPE_DATA_SPACE");
   if (TYPE_ADDRESS_CLASS (type) != 0)
     {
       gdb_printf (" TYPE_ADDRESS_CLASS(%u)", TYPE_ADDRESS_CLASS (type));

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index d9988312e1baefbec52240bec799e8e5ffef86c7..b6c3b2194191cca0ecf1063f336742dd5da054f8 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -189,9 +189,6 @@ struct type_instance_flags
   (((t)->dyn_prop (DYN_PROP_BYTE_SIZE) != nullptr)     \
    || ((t)->dyn_prop (DYN_PROP_BIT_SIZE) != nullptr))
 
-#define TYPE_DATA_SPACE(t) \
-  (((t)->instance_flags ()).harvard_aspace == HARVARD_ASPACE_DATA)
-
 #define TYPE_ADDRESS_CLASS(t) \
   (((t)->instance_flags ()).address_class)
 
@@ -1219,6 +1216,12 @@ struct type
     return this->m_instance_flags.harvard_aspace == HARVARD_ASPACE_CODE;
   }
 
+  /* Return if this type is in the data space.  */
+  bool is_data_space () const
+  {
+    return this->m_instance_flags.harvard_aspace == HARVARD_ASPACE_DATA;
+  }
+
   /* Get the bounds bounds of this type.  The type must be a range type.  */
   range_bounds *bounds () const
   {