forked from Imagelibrary/binutils-gdb
2003-07-16 Andrew Cagney <cagney@redhat.com>
* frame-base.h (frame_base_p_ftype): Delete definition. (frame_base_append_predicate): Delete declaration. * frame-unwind.h (frame_unwind_p_ftype): Delete definition. (frame_unwind_append_predicate): Delete declaration. * frame-unwind.c (struct frame_unwind_table): Delete field "p". (append_predicate): Delete parameter "p". (frame_unwind_append_predicate): Delete function. (frame_unwind_append_sniffer): Update call to append_predicate. (frame_unwind_free): Delete function. (_initialize_frame_unwind): Pass NULL as "free" to register_gdbarch_data. (frame_unwind_init): Append the dummy_frame_sniffer. (frame_unwind_find_by_frame): Simplify. * frame-base.c (struct frame_base_table): Delete field "p". (append_predicate): Delete parameter "p". (frame_base_append_predicate): Delete function. (frame_base_append_sniffer): Update call to append_predicate. (frame_base_free): Delete function. (frame_base_find_by_frame): Simplify. (_initialize_frame_base): Pass NULL as "free" to register_gdbarch_data. * x86-64-tdep.c (x86_64_frame_sniffer): Replace "x86_64_frame_p". (x86_64_sigtramp_frame_sniffer): Replace "x86_64_sigtramp_frame_p". (x86_64_init_abi): Set the frame unwind sniffers. * m68k-tdep.c (m68k_frame_sniffer): Replace "m68k_frame_p". (m68k_sigtramp_frame_sniffer): Replace "m68k_sigtramp_frame_p" (m68k_gdbarch_init): Set the frame unwind sniffers. * i386-tdep.c (i386_sigtramp_frame_sniffer): Replace "i386_sigtramp_frame_p". (i386_frame_sniffer): Replace "i386_frame_p". (i386_gdbarch_init): Set the frame unwind sniffers. * avr-tdep.c (avr_frame_sniffer): Replace "avr_frame_sniffer". (avr_gdbarch_init): Set the frame unwind sniffers. * alpha-tdep.c (alpha_sigtramp_frame_sniffer): Replace "alpha_sigtramp_frame_p" (alpha_heuristic_frame_sniffer): Replace "alpha_heuristic_frame_p". (alpha_gdbarch_init): Set the frame unwind sniffers. (alpha_dwarf2_init_abi): Ditto. * alpha-mdebug-tdep.c (alpha_mdebug_frame_sniffer): Replace "alpha_debug_frame_p". (alpha_mdebug_frame_base_sniffer): Replace "alpha_mdebug_frame_base_p". (alpha_mdebug_init_abi): Set the frame unwind sniffers. * d10v-tdep.c (d10v_frame_sniffer): Replace "d10v_frame_p". (d10v_gdbarch_init): Set the frame unwind sniffer. * dwarf2-frame.c (dwarf2_frame_sniffer): Replace "dwarf2_frame_p". (dwarf2_frame_base_sniffer): Replace "dwarf2_frame_base_p". * dwarf2-frame.h (dwarf2_frame_sniffer): Replace "dwarf2_frame_p". (dwarf2_frame_base_sniffer): Replace "dwarf2_frame_base_p". * dummy-frame.c (dummy_frame_sniffer): Replace "dummy_frame_p". * dummy-frame.h (dummy_frame_sniffer): Replace "dummy_frame_p".
This commit is contained in:
@@ -29,21 +29,17 @@ static struct gdbarch_data *frame_unwind_data;
|
||||
|
||||
struct frame_unwind_table
|
||||
{
|
||||
frame_unwind_p_ftype **p;
|
||||
frame_unwind_sniffer_ftype **sniffer;
|
||||
int nr;
|
||||
};
|
||||
|
||||
/* Append a predicate to the end of the table. */
|
||||
static void
|
||||
append_predicate (struct frame_unwind_table *table, frame_unwind_p_ftype *p,
|
||||
append_predicate (struct frame_unwind_table *table,
|
||||
frame_unwind_sniffer_ftype *sniffer)
|
||||
{
|
||||
table->p = xrealloc (table->p, ((table->nr + 1)
|
||||
* sizeof (frame_unwind_p_ftype *)));
|
||||
table->sniffer = xrealloc (table->sniffer, ((table->nr + 1)
|
||||
* sizeof (frame_unwind_sniffer_ftype *)));
|
||||
table->p[table->nr] = p;
|
||||
table->sniffer[table->nr] = sniffer;
|
||||
table->nr++;
|
||||
}
|
||||
@@ -52,36 +48,10 @@ static void *
|
||||
frame_unwind_init (struct gdbarch *gdbarch)
|
||||
{
|
||||
struct frame_unwind_table *table = XCALLOC (1, struct frame_unwind_table);
|
||||
append_predicate (table, dummy_frame_p, NULL);
|
||||
append_predicate (table, dummy_frame_sniffer);
|
||||
return table;
|
||||
}
|
||||
|
||||
static void
|
||||
frame_unwind_free (struct gdbarch *gdbarch, void *data)
|
||||
{
|
||||
struct frame_unwind_table *table =
|
||||
gdbarch_data (gdbarch, frame_unwind_data);
|
||||
xfree (table->p);
|
||||
xfree (table->sniffer);
|
||||
xfree (table);
|
||||
}
|
||||
|
||||
void
|
||||
frame_unwind_append_predicate (struct gdbarch *gdbarch,
|
||||
frame_unwind_p_ftype *p)
|
||||
{
|
||||
struct frame_unwind_table *table =
|
||||
gdbarch_data (gdbarch, frame_unwind_data);
|
||||
if (table == NULL)
|
||||
{
|
||||
/* ULGH, called during architecture initialization. Patch
|
||||
things up. */
|
||||
table = frame_unwind_init (gdbarch);
|
||||
set_gdbarch_data (gdbarch, frame_unwind_data, table);
|
||||
}
|
||||
append_predicate (table, p, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
frame_unwind_append_sniffer (struct gdbarch *gdbarch,
|
||||
frame_unwind_sniffer_ftype *sniffer)
|
||||
@@ -95,7 +65,7 @@ frame_unwind_append_sniffer (struct gdbarch *gdbarch,
|
||||
table = frame_unwind_init (gdbarch);
|
||||
set_gdbarch_data (gdbarch, frame_unwind_data, table);
|
||||
}
|
||||
append_predicate (table, NULL, sniffer);
|
||||
append_predicate (table, sniffer);
|
||||
}
|
||||
|
||||
const struct frame_unwind *
|
||||
@@ -113,12 +83,7 @@ frame_unwind_find_by_frame (struct frame_info *next_frame)
|
||||
for (i = 0; i < table->nr; i++)
|
||||
{
|
||||
const struct frame_unwind *desc;
|
||||
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);
|
||||
else
|
||||
internal_error (__FILE__, __LINE__, "Missing sniffer?");
|
||||
desc = table->sniffer[i] (next_frame);
|
||||
if (desc != NULL)
|
||||
return desc;
|
||||
}
|
||||
@@ -130,6 +95,5 @@ extern initialize_file_ftype _initialize_frame_unwind; /* -Wmissing-prototypes *
|
||||
void
|
||||
_initialize_frame_unwind (void)
|
||||
{
|
||||
frame_unwind_data = register_gdbarch_data (frame_unwind_init,
|
||||
frame_unwind_free);
|
||||
frame_unwind_data = register_gdbarch_data (frame_unwind_init, NULL);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user