X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fframe-base.c;h=a8408906dac8da9dd5e18052ca55dec4df8ceaad;hb=d5aff968a1623e503e61cb8d5d163a94b7647768;hp=86d955b30699cc8e37230198409c520b8896a4bc;hpb=e8a89fe2788ee8bbcc84d7fb13d28f8b924318c4;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/frame-base.c b/gdb/frame-base.c
index 86d955b306..a8408906da 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 (C) 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -16,12 +16,13 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #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,
@@ -38,24 +39,12 @@ default_frame_base_address (struct frame_info *next_frame, void **this_cache)
 static CORE_ADDR
 default_frame_locals_address (struct frame_info *next_frame, void **this_cache)
 {
-  if (DEPRECATED_FRAME_LOCALS_ADDRESS_P ())
-    {
-      /* This is bad.  The computation of per-frame locals address
-	 should use a per-frame frame-base.  */
-      struct frame_info *this_frame = get_prev_frame (next_frame);
-      return DEPRECATED_FRAME_LOCALS_ADDRESS (this_frame);
-    }
   return default_frame_base_address (next_frame, this_cache);
 }
 
 static CORE_ADDR
 default_frame_args_address (struct frame_info *next_frame, void **this_cache)
 {
-  if (DEPRECATED_FRAME_ARGS_ADDRESS_P ())
-    {
-      struct frame_info *this_frame = get_prev_frame (next_frame);
-      return DEPRECATED_FRAME_ARGS_ADDRESS (this_frame);
-    }
   return default_frame_base_address (next_frame, this_cache);
 }
 
@@ -68,82 +57,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_p_ftype **p;
-  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 void
-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);
-}
-
-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);
-      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_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++;
-}
-
-void
-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, 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);
+  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;
 }
 
@@ -151,15 +102,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;
-      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);
+      desc = entry->sniffer (next_frame);
       if (desc != NULL)
 	return desc;
     }
@@ -171,6 +120,5 @@ extern initialize_file_ftype _initialize_frame_base; /* -Wmissing-prototypes */
 void
 _initialize_frame_base (void)
 {
-  frame_base_data = register_gdbarch_data (frame_base_init,
-					   frame_base_free);
+  frame_base_data = gdbarch_data_register_pre_init (frame_base_init);
 }