summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/binutils/gdb/frame-base.c
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2004-12-27 13:17:06 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2004-12-27 13:17:06 +0000
commit2ed3fb102e82ad2127a78a905dce5acf55afc729 (patch)
treeb55832f88f0f339bfb56693aead72749739d66df /gnu/usr.bin/binutils/gdb/frame-base.c
parentbafd719ae34a32376be8ae2ddd673e95254092b4 (diff)
GDB 6.3 (excluding .info files)
Diffstat (limited to 'gnu/usr.bin/binutils/gdb/frame-base.c')
-rw-r--r--gnu/usr.bin/binutils/gdb/frame-base.c76
1 files changed, 25 insertions, 51 deletions
diff --git a/gnu/usr.bin/binutils/gdb/frame-base.c b/gnu/usr.bin/binutils/gdb/frame-base.c
index 66a0106aa0b..0961033b3eb 100644
--- a/gnu/usr.bin/binutils/gdb/frame-base.c
+++ b/gnu/usr.bin/binutils/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,
@@ -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,60 +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_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);
- 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 +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;
- desc = table->sniffer[i] (next_frame);
+ desc = entry->sniffer (next_frame);
if (desc != NULL)
return desc;
}
@@ -146,5 +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_data = gdbarch_data_register_pre_init (frame_base_init);
}