Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-11-16 12:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdb: remove TYPE_DATA_LOCATION_ADDR macro

Browse Source 
Remove it in favor of using the dynamic_prop::const_val method directly.

Change-Id: I8dea18d7f504d4ec982b6624342f7a301e8fd636
Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Simon Marchi
2025-10-23 15:07:01 -04:00
committed by Simon Marchi
parent 939fc54b02
commit 1e3c445f54
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/gdbtypes.h
View File

@@ -1931,10 +1931,6 @@ extern unsigned type_align (struct type *);
space in struct type. */ space in struct type. */
extern bool set_type_align (struct type *, ULONGEST); extern bool set_type_align (struct type *, ULONGEST);
/* Property accessors for the type data location. */
#define TYPE_DATA_LOCATION_ADDR(thistype) \
((thistype)->dyn_prop (DYN_PROP_DATA_LOCATION)->const_val ())
/* C++ */ /* C++ */
#define TYPE_SELF_TYPE(thistype) internal_type_self_type (thistype) #define TYPE_SELF_TYPE(thistype) internal_type_self_type (thistype)

31
gdb/value.c
View File

@@ -1420,12 +1420,15 @@ value::address () const
{ {
if (m_lval != lval_memory) if (m_lval != lval_memory)
return 0; return 0;
if (m_parent != NULL) if (m_parent != NULL)
return m_parent->address () + m_offset; return m_parent->address () + m_offset;
if (NULL != type ()->dyn_prop (DYN_PROP_DATA_LOCATION))
if (dynamic_prop *dyn_prop = type ()->dyn_prop (DYN_PROP_DATA_LOCATION);
dyn_prop != nullptr)
{ {
gdb_assert (type ()->dyn_prop (DYN_PROP_DATA_LOCATION)->is_constant ()); gdb_assert (dyn_prop->is_constant ());
return TYPE_DATA_LOCATION_ADDR (type ()); return dyn_prop->const_val ();
} }
return m_location.address + m_offset; return m_location.address + m_offset;
@@ -1658,15 +1661,15 @@ value::set_component_location (const struct value *whole)
/* If the WHOLE value has a dynamically resolved location property then /* If the WHOLE value has a dynamically resolved location property then
update the address of the COMPONENT. */ update the address of the COMPONENT. */
type = whole->type (); type = whole->type ();
if (NULL != type->dyn_prop (DYN_PROP_DATA_LOCATION) if (dynamic_prop *dyn_prop = type->dyn_prop (DYN_PROP_DATA_LOCATION);
&& type->dyn_prop (DYN_PROP_DATA_LOCATION)->is_constant ()) dyn_prop != nullptr && dyn_prop->is_constant ())
set_address (TYPE_DATA_LOCATION_ADDR (type)); set_address (dyn_prop->const_val ());
/* Similarly, if the COMPONENT value has a dynamically resolved location /* Similarly, if the COMPONENT value has a dynamically resolved location
property then update its address. */ property then update its address. */
type = this->type (); type = this->type ();
if (NULL != type->dyn_prop (DYN_PROP_DATA_LOCATION) if (dynamic_prop *dyn_prop = type->dyn_prop (DYN_PROP_DATA_LOCATION);
&& type->dyn_prop (DYN_PROP_DATA_LOCATION)->is_constant ()) dyn_prop != nullptr && dyn_prop->is_constant ())
{ {
/* If the COMPONENT has a dynamic location, and is an /* If the COMPONENT has a dynamic location, and is an
lval_internalvar_component, then we change it to a lval_memory. lval_internalvar_component, then we change it to a lval_memory.
@@ -1692,7 +1695,8 @@ value::set_component_location (const struct value *whole)
} }
else else
gdb_assert (this->lval () == lval_memory); gdb_assert (this->lval () == lval_memory);
set_address (TYPE_DATA_LOCATION_ADDR (type));
set_address (dyn_prop->const_val ());
} }
} }
@@ -3683,9 +3687,12 @@ value_from_contents_and_address (struct type *type,
v = value::allocate_lazy (resolved_type); v = value::allocate_lazy (resolved_type);
else else
v = value_from_contents (resolved_type, valaddr); v = value_from_contents (resolved_type, valaddr);
if (resolved_type_no_typedef->dyn_prop (DYN_PROP_DATA_LOCATION) != NULL
&& resolved_type_no_typedef->dyn_prop (DYN_PROP_DATA_LOCATION)->is_constant ()) if (dynamic_prop *dyn_prop
address = TYPE_DATA_LOCATION_ADDR (resolved_type_no_typedef); = resolved_type_no_typedef->dyn_prop (DYN_PROP_DATA_LOCATION);
dyn_prop != nullptr && dyn_prop->is_constant ())
address = dyn_prop->const_val ();
v->set_lval (lval_memory); v->set_lval (lval_memory);
v->set_address (address); v->set_address (address);
return v; return v;