1 files changed, 41 insertions, 28 deletions

diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index 82eaf7c0aec..ee490c27124 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -24,48 +24,59 @@
 #include "frame-unwind.h"
 #include "gdb_assert.h"
 #include "dummy-frame.h"
+#include "gdb_obstack.h"
 
 static struct gdbarch_data *frame_unwind_data;
 
-struct frame_unwind_table
+struct frame_unwind_table_entry
 {
-  frame_unwind_sniffer_ftype **sniffer;
-  int nr;
+  const struct frame_unwind_sniffer *sniffer;
+  struct frame_unwind_table_entry *next;
 };
 
-/* Append a predicate to the end of the table.  */
-static void
-append_predicate (struct frame_unwind_table *table,
-		  frame_unwind_sniffer_ftype *sniffer)
+struct frame_unwind_table
 {
-  table->sniffer = xrealloc (table->sniffer, ((table->nr + 1)
-					      * sizeof (frame_unwind_sniffer_ftype *)));
-  table->sniffer[table->nr] = sniffer;
-  table->nr++;
-}
+  struct frame_unwind_table_entry *first;
+};
 
 static void *
-frame_unwind_init (struct gdbarch *gdbarch)
+frame_unwind_init (struct obstack *obstack)
 {
-  struct frame_unwind_table *table = XCALLOC (1, struct frame_unwind_table);
-  append_predicate (table, dummy_frame_sniffer);
+  struct frame_unwind_table *table;
+  struct frame_unwind_sniffer *dummy_sniffer;
+
+  dummy_sniffer = OBSTACK_ZALLOC (obstack, struct frame_unwind_sniffer);
+  dummy_sniffer->sniffer = dummy_frame_sniffer;
+
+  table = OBSTACK_ZALLOC (obstack, struct frame_unwind_table);
+  table->first = OBSTACK_ZALLOC (obstack, struct frame_unwind_table_entry);
+  table->first->sniffer = dummy_sniffer;
+
   return table;
 }
 
+/* Append a predicate to the end of the table.  */
+
+void
+frame_unwind_sniffer_append (struct gdbarch *gdbarch,
+			     const struct frame_unwind_sniffer *sniffer)
+{
+  struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data);
+  struct frame_unwind_table_entry **entry;
+  for (entry = &table->first; (*entry) != NULL; entry = &(*entry)->next);
+  (*entry) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind_table_entry);
+  (*entry)->sniffer = sniffer;
+}
+
 void
 frame_unwind_append_sniffer (struct gdbarch *gdbarch,
 			     frame_unwind_sniffer_ftype *sniffer)
 {
-  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, sniffer);
+  struct frame_unwind_sniffer *unwind_sniffer;
+
+  unwind_sniffer = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_unwind_sniffer);
+  unwind_sniffer->sniffer = sniffer;
+  frame_unwind_sniffer_append (gdbarch, unwind_sniffer);
 }
 
 const struct frame_unwind *
@@ -74,16 +85,18 @@ frame_unwind_find_by_frame (struct frame_info *next_frame)
   int i;
   struct gdbarch *gdbarch = get_frame_arch (next_frame);
   struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data);
+  struct frame_unwind_table_entry *entry;
   if (!DEPRECATED_USE_GENERIC_DUMMY_FRAMES && legacy_frame_p (gdbarch))
     /* Seriously old code.  Don't even try to use this new mechanism.
        (Note: The variable USE_GENERIC_DUMMY_FRAMES is deprecated, not
        the dummy frame mechanism.  All architectures should be using
        generic dummy frames).  */
     return legacy_saved_regs_unwind;
-  for (i = 0; i < table->nr; i++)
+  for (entry = table->first; entry != NULL; entry = entry->next)
     {
       const struct frame_unwind *desc;
-      desc = table->sniffer[i] (next_frame);
+      gdb_assert (entry->sniffer->sniffer != NULL);
+      desc = entry->sniffer->sniffer (entry->sniffer, next_frame);
       if (desc != NULL)
 	return desc;
     }
@@ -95,5 +108,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_data = register_gdbarch_data (frame_unwind_init, NULL);
 }