2004-03-18 Andrew Cagney <cagney@redhat.com>

	* frame-base.c: Update copyright.  Include "gdb_obstack.h".
	(struct frame_base_table_entry): Define.
	(struct frame_base_table): Re-implement as a linked list.
	(frame_base_init): Re-implement.
	(frame_base_table): Delete function.
	(append_predicate): Delete function.
	(frame_base_append_sniffer): Update.
	(frame_base_set_default): Update.
	(frame_base_find_by_frame): Update.
	(_initialize_frame_base): Use gdbarch_data_register_pre_init.
	* Makefile.in (frame-base.o): Update dependencies.

3 files changed, 41 insertions, 40 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4b09d23..a65f4f0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2004-03-18  Andrew Cagney  <cagney@redhat.com>
+
+	* frame-base.c: Update copyright.  Include "gdb_obstack.h".
+	(struct frame_base_table_entry): Define.
+	(struct frame_base_table): Re-implement as a linked list.
+	(frame_base_init): Re-implement.
+	(frame_base_table): Delete function.
+	(append_predicate): Delete function.
+	(frame_base_append_sniffer): Update.
+	(frame_base_set_default): Update.
+	(frame_base_find_by_frame): Update.
+	(_initialize_frame_base): Use gdbarch_data_register_pre_init.
+	* Makefile.in (frame-base.o): Update dependencies.
+
 2004-03-17  Andrew Cagney  <cagney@redhat.com>
 
 	* frame.c (legacy_get_prev_frame): Pass correct frame to
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index ceb1c1c..fd04d0c 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1758,7 +1758,8 @@ f-lang.o: f-lang.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \
 fork-child.o: fork-child.c $(defs_h) $(gdb_string_h) $(frame_h) \
 	$(inferior_h) $(target_h) $(gdb_wait_h) $(gdb_vfork_h) $(gdbcore_h) \
 	$(terminal_h) $(gdbthread_h) $(command_h)
-frame-base.o: frame-base.c $(defs_h) $(frame_base_h) $(frame_h)
+frame-base.o: frame-base.c $(defs_h) $(frame_base_h) $(frame_h) \
+	$(gdb_obstack_h)
 frame.o: frame.c $(defs_h) $(frame_h) $(target_h) $(value_h) $(inferior_h) \
 	$(regcache_h) $(gdb_assert_h) $(gdb_string_h) $(user_regs_h) \
 	$(gdb_obstack_h) $(dummy_frame_h) $(sentinel_frame_h) $(gdbcore_h) \
diff --git a/gdb/frame-base.c b/gdb/frame-base.c
index e651b05..0fce6bc 100644
--- a/gdb/frame-base.c
+++ b/gdb/frame-base.c
@@ -1,6 +1,6 @@
 /* Definitions for frame address handler, for GDB, the GNU debugger.
 
-   Copyright 2003 Free Software Foundation, Inc.
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,6 +22,7 @@
 #include "defs.h"
 #include "frame-base.h"
 #include "frame.h"
+#include "gdb_obstack.h"
 
 /* A default frame base implementations.  If it wasn't for the old
    DEPRECATED_FRAME_LOCALS_ADDRESS and DEPRECATED_FRAME_ARGS_ADDRESS,
@@ -68,60 +69,44 @@ const struct frame_base default_frame_base = {
 
 static struct gdbarch_data *frame_base_data;
 
+struct frame_base_table_entry
+{
+  frame_base_sniffer_ftype *sniffer;
+  struct frame_base_table_entry *next;
+};
+
 struct frame_base_table
 {
-  frame_base_sniffer_ftype **sniffer;
+  struct frame_base_table_entry *head;
+  struct frame_base_table_entry **tail;
   const struct frame_base *default_base;
-  int nr;
 };
 
 static void *
-frame_base_init (struct gdbarch *gdbarch)
+frame_base_init (struct obstack *obstack)
 {
-  struct frame_base_table *table = XCALLOC (1, struct frame_base_table);
+  struct frame_base_table *table
+    = OBSTACK_ZALLOC (obstack, struct frame_base_table);
+  table->tail = &table->head;
   table->default_base = &default_frame_base;
   return table;
 }
 
-static struct frame_base_table *
-frame_base_table (struct gdbarch *gdbarch)
-{
-  struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
-  if (table == NULL)
-    {
-      /* ULGH, called during architecture initialization.  Patch
-         things up.  */
-      table = frame_base_init (gdbarch);
-      deprecated_set_gdbarch_data (gdbarch, frame_base_data, table);
-    }
-  return table;
-}
-
-/* Append a predicate to the end of the table.  */
-static void
-append_predicate (struct frame_base_table *table,
-		  frame_base_sniffer_ftype *sniffer)
-{
-  table->sniffer = xrealloc (table->sniffer,
-			     ((table->nr + 1)
-			      * sizeof (frame_base_sniffer_ftype *)));
-  table->sniffer[table->nr] = sniffer;
-  table->nr++;
-}
-
 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, sniffer);
+  struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
+  (*table->tail) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_base_table_entry);
+  (*table->tail)->sniffer = sniffer;
+  table->tail = &(*table->tail)->next;
 }
 
 void
 frame_base_set_default (struct gdbarch *gdbarch,
 			const struct frame_base *default_base)
 {
-  struct frame_base_table *table = frame_base_table (gdbarch);
+  struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
   table->default_base = default_base;
 }
 
@@ -129,12 +114,13 @@ const struct frame_base *
 frame_base_find_by_frame (struct frame_info *next_frame)
 {
   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++)
+  struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
+  struct frame_base_table_entry *entry;
+
+  for (entry = table->head; entry != NULL; entry = entry->next)
     {
       const struct frame_base *desc = NULL;
-      desc = table->sniffer[i] (next_frame);
+      desc = entry->sniffer (next_frame);
       if (desc != NULL)
 	return desc;
     }
@@ -146,5 +132,5 @@ extern initialize_file_ftype _initialize_frame_base; /* -Wmissing-prototypes */
 void
 _initialize_frame_base (void)
 {
-  frame_base_data = gdbarch_data_register_post_init (frame_base_init);
+  frame_base_data = gdbarch_data_register_pre_init (frame_base_init);
 }