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++;
}
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)
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 *
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;
}
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);
}