/* User visible, per-frame registers, for GDB, the GNU debugger.
- Copyright (C) 2002-2014 Free Software Foundation, Inc.
+ Copyright (C) 2002-2020 Free Software Foundation, Inc.
Contributed by Red Hat.
#include "user-regs.h"
#include "gdbtypes.h"
#include "frame.h"
+#include "arch-utils.h"
+#include "command.h"
+#include "cli/cli-cmds.h"
/* A table of user registers.
struct user_reg
{
const char *name;
- struct value *(*read) (struct frame_info * frame, const void *baton);
+ /* Avoid the "read" symbol name as it conflicts with a preprocessor symbol
+ in the NetBSD header for Stack Smashing Protection, that wraps the read(2)
+ syscall. */
+ struct value *(*xread) (struct frame_info * frame, const void *baton);
const void *baton;
struct user_reg *next;
};
static void
append_user_reg (struct gdb_user_regs *regs, const char *name,
- user_reg_read_ftype *read, const void *baton,
+ user_reg_read_ftype *xread, const void *baton,
struct user_reg *reg)
{
/* The caller is responsible for allocating memory needed to store
register list stored in the common heap or a specific obstack. */
gdb_assert (reg != NULL);
reg->name = name;
- reg->read = read;
+ reg->xread = xread;
reg->baton = baton;
reg->next = NULL;
(*regs->last) = reg;
};
void
-user_reg_add_builtin (const char *name, user_reg_read_ftype *read,
+user_reg_add_builtin (const char *name, user_reg_read_ftype *xread,
const void *baton)
{
- append_user_reg (&builtin_user_regs, name, read, baton,
+ append_user_reg (&builtin_user_regs, name, xread, baton,
XNEW (struct user_reg));
}
regs->last = ®s->first;
for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next)
- append_user_reg (regs, reg->name, reg->read, reg->baton,
+ append_user_reg (regs, reg->name, reg->xread, 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, const void *baton)
+ user_reg_read_ftype *xread, const void *baton)
{
- struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+ struct gdb_user_regs *regs
+ = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data);
if (regs == NULL)
{
/* ULGH, called during architecture initialization. Patch
things up. */
- regs = user_regs_init (gdbarch);
+ regs = (struct gdb_user_regs *) user_regs_init (gdbarch);
deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs);
}
- append_user_reg (regs, name, read, baton,
+ append_user_reg (regs, name, xread, baton,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
}
specific register override the user registers. */
{
int i;
- int maxregs = (gdbarch_num_regs (gdbarch)
- + gdbarch_num_pseudo_regs (gdbarch));
+ int maxregs = gdbarch_num_cooked_regs (gdbarch);
for (i = 0; i < maxregs; i++)
{
/* Search the user name space. */
{
- struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+ struct gdb_user_regs *regs
+ = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data);
struct user_reg *reg;
int nr;
if ((len < 0 && strcmp (reg->name, name))
|| (len == strlen (reg->name)
&& strncmp (reg->name, name, len) == 0))
- return gdbarch_num_regs (gdbarch)
- + gdbarch_num_pseudo_regs (gdbarch) + nr;
+ return gdbarch_num_cooked_regs (gdbarch) + nr;
}
}
static struct user_reg *
usernum_to_user_reg (struct gdbarch *gdbarch, int usernum)
{
- struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+ struct gdb_user_regs *regs
+ = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data);
struct user_reg *reg;
for (reg = regs->first; reg != NULL; reg = reg->next)
const char *
user_reg_map_regnum_to_name (struct gdbarch *gdbarch, int regnum)
{
- int maxregs = (gdbarch_num_regs (gdbarch)
- + gdbarch_num_pseudo_regs (gdbarch));
+ int maxregs = gdbarch_num_cooked_regs (gdbarch);
if (regnum < 0)
return NULL;
value_of_user_reg (int regnum, struct frame_info *frame)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
- int maxregs = (gdbarch_num_regs (gdbarch)
- + gdbarch_num_pseudo_regs (gdbarch));
+ int maxregs = gdbarch_num_cooked_regs (gdbarch);
struct user_reg *reg = usernum_to_user_reg (gdbarch, regnum - maxregs);
gdb_assert (reg != NULL);
- return reg->read (frame, reg->baton);
+ return reg->xread (frame, reg->baton);
}
-extern initialize_file_ftype _initialize_user_regs; /* -Wmissing-prototypes */
+static void
+maintenance_print_user_registers (const char *args, int from_tty)
+{
+ struct gdbarch *gdbarch = get_current_arch ();
+ struct gdb_user_regs *regs;
+ struct user_reg *reg;
+ int regnum;
+
+ regs = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data);
+ regnum = gdbarch_num_cooked_regs (gdbarch);
+ fprintf_unfiltered (gdb_stdout, " %-11s %3s\n", "Name", "Nr");
+ for (reg = regs->first; reg != NULL; reg = reg->next, ++regnum)
+ fprintf_unfiltered (gdb_stdout, " %-11s %3d\n", reg->name, regnum);
+}
+
+void _initialize_user_regs ();
void
-_initialize_user_regs (void)
+_initialize_user_regs ()
{
user_regs_data = gdbarch_data_register_post_init (user_regs_init);
+
+ add_cmd ("user-registers", class_maintenance,
+ maintenance_print_user_registers,
+ _("List the names of the current user registers."),
+ &maintenanceprintlist);
}