From e8a89fe2788ee8bbcc84d7fb13d28f8b924318c4 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 15 Jul 2003 17:35:00 +0000 Subject: 2003-07-15 Andrew Cagney * frame.c (get_frame_id): Use frame_unwind_find_by_frame. (frame_register_unwind, create_new_frame): Ditto. (legacy_get_prev_frame, get_frame_type): Ditto. (get_frame_base_address): Use frame_base_find_by_frame. (get_frame_locals_address): Use frame_base_find_by_frame. (get_frame_args_address): Use frame_base_find_by_frame. * frame-base.h (frame_base_sniffer_ftype): Declare. (frame_base_append_sniffer): Declare. (frame_base_find_by_frame): Replace frame_base_find_by_pc. * frame-base.c (append_predicate): Add a "sniffer" parameter. (frame_base_append_sniffer): New function. (frame_base_append_predicate): Add a NULL sniffer. (frame_base_find_by_frame): Replace "frame_base_find_by_pc". (struct frame_base_table): Add "sniffer". (frame_base_free): Free the "sniffer" table. * frame-unwind.h (frame_unwind_sniffer_ftype): Define. (frame_unwind_append_sniffer): Declare. (frame_unwind_find_by_frame): Replace frame_unwind_find_by_pc. * frame-unwind.c (frame_unwind_free): Free the "sniffer" table. (struct frame_unwind_table): Add "sniffer", delete "middle". (append_predicate): Add "sniffer" parameter, append the sniffer. (frame_unwind_init): Update append_predicate call. (frame_unwind_append_sniffer): New function. (frame_unwind_append_predicate): Update append_predicate call. (frame_unwind_find_by_frame): Replace frame_unwind_find_by_pc. --- gdb/frame-base.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'gdb/frame-base.c') diff --git a/gdb/frame-base.c b/gdb/frame-base.c index 0865a0c..86d955b 100644 --- a/gdb/frame-base.c +++ b/gdb/frame-base.c @@ -71,6 +71,7 @@ static struct gdbarch_data *frame_base_data; struct frame_base_table { frame_base_p_ftype **p; + frame_base_sniffer_ftype **sniffer; const struct frame_base *default_base; int nr; }; @@ -89,6 +90,7 @@ frame_base_free (struct gdbarch *gdbarch, void *data) struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data); xfree (table->p); + xfree (table->sniffer); xfree (table); } @@ -108,11 +110,16 @@ frame_base_table (struct gdbarch *gdbarch) /* Append a predicate to the end of the table. */ static void -append_predicate (struct frame_base_table *table, frame_base_p_ftype *p) +append_predicate (struct frame_base_table *table, frame_base_p_ftype *p, + frame_base_sniffer_ftype *sniffer) { table->p = xrealloc (table->p, ((table->nr + 1) * sizeof (frame_base_p_ftype *))); + table->sniffer = xrealloc (table->sniffer, + ((table->nr + 1) + * sizeof (frame_base_sniffer_ftype *))); table->p[table->nr] = p; + table->sniffer[table->nr] = sniffer; table->nr++; } @@ -121,7 +128,15 @@ frame_base_append_predicate (struct gdbarch *gdbarch, frame_base_p_ftype *p) { struct frame_base_table *table = frame_base_table (gdbarch); - append_predicate (table, p); + append_predicate (table, p, NULL); +} + +void +frame_base_append_sniffer (struct gdbarch *gdbarch, + frame_base_sniffer_ftype *sniffer) +{ + struct frame_base_table *table = frame_base_table (gdbarch); + append_predicate (table, NULL, sniffer); } void @@ -133,13 +148,18 @@ frame_base_set_default (struct gdbarch *gdbarch, } const struct frame_base * -frame_base_find_by_pc (struct gdbarch *gdbarch, CORE_ADDR pc) +frame_base_find_by_frame (struct frame_info *next_frame) { - int i; + struct gdbarch *gdbarch = get_frame_arch (next_frame); struct frame_base_table *table = frame_base_table (gdbarch); + int i; for (i = 0; i < table->nr; i++) { - const struct frame_base *desc = table->p[i] (pc); + const struct frame_base *desc = NULL; + if (table->p[i] != NULL) + desc = table->p[i] (frame_pc_unwind (next_frame)); + else if (table->sniffer[i] != NULL) + desc = table->sniffer[i] (next_frame); if (desc != NULL) return desc; } -- cgit v1.1