/* User visible, per-frame registers, for GDB, the GNU debugger.
- Copyright 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
Contributed by Red Hat.
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 "user-regs.h"
/* A table of user registers.
User registers have regnum's that live above of the range [0
- .. NUM_REGS + NUM_PSEUDO_REGS) (which is controlled by the target).
+ .. gdbarch_num_regs + gdbarch_num_pseudo_regs)
+ (which is controlled by the target).
The target should never see a user register's regnum value.
Always append, never delete. By doing this, the relative regnum
- (offset from NUM_REGS + NUM_PSEUDO_REGS) assigned to each user
- register never changes. */
+ (offset from gdbarch_num_regs + gdbarch_num_pseudo_regs)
+ assigned to each user register never changes. */
struct user_reg
{
const char *name;
- struct value *(*read) (struct frame_info * frame);
+ struct value *(*read) (struct frame_info * frame, const void *baton);
+ const void *baton;
struct user_reg *next;
};
-struct user_regs
+/* This structure is named gdb_user_regs instead of user_regs to avoid
+ conflicts with any "struct user_regs" in system headers. For instance,
+ on ARM GNU/Linux native builds, nm-linux.h includes <signal.h> includes
+ <sys/ucontext.h> includes <sys/procfs.h> includes <sys/user.h>, which
+ declares "struct user_regs". */
+
+struct gdb_user_regs
{
struct user_reg *first;
struct user_reg **last;
};
static void
-append_user_reg (struct user_regs *regs, const char *name,
- user_reg_read_ftype *read, struct user_reg *reg)
+append_user_reg (struct gdb_user_regs *regs, const char *name,
+ user_reg_read_ftype *read, const void *baton,
+ struct user_reg *reg)
{
/* The caller is responsible for allocating memory needed to store
the register. By doing this, the function can operate on a
gdb_assert (reg != NULL);
reg->name = name;
reg->read = read;
+ reg->baton = baton;
reg->next = NULL;
(*regs->last) = reg;
regs->last = &(*regs->last)->next;
/* An array of the builtin user registers. */
-static struct user_regs builtin_user_regs = { NULL, &builtin_user_regs.first };
+static struct gdb_user_regs builtin_user_regs = { NULL, &builtin_user_regs.first };
void
-user_reg_add_builtin (const char *name, user_reg_read_ftype *read)
+user_reg_add_builtin (const char *name, user_reg_read_ftype *read,
+ const void *baton)
{
- append_user_reg (&builtin_user_regs, name, read,
+ append_user_reg (&builtin_user_regs, name, read, baton,
XMALLOC (struct user_reg));
}
user_regs_init (struct gdbarch *gdbarch)
{
struct user_reg *reg;
- struct user_regs *regs = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_regs);
+ struct gdb_user_regs *regs = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct gdb_user_regs);
regs->last = ®s->first;
for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next)
- append_user_reg (regs, reg->name, reg->read,
+ append_user_reg (regs, reg->name, reg->read, reg->baton,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
return regs;
}
void
user_reg_add (struct gdbarch *gdbarch, const char *name,
- user_reg_read_ftype *read)
+ user_reg_read_ftype *read, const void *baton)
{
- struct user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+ struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
if (regs == NULL)
{
/* ULGH, called during architecture initialization. Patch
things up. */
regs = user_regs_init (gdbarch);
- set_gdbarch_data (gdbarch, user_regs_data, regs);
+ deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs);
}
- append_user_reg (regs, name, read,
+ append_user_reg (regs, name, read, baton,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
}
/* Search the user name space. */
{
- struct user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+ struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
struct user_reg *reg;
int nr;
for (nr = 0, reg = regs->first; reg != NULL; reg = reg->next, nr++)
if ((len < 0 && strcmp (reg->name, name))
|| (len == strlen (reg->name)
&& strncmp (reg->name, name, len) == 0))
- return NUM_REGS + NUM_PSEUDO_REGS + nr;
+ return gdbarch_num_regs (current_gdbarch)
+ + gdbarch_num_pseudo_regs (current_gdbarch) + nr;
}
}
static struct user_reg *
usernum_to_user_reg (struct gdbarch *gdbarch, int usernum)
{
- struct user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+ struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
struct user_reg *reg;
for (reg = regs->first; reg != NULL; reg = reg->next)
{
+ gdbarch_num_pseudo_regs (gdbarch));
struct user_reg *reg = usernum_to_user_reg (gdbarch, regnum - maxregs);
gdb_assert (reg != NULL);
- return reg->read (frame);
+ return reg->read (frame, reg->baton);
}
extern initialize_file_ftype _initialize_user_regs; /* -Wmissing-prototypes */
void
_initialize_user_regs (void)
{
- user_regs_data = register_gdbarch_data (user_regs_init, NULL);
+ user_regs_data = gdbarch_data_register_post_init (user_regs_init);
}