mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-17 07:53:51 +08:00
Turn set_value_component_location into method
This turns set_value_component_location into a method of value. Approved-By: Simon Marchi <simon.marchi@efficios.com>
This commit is contained in:
@ -567,7 +567,7 @@ coerce_unspec_val_to_type (struct value *val, struct type *type)
|
|||||||
result = value::allocate (type);
|
result = value::allocate (type);
|
||||||
value_contents_copy (result, 0, val, 0, type->length ());
|
value_contents_copy (result, 0, val, 0, type->length ());
|
||||||
}
|
}
|
||||||
set_value_component_location (result, val);
|
result->set_component_location (val);
|
||||||
result->set_bitsize (val->bitsize ());
|
result->set_bitsize (val->bitsize ());
|
||||||
result->set_bitpos (val->bitpos ());
|
result->set_bitpos (val->bitpos ());
|
||||||
if (VALUE_LVAL (result) == lval_memory)
|
if (VALUE_LVAL (result) == lval_memory)
|
||||||
@ -2830,7 +2830,7 @@ ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
|
|||||||
{
|
{
|
||||||
long new_offset = offset;
|
long new_offset = offset;
|
||||||
|
|
||||||
set_value_component_location (v, obj);
|
v->set_component_location (obj);
|
||||||
v->set_bitpos (bit_offset + obj->bitpos ());
|
v->set_bitpos (bit_offset + obj->bitpos ());
|
||||||
v->set_bitsize (bit_size);
|
v->set_bitsize (bit_size);
|
||||||
if (v->bitpos () >= HOST_CHAR_BIT)
|
if (v->bitpos () >= HOST_CHAR_BIT)
|
||||||
|
@ -94,7 +94,7 @@ value_ptradd (struct value *arg1, LONGEST arg2)
|
|||||||
result = value_from_pointer (valptrtype,
|
result = value_from_pointer (valptrtype,
|
||||||
value_as_address (arg1) + sz * arg2);
|
value_as_address (arg1) + sz * arg2);
|
||||||
if (VALUE_LVAL (result) != lval_internalvar)
|
if (VALUE_LVAL (result) != lval_internalvar)
|
||||||
set_value_component_location (result, arg1);
|
result->set_component_location (arg1);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4087,7 +4087,7 @@ value_slice (struct value *array, int lowbound, int length)
|
|||||||
type_length_units (slice_type));
|
type_length_units (slice_type));
|
||||||
}
|
}
|
||||||
|
|
||||||
set_value_component_location (slice, array);
|
slice->set_component_location (array);
|
||||||
slice->set_offset (array->offset () + offset);
|
slice->set_offset (array->offset () + offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
29
gdb/value.c
29
gdb/value.c
@ -1599,25 +1599,24 @@ value::force_lval (CORE_ADDR addr)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
set_value_component_location (struct value *component,
|
value::set_component_location (const struct value *whole)
|
||||||
const struct value *whole)
|
|
||||||
{
|
{
|
||||||
struct type *type;
|
struct type *type;
|
||||||
|
|
||||||
gdb_assert (whole->m_lval != lval_xcallable);
|
gdb_assert (whole->m_lval != lval_xcallable);
|
||||||
|
|
||||||
if (whole->m_lval == lval_internalvar)
|
if (whole->m_lval == lval_internalvar)
|
||||||
VALUE_LVAL (component) = lval_internalvar_component;
|
VALUE_LVAL (this) = lval_internalvar_component;
|
||||||
else
|
else
|
||||||
VALUE_LVAL (component) = whole->m_lval;
|
VALUE_LVAL (this) = whole->m_lval;
|
||||||
|
|
||||||
component->m_location = whole->m_location;
|
m_location = whole->m_location;
|
||||||
if (whole->m_lval == lval_computed)
|
if (whole->m_lval == lval_computed)
|
||||||
{
|
{
|
||||||
const struct lval_funcs *funcs = whole->m_location.computed.funcs;
|
const struct lval_funcs *funcs = whole->m_location.computed.funcs;
|
||||||
|
|
||||||
if (funcs->copy_closure)
|
if (funcs->copy_closure)
|
||||||
component->m_location.computed.closure = funcs->copy_closure (whole);
|
m_location.computed.closure = funcs->copy_closure (whole);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If the WHOLE value has a dynamically resolved location property then
|
/* If the WHOLE value has a dynamically resolved location property then
|
||||||
@ -1625,11 +1624,11 @@ set_value_component_location (struct value *component,
|
|||||||
type = whole->type ();
|
type = whole->type ();
|
||||||
if (NULL != TYPE_DATA_LOCATION (type)
|
if (NULL != TYPE_DATA_LOCATION (type)
|
||||||
&& TYPE_DATA_LOCATION_KIND (type) == PROP_CONST)
|
&& TYPE_DATA_LOCATION_KIND (type) == PROP_CONST)
|
||||||
component->set_address (TYPE_DATA_LOCATION_ADDR (type));
|
set_address (TYPE_DATA_LOCATION_ADDR (type));
|
||||||
|
|
||||||
/* 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 = component->type ();
|
type = this->type ();
|
||||||
if (NULL != TYPE_DATA_LOCATION (type)
|
if (NULL != TYPE_DATA_LOCATION (type)
|
||||||
&& TYPE_DATA_LOCATION_KIND (type) == PROP_CONST)
|
&& TYPE_DATA_LOCATION_KIND (type) == PROP_CONST)
|
||||||
{
|
{
|
||||||
@ -1650,14 +1649,14 @@ set_value_component_location (struct value *component,
|
|||||||
carry around both the parent value contents, and the contents of
|
carry around both the parent value contents, and the contents of
|
||||||
any dynamic fields within the parent. This is a substantial
|
any dynamic fields within the parent. This is a substantial
|
||||||
change to how values work in GDB. */
|
change to how values work in GDB. */
|
||||||
if (VALUE_LVAL (component) == lval_internalvar_component)
|
if (VALUE_LVAL (this) == lval_internalvar_component)
|
||||||
{
|
{
|
||||||
gdb_assert (component->lazy ());
|
gdb_assert (lazy ());
|
||||||
VALUE_LVAL (component) = lval_memory;
|
VALUE_LVAL (this) = lval_memory;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
gdb_assert (VALUE_LVAL (component) == lval_memory);
|
gdb_assert (VALUE_LVAL (this) == lval_memory);
|
||||||
component->set_address (TYPE_DATA_LOCATION_ADDR (type));
|
set_address (TYPE_DATA_LOCATION_ADDR (type));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2986,7 +2985,7 @@ value_primitive_field (struct value *arg1, LONGEST offset,
|
|||||||
v->m_offset = (arg1->offset () + offset
|
v->m_offset = (arg1->offset () + offset
|
||||||
+ arg1->embedded_offset ());
|
+ arg1->embedded_offset ());
|
||||||
}
|
}
|
||||||
set_value_component_location (v, arg1);
|
v->set_component_location (arg1);
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3584,7 +3583,7 @@ value_from_component (struct value *whole, struct type *type, LONGEST offset)
|
|||||||
type_length_units (type));
|
type_length_units (type));
|
||||||
}
|
}
|
||||||
v->m_offset = whole->offset () + offset + whole->embedded_offset ();
|
v->m_offset = whole->offset () + offset + whole->embedded_offset ();
|
||||||
set_value_component_location (v, whole);
|
v->set_component_location (whole);
|
||||||
|
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
@ -539,6 +539,10 @@ public:
|
|||||||
LVAL_MEMORY. */
|
LVAL_MEMORY. */
|
||||||
void force_lval (CORE_ADDR);
|
void force_lval (CORE_ADDR);
|
||||||
|
|
||||||
|
/* Set this values's location as appropriate for a component of
|
||||||
|
WHOLE --- regardless of what kind of lvalue WHOLE is. */
|
||||||
|
void set_component_location (const struct value *whole);
|
||||||
|
|
||||||
|
|
||||||
/* Type of value; either not an lval, or one of the various
|
/* Type of value; either not an lval, or one of the various
|
||||||
different possible kinds of lval. */
|
different possible kinds of lval. */
|
||||||
@ -858,11 +862,6 @@ struct lval_funcs
|
|||||||
|
|
||||||
extern void error_value_optimized_out (void);
|
extern void error_value_optimized_out (void);
|
||||||
|
|
||||||
/* Set COMPONENT's location as appropriate for a component of WHOLE
|
|
||||||
--- regardless of what kind of lvalue WHOLE is. */
|
|
||||||
extern void set_value_component_location (struct value *component,
|
|
||||||
const struct value *whole);
|
|
||||||
|
|
||||||
/* While the following fields are per- VALUE .CONTENT .PIECE (i.e., a
|
/* While the following fields are per- VALUE .CONTENT .PIECE (i.e., a
|
||||||
single value might have multiple LVALs), this hacked interface is
|
single value might have multiple LVALs), this hacked interface is
|
||||||
limited to just the first PIECE. Expect further change. */
|
limited to just the first PIECE. Expect further change. */
|
||||||
|
Reference in New Issue
Block a user