/* Definitions for frame address handler, for GDB, the GNU debugger.
- Copyright 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003-2015 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
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. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#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,
really need to override this. */
static CORE_ADDR
-default_frame_base_address (struct frame_info *next_frame, void **this_cache)
+default_frame_base_address (struct frame_info *this_frame, void **this_cache)
{
- struct frame_info *this_frame = get_prev_frame (next_frame);
return get_frame_base (this_frame); /* sigh! */
}
static CORE_ADDR
-default_frame_locals_address (struct frame_info *next_frame, void **this_cache)
+default_frame_locals_address (struct frame_info *this_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);
+ return default_frame_base_address (this_frame, this_cache);
}
static CORE_ADDR
-default_frame_args_address (struct frame_info *next_frame, void **this_cache)
+default_frame_args_address (struct frame_info *this_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);
+ return default_frame_base_address (this_frame, this_cache);
}
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);
- table->default_base = &default_frame_base;
- return table;
-}
+ struct frame_base_table *table
+ = OBSTACK_ZALLOC (obstack, struct frame_base_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);
- }
+ table->tail = &table->head;
+ table->default_base = &default_frame_base;
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
+ = (struct frame_base_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
+ = (struct frame_base_table *) gdbarch_data (gdbarch, frame_base_data);
+
table->default_base = default_base;
}
const struct frame_base *
-frame_base_find_by_frame (struct frame_info *next_frame)
+frame_base_find_by_frame (struct frame_info *this_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 gdbarch *gdbarch = get_frame_arch (this_frame);
+ struct frame_base_table *table
+ = (struct frame_base_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 (this_frame);
if (desc != NULL)
return desc;
}
void
_initialize_frame_base (void)
{
- frame_base_data = register_gdbarch_data (frame_base_init, NULL);
+ frame_base_data = gdbarch_data_register_pre_init (frame_base_init);
}