diff options
| author | Yao Qi <yao.qi@linaro.org> | 2016-11-28 17:09:26 +0000 |
|---|---|---|
| committer | Yao Qi <yao.qi@linaro.org> | 2016-11-28 17:09:26 +0000 |
| commit | 1a0884415891b197972f8acf59131c3c9376807f (patch) | |
| tree | a21ab7f391d1ac92611c0142f2fc35dd01a281a3 /gdb/value.c | |
| parent | 7dc54575d91a2b41f6c3e838eec44a7017a24436 (diff) | |
| download | gdb-1a0884415891b197972f8acf59131c3c9376807f.zip gdb-1a0884415891b197972f8acf59131c3c9376807f.tar.gz gdb-1a0884415891b197972f8acf59131c3c9376807f.tar.bz2 | |
Restrict checking value.lval on using address
With the previous change, value.location.address is only valid for
lval_memory. This patch restrict some checking on value.lval on
using address. Since we have a check on VALUE_VAL in
set_value_address, we need to set VALUE_VAL properly before
set_value_address too.
gdb:
2016-11-25 Yao Qi <yao.qi@linaro.org>
* ada-lang.c (ensure_lval): Call set_value_address after setting
VALUE_LVAL.
* elfread.c (elf_gnu_ifunc_resolve_addr): Set VALUE_LVAL to
lval_memory.
(elf_gnu_ifunc_resolver_return_stop): Likewise.
* value.c (value_fn_field): Likewise.
(value_from_contents_and_address_unresolved): Likewise.
(value_from_contents_and_address): Likewise.
(value_address): Check value->lval isn't
lval_memory.
(value_raw_address): Likewise.
(set_value_address): Assert value->lval is lval_memory.
Diffstat (limited to 'gdb/value.c')
| -rw-r--r-- | gdb/value.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/gdb/value.c b/gdb/value.c index 13a0bb9..cc291cf 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1539,9 +1539,7 @@ value_lval_const (const struct value *value) CORE_ADDR value_address (const struct value *value) { - if (value->lval == lval_internalvar - || value->lval == lval_internalvar_component - || value->lval == lval_xcallable) + if (value->lval != lval_memory) return 0; if (value->parent != NULL) return value_address (value->parent) + value->offset; @@ -1557,9 +1555,7 @@ value_address (const struct value *value) CORE_ADDR value_raw_address (const struct value *value) { - if (value->lval == lval_internalvar - || value->lval == lval_internalvar_component - || value->lval == lval_xcallable) + if (value->lval != lval_memory) return 0; return value->location.address; } @@ -1567,9 +1563,7 @@ value_raw_address (const struct value *value) void set_value_address (struct value *value, CORE_ADDR addr) { - gdb_assert (value->lval != lval_internalvar - && value->lval != lval_internalvar_component - && value->lval != lval_xcallable); + gdb_assert (value->lval == lval_memory); value->location.address = addr; } @@ -3268,6 +3262,7 @@ value_fn_field (struct value **arg1p, struct fn_field *f, } v = allocate_value (ftype); + VALUE_LVAL (v) = lval_memory; if (sym) { set_value_address (v, BLOCK_START (SYMBOL_BLOCK_VALUE (sym))); @@ -3654,8 +3649,8 @@ value_from_contents_and_address_unresolved (struct type *type, v = allocate_value_lazy (type); else v = value_from_contents (type, valaddr); - set_value_address (v, address); VALUE_LVAL (v) = lval_memory; + set_value_address (v, address); return v; } @@ -3680,8 +3675,8 @@ value_from_contents_and_address (struct type *type, if (TYPE_DATA_LOCATION (resolved_type_no_typedef) != NULL && TYPE_DATA_LOCATION_KIND (resolved_type_no_typedef) == PROP_CONST) address = TYPE_DATA_LOCATION_ADDR (resolved_type_no_typedef); - set_value_address (v, address); VALUE_LVAL (v) = lval_memory; + set_value_address (v, address); return v; } |