/* User visible, per-frame registers, for GDB, the GNU debugger.
- Copyright (C) 2002-2014 Free Software Foundation, Inc.
+ Copyright (C) 2002-2019 Free Software Foundation, Inc.
Contributed by Red Hat.
user_reg_add (struct gdbarch *gdbarch, const char *name,
user_reg_read_ftype *read, 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,
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);
}
static void
-maintenance_print_user_registers (char *args, int from_tty)
+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 = gdbarch_data (gdbarch, user_regs_data);
- regnum = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
+ regs = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data);
+ regnum = gdbarch_num_cooked_regs (gdbarch);
- fprintf_unfiltered (gdb_stdout, " Nr Name\n");
+ fprintf_unfiltered (gdb_stdout, " %-11s %3s\n", "Name", "Nr");
for (reg = regs->first; reg != NULL; reg = reg->next, ++regnum)
- fprintf_unfiltered (gdb_stdout, "%3d %s\n", regnum, reg->name);
+ fprintf_unfiltered (gdb_stdout, " %-11s %3d\n", reg->name, regnum);
}
-extern initialize_file_ftype _initialize_user_regs; /* -Wmissing-prototypes */
-
void
_initialize_user_regs (void)
{