* findvar.c (address_from_register): New function.

* value.h (address_from_register): Add prototype.
	* dwarf2loc.c (dwarf_expr_read_reg): Use address_from_register.
This commit is contained in:
Ulrich Weigand 2006-11-22 13:44:45 +00:00
parent 765dc01564
commit 0b2b0195d1
4 changed files with 33 additions and 11 deletions

View File

@ -1,3 +1,9 @@
2006-11-22 Ulrich Weigand <uweigand@de.ibm.com>
* findvar.c (address_from_register): New function.
* value.h (address_from_register): Add prototype.
* dwarf2loc.c (dwarf_expr_read_reg): Use address_from_register.
2006-11-22 Vladimir Prus <vladimir@codesourcery.com>
* breakpoint.c: Include "memattr.h".

View File

@ -115,24 +115,17 @@ struct dwarf_expr_baton
/* Helper functions for dwarf2_evaluate_loc_desc. */
/* Using the frame specified in BATON, return the value of register
REGNUM, treated as an unsigned integer. */
REGNUM, treated as a pointer. */
static CORE_ADDR
dwarf_expr_read_reg (void *baton, int dwarf_regnum)
{
struct dwarf_expr_baton *debaton = (struct dwarf_expr_baton *) baton;
CORE_ADDR result;
gdb_byte *buf;
int regnum, regsize;
int regnum;
regnum = DWARF2_REG_TO_REGNUM (dwarf_regnum);
regsize = register_size (current_gdbarch, regnum);
buf = alloca (regsize);
frame_register_read (debaton->frame, regnum, buf);
/* NOTE: cagney/2003-05-22: This extract is assuming that a DWARF 2
address is always unsigned. That may or may not be true. */
result = extract_unsigned_integer (buf, regsize);
result = address_from_register (builtin_type_void_data_ptr,
regnum, debaton->frame);
return result;
}

View File

@ -728,6 +728,26 @@ value_from_register (struct type *type, int regnum, struct frame_info *frame)
return v;
}
/* Return contents of register REGNUM in frame FRAME as address,
interpreted as value of type TYPE. Will abort if register
value is not available. */
CORE_ADDR
address_from_register (struct type *type, int regnum, struct frame_info *frame)
{
struct value *value;
CORE_ADDR result;
value = value_from_register (type, regnum, frame);
gdb_assert (value);
result = value_as_address (value);
release_value (value);
value_free (value);
return result;
}
/* Given a struct symbol for a variable or function,
and a stack frame id,

View File

@ -282,6 +282,9 @@ extern struct value *value_at_lazy (struct type *type, CORE_ADDR addr);
extern struct value *value_from_register (struct type *type, int regnum,
struct frame_info *frame);
extern CORE_ADDR address_from_register (struct type *type, int regnum,
struct frame_info *frame);
extern struct value *value_of_variable (struct symbol *var, struct block *b);
extern struct value *value_of_register (int regnum, struct frame_info *frame);