This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[commit] Use arch heap in frame-base
- From: Andrew Cagney <cagney at gnu dot org>
- To: gdb-patches at sources dot redhat dot com
- Date: Thu, 18 Mar 2004 11:16:54 -0500
- Subject: [commit] Use arch heap in frame-base
Hello,
This fixes two problems in frame-base:
- use the gdbarch heap
- use the new / simpler pre-init mechanism
committed,
Andrew
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.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.524
diff -u -r1.524 Makefile.in
--- Makefile.in 15 Mar 2004 23:08:28 -0000 1.524
+++ Makefile.in 18 Mar 2004 16:13:32 -0000
@@ -1758,7 +1758,8 @@
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) \
Index: frame-base.c
===================================================================
RCS file: /cvs/src/src/gdb/frame-base.c,v
retrieving revision 1.9
diff -u -r1.9 frame-base.c
--- frame-base.c 15 Mar 2004 20:38:08 -0000 1.9
+++ frame-base.c 18 Mar 2004 16:13:33 -0000
@@ -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 @@
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 @@
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 @@
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);
}