binutils-gdb/gdb/user-regs.c
Simon Marchi f6efe3f842 Introduce gdbarch_num_cooked_regs
The expression

  gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch)

is used quite often to find the number of cooked registers (raw + pseudo
registers).  This patch introduces gdbarch_num_cooked_regs, which does
the equivalent.  It substantially reduces required wrapping in some
places, so should improve readability.

There is a for loop in m68hc11_frame_unwind_cache that had iterated
until (the equivalent of) gdbarch_num_cooked_regs (gdbarch) - 1.  During
review, we concluded that this is most likely an off-by-one mistake, so
I replaced it with gdbarch_num_cooked_regs (gdbarch).

gdb/ChangeLog:

	* gdbarch.sh (gdbarch_num_cooked_regs): New.
	* gdbarch.h: Re-generate.
	* ax-gdb.c (gen_expr): Use gdbarch_num_cooked_regs.
	* dwarf2-frame.c (dwarf2_frame_cache): Likewise.
	* eval.c (evaluate_subexp_standard): Likewise.
	* findvar.c (value_of_register): Likewise.
	(value_of_register_lazy): Likewise.
	(address_from_register): Likewise.
	* frame.c (get_frame_register_bytes): Likewise.
	* gdbarch-selftests.c (register_to_value_test): Likewise.
	* h8300-tdep.c (h8300_register_type): Likewise.
	* i386-tdep.c (i386_dbx_reg_to_regnum): Likewise.
	(i386_svr4_reg_to_regnum): Likewise.
	* infcmd.c (default_print_registers_info): Likewise.
	(registers_info): Likewise.
	(print_vector_info): Likewise.
	(default_print_float_info): Likewise.
	* m68hc11-tdep.c (m68hc11_frame_unwind_cache): Likewise.
	* mdebugread.c (mdebug_reg_to_regnum): Likewise.
	* mi/mi-main.c (mi_cmd_data_list_register_names): Likewise.
	(mi_cmd_data_list_changed_registers): Likewise.
	(mi_cmd_data_list_register_values): Likewise.
	(mi_cmd_data_write_register_values): Likewise.
	(mi_cmd_trace_frame_collected): Likewise.
	* mips-tdep.c (print_gp_register_row): Likewise.
	(mips_print_registers_info): Likewise.
	* nds32-tdep.c (nds32_gdbarch_init): Likewise.
	* regcache.c (init_regcache_descr): Likewise.
	(register_size): Likewise.
	(register_dump::dump): Likewise.
	(cooked_read_test): Likewise.
	(cooked_write_test): Likewise.
	* rs6000-tdep.c (rs6000_register_sim_regno): Likewise.
	(rs6000_gdbarch_init): Likewise.
	* stabsread.c (stab_reg_to_regnum): Likewise.
	* stack.c (info_frame_command): Likewise.
	* target-descriptions.c (tdesc_register_name): Likewise.
	* trad-frame.c (trad_frame_alloc_saved_regs): Likewise.
	* tui/tui-regs.c (tui_show_register_group): Likewise.
	* user-regs.c (user_reg_map_name_to_regnum): Likewise.
	(user_reg_map_regnum_to_name): Likewise.
	(value_of_user_reg): Likewise.
	(maintenance_print_user_registers): Likewise.
	* xtensa-tdep.c (xtensa_find_register_by_name): Likewise.
	(xtensa_register_name): Likewise.
	(xtensa_register_type): Likewise.
	(xtensa_reg_to_regnum): Likewise.
	(xtensa_pseudo_register_read): Likewise.
	(xtensa_pseudo_register_write): Likewise.
2018-10-21 22:29:21 -04:00

246 lines
6.8 KiB
C

/* User visible, per-frame registers, for GDB, the GNU debugger.
Copyright (C) 2002-2018 Free Software Foundation, Inc.
Contributed by Red Hat.
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 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#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.
User registers have regnum's that live above of the range [0
.. 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 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, const void *baton);
const void *baton;
struct user_reg *next;
};
/* 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 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
register list stored in the common heap or a specific obstack. */
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 gdb_user_regs builtin_user_regs = {
NULL, &builtin_user_regs.first
};
void
user_reg_add_builtin (const char *name, user_reg_read_ftype *read,
const void *baton)
{
append_user_reg (&builtin_user_regs, name, read, baton,
XNEW (struct user_reg));
}
/* Per-architecture user registers. Start with the builtin user
registers and then, again, append. */
static struct gdbarch_data *user_regs_data;
static void *
user_regs_init (struct gdbarch *gdbarch)
{
struct user_reg *reg;
struct gdb_user_regs *regs
= GDBARCH_OBSTACK_ZALLOC (gdbarch, struct gdb_user_regs);
regs->last = &regs->first;
for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next)
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, const void *baton)
{
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 = (struct gdb_user_regs *) user_regs_init (gdbarch);
deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs);
}
append_user_reg (regs, name, read, baton,
GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg));
}
int
user_reg_map_name_to_regnum (struct gdbarch *gdbarch, const char *name,
int len)
{
/* Make life easy, set the len to something reasonable. */
if (len < 0)
len = strlen (name);
/* Search register name space first - always let an architecture
specific register override the user registers. */
{
int i;
int maxregs = gdbarch_num_cooked_regs (gdbarch);
for (i = 0; i < maxregs; i++)
{
const char *regname = gdbarch_register_name (gdbarch, i);
if (regname != NULL && len == strlen (regname)
&& strncmp (regname, name, len) == 0)
{
return i;
}
}
}
/* Search the user name space. */
{
struct gdb_user_regs *regs
= (struct gdb_user_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 gdbarch_num_cooked_regs (gdbarch) + nr;
}
}
return -1;
}
static struct user_reg *
usernum_to_user_reg (struct gdbarch *gdbarch, int usernum)
{
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)
{
if (usernum == 0)
return reg;
usernum--;
}
return NULL;
}
const char *
user_reg_map_regnum_to_name (struct gdbarch *gdbarch, int regnum)
{
int maxregs = gdbarch_num_cooked_regs (gdbarch);
if (regnum < 0)
return NULL;
else if (regnum < maxregs)
return gdbarch_register_name (gdbarch, regnum);
else
{
struct user_reg *reg = usernum_to_user_reg (gdbarch, regnum - maxregs);
if (reg == NULL)
return NULL;
else
return reg->name;
}
}
struct value *
value_of_user_reg (int regnum, struct frame_info *frame)
{
struct gdbarch *gdbarch = get_frame_arch (frame);
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);
}
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)
{
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.\n"),
&maintenanceprintlist);
}