/* User visible, per-frame registers, for GDB, the GNU debugger.
- Copyright 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004 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"
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,
+append_user_reg (struct gdb_user_regs *regs, const char *name,
user_reg_read_ftype *read, struct user_reg *reg)
{
/* The caller is responsible for allocating memory needed to store
/* 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_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,
user_reg_add (struct gdbarch *gdbarch, const char *name,
user_reg_read_ftype *read)
{
- 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,
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++)
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)
{
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);
}