forked from Imagelibrary/binutils-gdb
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.
This commit is contained in:
committed by
Simon Marchi
parent
925047fed0
commit
f6efe3f842
@@ -86,8 +86,7 @@ init_regcache_descr (struct gdbarch *gdbarch)
|
||||
/* Total size of the register space. The raw registers are mapped
|
||||
directly onto the raw register cache while the pseudo's are
|
||||
either mapped onto raw-registers or memory. */
|
||||
descr->nr_cooked_registers = gdbarch_num_regs (gdbarch)
|
||||
+ gdbarch_num_pseudo_regs (gdbarch);
|
||||
descr->nr_cooked_registers = gdbarch_num_cooked_regs (gdbarch);
|
||||
|
||||
/* Fill in a table of register types. */
|
||||
descr->register_type
|
||||
@@ -163,9 +162,7 @@ register_size (struct gdbarch *gdbarch, int regnum)
|
||||
struct regcache_descr *descr = regcache_descr (gdbarch);
|
||||
int size;
|
||||
|
||||
gdb_assert (regnum >= 0
|
||||
&& regnum < (gdbarch_num_regs (gdbarch)
|
||||
+ gdbarch_num_pseudo_regs (gdbarch)));
|
||||
gdb_assert (regnum >= 0 && regnum < gdbarch_num_cooked_regs (gdbarch));
|
||||
size = descr->sizeof_register[regnum];
|
||||
return size;
|
||||
}
|
||||
@@ -1311,8 +1308,7 @@ register_dump::dump (ui_file *file)
|
||||
long register_offset = 0;
|
||||
|
||||
gdb_assert (descr->nr_cooked_registers
|
||||
== (gdbarch_num_regs (m_gdbarch)
|
||||
+ gdbarch_num_pseudo_regs (m_gdbarch)));
|
||||
== gdbarch_num_cooked_regs (m_gdbarch));
|
||||
|
||||
for (regnum = -1; regnum < descr->nr_cooked_registers; regnum++)
|
||||
{
|
||||
@@ -1637,9 +1633,7 @@ cooked_read_test (struct gdbarch *gdbarch)
|
||||
mock_target.reset ();
|
||||
/* Then, read all raw and pseudo registers, and don't expect calling
|
||||
to_{fetch,store}_registers. */
|
||||
for (int regnum = 0;
|
||||
regnum < gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
|
||||
regnum++)
|
||||
for (int regnum = 0; regnum < gdbarch_num_cooked_regs (gdbarch); regnum++)
|
||||
{
|
||||
if (register_size (gdbarch, regnum) == 0)
|
||||
continue;
|
||||
@@ -1665,9 +1659,7 @@ cooked_read_test (struct gdbarch *gdbarch)
|
||||
readonly regcache. */
|
||||
mock_target.reset ();
|
||||
|
||||
for (int regnum = 0;
|
||||
regnum < gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
|
||||
regnum++)
|
||||
for (int regnum = 0; regnum < gdbarch_num_cooked_regs (gdbarch); regnum++)
|
||||
{
|
||||
if (register_size (gdbarch, regnum) == 0)
|
||||
continue;
|
||||
@@ -1762,8 +1754,7 @@ cooked_write_test (struct gdbarch *gdbarch)
|
||||
|
||||
readwrite_regcache readwrite (gdbarch);
|
||||
|
||||
const int num_regs = (gdbarch_num_regs (gdbarch)
|
||||
+ gdbarch_num_pseudo_regs (gdbarch));
|
||||
const int num_regs = gdbarch_num_cooked_regs (gdbarch);
|
||||
|
||||
for (auto regnum = 0; regnum < num_regs; regnum++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user