Convert frame unwinders to use the current frame and
"struct value". * frame.c (frame_debug): Make global. (get_frame_id): Pass this frame to unwinder routines. (frame_pc_unwind): Remove unused unwind->prev_pc support. (do_frame_register_read): Do not discard the return value of frame_register_read. (frame_register_unwind): Remove debug messages. Use frame_unwind_register_value. (frame_unwind_register_value, get_frame_register_value): New functions. (create_new_frame, get_frame_base_address, get_frame_locals_address) (get_frame_args_address, get_frame_type): Pass this frame to unwinder routines. (frame_cleanup_after_sniffer, frame_prepare_for_sniffer): New functions. * frame.h: Update comments. (frame_debug, frame_unwind_register_value, get_frame_register_value) (frame_prepare_for_sniffer): Declare. * frame-unwind.h: Update comments and parameter names. (default_frame_sniffer): Declare. (frame_prev_register_ftype): Return a struct value *. (struct frame_unwind): Remove prev_pc member. (frame_unwind_sniffer_ftype, frame_unwind_append_sniffer): Delete. (frame_unwind_append_unwinder, frame_unwind_got_optimized) (frame_unwind_got_register, frame_unwind_got_memory) (frame_unwind_got_constant, frame_unwind_got_address): Declare. * frame-base.h: Update comments and parameter names. * valops.c (value_fetch_lazy): Use get_frame_register_value. Iterate if necessary. Add debugging output. * sentinel-frame.c (sentinel_frame_prev_register) (sentinel_frame_this_id): Update for new signature. (sentinel_frame_prev_pc): Delete. (sentinel_frame_unwinder): Remove prev_pc. * ia64-tdep.c (ia64_libunwind_frame_unwind): Do not initialize prev_pc. * libunwind-frame.c (libunwind_frame_unwind): Likewise. * frame-unwind.c (struct frame_unwind_table_entry): Remove sniffer. (frame_unwind_append_sniffer): Delete. (frame_unwind_append_unwinder): New function. (frame_unwind_find_by_frame): Take this frame. Only use sniffers from unwinders. Use frame_prepare_for_sniffer. (default_frame_sniffer, frame_unwind_got_optimized) (frame_unwind_got_register, frame_unwind_got_memory) (frame_unwind_got_constant, frame_unwind_got_address): New functions. * dummy-frame.c (dummy_frame_sniffer): Use gdbarch_dummy_id. (dummy_frame_prev_register, dummy_frame_this_id): Update for new signature. * gdbarch.sh: Replace unwind_dummy_id with dummy_id. * gdbarch.c, gdbarch.c: Regenerated. * frame-base.c (default_frame_base_address) (default_frame_locals_address, default_frame_args_address): Update for new signature. (frame_base_find_by_frame): Pass this frame to unwinder routines. * infcall.c (call_function_by_hand): Update comments. * Makefile.in (frame-unwind.o): Update dependencies. * gdbint.texinfo (Stack Frames): New chapter. (Algorithms): Move Frames text to the new chapter. (Target Conditionals): Delete SAVE_DUMMY_FRAME_TOS. Document gdbarch_dummy_id instead of gdbarch_unwind_dummy_id.
This commit is contained in:
parent
9214ee5f5f
commit
669fac235d
19 changed files with 687 additions and 321 deletions
|
@ -20,15 +20,17 @@
|
|||
#include "defs.h"
|
||||
#include "frame.h"
|
||||
#include "frame-unwind.h"
|
||||
#include "gdb_assert.h"
|
||||
#include "dummy-frame.h"
|
||||
#include "value.h"
|
||||
#include "regcache.h"
|
||||
|
||||
#include "gdb_assert.h"
|
||||
#include "gdb_obstack.h"
|
||||
|
||||
static struct gdbarch_data *frame_unwind_data;
|
||||
|
||||
struct frame_unwind_table_entry
|
||||
{
|
||||
frame_unwind_sniffer_ftype *sniffer;
|
||||
const struct frame_unwind *unwinder;
|
||||
struct frame_unwind_table_entry *next;
|
||||
};
|
||||
|
@ -54,19 +56,6 @@ frame_unwind_init (struct obstack *obstack)
|
|||
return table;
|
||||
}
|
||||
|
||||
void
|
||||
frame_unwind_append_sniffer (struct gdbarch *gdbarch,
|
||||
frame_unwind_sniffer_ftype *sniffer)
|
||||
{
|
||||
struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data);
|
||||
struct frame_unwind_table_entry **ip;
|
||||
|
||||
/* Find the end of the list and insert the new entry there. */
|
||||
for (ip = table->osabi_head; (*ip) != NULL; ip = &(*ip)->next);
|
||||
(*ip) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind_table_entry);
|
||||
(*ip)->sniffer = sniffer;
|
||||
}
|
||||
|
||||
void
|
||||
frame_unwind_prepend_unwinder (struct gdbarch *gdbarch,
|
||||
const struct frame_unwind *unwinder)
|
||||
|
@ -81,32 +70,123 @@ frame_unwind_prepend_unwinder (struct gdbarch *gdbarch,
|
|||
(*table->osabi_head) = entry;
|
||||
}
|
||||
|
||||
void
|
||||
frame_unwind_append_unwinder (struct gdbarch *gdbarch,
|
||||
const struct frame_unwind *unwinder)
|
||||
{
|
||||
struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data);
|
||||
struct frame_unwind_table_entry **ip;
|
||||
|
||||
/* Find the end of the list and insert the new entry there. */
|
||||
for (ip = table->osabi_head; (*ip) != NULL; ip = &(*ip)->next);
|
||||
(*ip) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind_table_entry);
|
||||
(*ip)->unwinder = unwinder;
|
||||
}
|
||||
|
||||
const struct frame_unwind *
|
||||
frame_unwind_find_by_frame (struct frame_info *next_frame, void **this_cache)
|
||||
frame_unwind_find_by_frame (struct frame_info *this_frame, void **this_cache)
|
||||
{
|
||||
int i;
|
||||
struct gdbarch *gdbarch = get_frame_arch (next_frame);
|
||||
struct gdbarch *gdbarch = get_frame_arch (this_frame);
|
||||
struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data);
|
||||
struct frame_unwind_table_entry *entry;
|
||||
struct cleanup *old_cleanup;
|
||||
for (entry = table->list; entry != NULL; entry = entry->next)
|
||||
{
|
||||
if (entry->sniffer != NULL)
|
||||
struct cleanup *old_cleanup;
|
||||
|
||||
old_cleanup = frame_prepare_for_sniffer (this_frame, entry->unwinder);
|
||||
if (entry->unwinder->sniffer (entry->unwinder, this_frame,
|
||||
this_cache))
|
||||
{
|
||||
const struct frame_unwind *desc = NULL;
|
||||
desc = entry->sniffer (next_frame);
|
||||
if (desc != NULL)
|
||||
return desc;
|
||||
}
|
||||
if (entry->unwinder != NULL)
|
||||
{
|
||||
if (entry->unwinder->sniffer (entry->unwinder, next_frame,
|
||||
this_cache))
|
||||
return entry->unwinder;
|
||||
discard_cleanups (old_cleanup);
|
||||
return entry->unwinder;
|
||||
}
|
||||
do_cleanups (old_cleanup);
|
||||
}
|
||||
internal_error (__FILE__, __LINE__, _("frame_unwind_find_by_frame failed"));
|
||||
}
|
||||
|
||||
/* A default frame sniffer which always accepts the frame. Used by
|
||||
fallback prologue unwinders. */
|
||||
|
||||
int
|
||||
default_frame_sniffer (const struct frame_unwind *self,
|
||||
struct frame_info *this_frame,
|
||||
void **this_prologue_cache)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Helper functions for value-based register unwinding. These return
|
||||
a (possibly lazy) value of the appropriate type. */
|
||||
|
||||
/* Return a value which indicates that FRAME did not save REGNUM. */
|
||||
|
||||
struct value *
|
||||
frame_unwind_got_optimized (struct frame_info *frame, int regnum)
|
||||
{
|
||||
struct gdbarch *gdbarch = get_frame_arch (frame);
|
||||
struct value *reg_val;
|
||||
|
||||
reg_val = value_zero (register_type (gdbarch, regnum), not_lval);
|
||||
set_value_optimized_out (reg_val, 1);
|
||||
return reg_val;
|
||||
}
|
||||
|
||||
/* Return a value which indicates that FRAME copied REGNUM into
|
||||
register NEW_REGNUM. */
|
||||
|
||||
struct value *
|
||||
frame_unwind_got_register (struct frame_info *frame, int regnum, int new_regnum)
|
||||
{
|
||||
return value_of_register_lazy (frame, new_regnum);
|
||||
}
|
||||
|
||||
/* Return a value which indicates that FRAME saved REGNUM in memory at
|
||||
ADDR. */
|
||||
|
||||
struct value *
|
||||
frame_unwind_got_memory (struct frame_info *frame, int regnum, CORE_ADDR addr)
|
||||
{
|
||||
struct gdbarch *gdbarch = get_frame_arch (frame);
|
||||
|
||||
return value_at_lazy (register_type (gdbarch, regnum), addr);
|
||||
}
|
||||
|
||||
/* Return a value which indicates that FRAME's saved version of
|
||||
REGNUM has a known constant (computed) value of VAL. */
|
||||
|
||||
struct value *
|
||||
frame_unwind_got_constant (struct frame_info *frame, int regnum,
|
||||
ULONGEST val)
|
||||
{
|
||||
struct gdbarch *gdbarch = get_frame_arch (frame);
|
||||
struct value *reg_val;
|
||||
|
||||
reg_val = value_zero (register_type (gdbarch, regnum), not_lval);
|
||||
store_unsigned_integer (value_contents_writeable (reg_val),
|
||||
register_size (gdbarch, regnum), val);
|
||||
return reg_val;
|
||||
}
|
||||
|
||||
/* Return a value which indicates that FRAME's saved version of REGNUM
|
||||
has a known constant (computed) value of ADDR. Convert the
|
||||
CORE_ADDR to a target address if necessary. */
|
||||
|
||||
struct value *
|
||||
frame_unwind_got_address (struct frame_info *frame, int regnum,
|
||||
CORE_ADDR addr)
|
||||
{
|
||||
struct gdbarch *gdbarch = get_frame_arch (frame);
|
||||
struct value *reg_val;
|
||||
|
||||
reg_val = value_zero (register_type (gdbarch, regnum), not_lval);
|
||||
pack_long (value_contents_writeable (reg_val),
|
||||
register_type (gdbarch, regnum), addr);
|
||||
return reg_val;
|
||||
}
|
||||
|
||||
extern initialize_file_ftype _initialize_frame_unwind; /* -Wmissing-prototypes */
|
||||
|
||||
void
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue