Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 01:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

* value.h (address_of_variable): Add prototype.

Browse Source 
(locate_var_value): Remove prototype.

	* findvar.c (read_var_value): Do not attempt to default frame
	to selected frame.
	(locate_var_value): Remove function.
	* valops.c (value_of_variable): Retrieve selected frame for
	symbols that require a frame when called with NULL block.
	* valops.c (address_of_variable): New function.

	* eval.c (evaluate_subexp_for_address): Call address_of_variable
	instead of calling locate_var_value.
	(evaluate_subexp_with_coercion): Likewise.
This commit is contained in:
Ulrich Weigand
2009-01-15 15:38:07 +00:00
parent cc2420d5bb
commit 61212c0fb1
5 changed files with 81 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
gdb/valops.c
View File

@@ -988,11 +988,13 @@ struct value *
value_of_variable (struct symbol *var, struct block *b)
{
struct value *val;
struct frame_info *frame = NULL;
struct frame_info *frame;
if (!b)
frame = NULL; /* Use selected frame. */
else if (symbol_read_needs_frame (var))
if (!symbol_read_needs_frame (var))
frame = NULL;
else if (!b)
frame = get_selected_frame (_("No frame selected."));
else
{
frame = block_innermost_frame (b);
if (!frame)
@@ -1013,6 +1015,54 @@ value_of_variable (struct symbol *var, struct block *b)
return val;
}
struct value *
address_of_variable (struct symbol *var, struct block *b)
{
struct type *type = SYMBOL_TYPE (var);
struct value *val;
/* Evaluate it first; if the result is a memory address, we're fine.
Lazy evaluation pays off here. */
val = value_of_variable (var, b);
if ((VALUE_LVAL (val) == lval_memory && value_lazy (val))
|| TYPE_CODE (type) == TYPE_CODE_FUNC)
{
CORE_ADDR addr = VALUE_ADDRESS (val);
return value_from_pointer (lookup_pointer_type (type), addr);
}
/* Not a memory address; check what the problem was. */
switch (VALUE_LVAL (val))
{
case lval_register:
{
struct frame_info *frame;
const char *regname;
frame = frame_find_by_id (VALUE_FRAME_ID (val));
gdb_assert (frame);
regname = gdbarch_register_name (get_frame_arch (frame),
VALUE_REGNUM (val));
gdb_assert (regname && *regname);
error (_("Address requested for identifier "
"\"%s\" which is in register $%s"),
SYMBOL_PRINT_NAME (var), regname);
break;
}
default:
error (_("Can't take address of \"%s\" which isn't an lvalue."),
SYMBOL_PRINT_NAME (var));
break;
}
return val;
}
/* Return one if VAL does not live in target memory, but should in order
to operate on it. Otherwise return zero. */