[binutils-gdb] gdb: convert TYPE_DATA_SPACE macro to type::is_data_space
Tankut Baris Aktemur via Gdb-cvs <[email protected]> Thu, 23 Jul 2026 10:13:30 +0000 (GMT)
| Newsgroups | gmane.comp.gdb.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D9dcc5181cebf= 2bf90116a61db00b5eaa78cf3399 commit 9dcc5181cebf2bf90116a61db00b5eaa78cf3399 Author: Tankut Baris Aktemur <[email protected]> Date: Thu Jul 23 05:04:43 2026 -0500 gdb: convert TYPE_DATA_SPACE macro to type::is_data_space =20 Convert the TYPE_DATA_SPACE macro to a method of the type class. This is a refactoring. =20 Approved-By: Tom Tromey <[email protected]> Diff: --- gdb/avr-tdep.c | 2 +- gdb/c-typeprint.c | 2 +- gdb/gdbtypes.c | 6 ++---- gdb/gdbtypes.h | 9 ++++++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index 26b786c68b7..682b7e8586d 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -361,7 +361,7 @@ avr_integer_to_address (struct gdbarch *gdbarch, { ULONGEST addr =3D unpack_long (type, buf); =20 - 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 a8927e0ac43..d26640e10e6 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -487,7 +487,7 @@ c_type_print_modifier (struct type *type, struct ui_fil= e *stream, =20 if (type->is_code_space ()) address_space_id =3D "code"; - else if (TYPE_DATA_SPACE (type)) + else if (type->is_data_space ()) address_space_id =3D "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 465af4790fd..731c7436dc6 100644 --- 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) !=3D 0) { gdb_printf (" TYPE_ADDRESS_CLASS(%u)", TYPE_ADDRESS_CLASS (type)); diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index d9988312e1b..b6c3b219419 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -189,9 +189,6 @@ struct type_instance_flags (((t)->dyn_prop (DYN_PROP_BYTE_SIZE) !=3D nullptr) \ || ((t)->dyn_prop (DYN_PROP_BIT_SIZE) !=3D nullptr)) =20 -#define TYPE_DATA_SPACE(t) \ - (((t)->instance_flags ()).harvard_aspace =3D=3D HARVARD_ASPACE_DATA) - #define TYPE_ADDRESS_CLASS(t) \ (((t)->instance_flags ()).address_class) =20 @@ -1219,6 +1216,12 @@ struct type return this->m_instance_flags.harvard_aspace =3D=3D HARVARD_ASPACE_COD= E; } =20 + /* Return if this type is in the data space. */ + bool is_data_space () const + { + return this->m_instance_flags.harvard_aspace =3D=3D HARVARD_ASPACE_DAT= A; + } + /* Get the bounds bounds of this type. The type must be a range type. = */ range_bounds *bounds () const {