gdb: check for duplicate register names in selftest

Building on the previous commit, this commit extends the register_name
selftest to check for duplicate register names.

If two registers in the cooked register set (real + pseudo registers)
have the same name, then this will show up as duplicate registers in
the 'info all-registers' output, but the user will only be able to
interact with one copy of the register.

In this commit I extend the selftest that I added in the previous
commit to check for duplicate register names, I didn't include this
functionality in the previous commit because one architecture needed
fixing, and I wanted to keep those fixes separate from the fixes in
the previous commit.

The problematic architecture(s) are powerpc:750 and powerpc:604.  In
both of these cases the 'dabr' register appears twice, there's a
definition of dabr in power-oea.xml which is included into both
powerpc-604.xml and powerpc-750.xml.  Both of these later two xml
files also define the dabr register.

I'm hopeful that this change shouldn't break anything, but I don't
have the ability to actually test this change, however:

On the gdbserver side, neither powerpc-604.xml nor powerpc-750.xml are
mentioned in gdbserver/configure.srv, which I think means that
gdbserver will never use these descriptions, and,

Within GDB the problematic descriptions are held in the variables
tdesc_powerpc_604 and tdesc_powerpc_750, which are only mentioned in
the variants array in rs6000-tdep.c, this is used when looking up a
description based on the architecture.

For a native Linux target however, this will not be used as
ppc_linux_nat_target::read_description exists, which calls
ppc_linux_match_description, which I don't believe can return either
of the problematic descriptions.

This leaves the other native targets, FreeBSD, AIX, etc.  These don't
appear to override the ::read_description method, so will potentially
return the problematic descriptions, but, in each case I think the
::fetch_registers and ::store_registers methods will ignore the dabr
register, which will leave the register as <unavailable>.

So, my proposed solution is to just remove the duplicate register from
each of powerpc-604.xml and powerpc-750.xml, then regenerate the
corresponding C++ source file.  With this change made, the selftest
now passes for all architectures.
This commit is contained in:
Andrew Burgess
2022-08-31 11:40:16 +01:00
parent 9a972b5404
commit 9a103324fe
5 changed files with 26 additions and 11 deletions

View File

@ -27,6 +27,8 @@
#include "gdbarch.h"
#include "scoped-mock-context.h"
#include <map>
namespace selftests {
/* Test gdbarch methods register_to_value and value_to_register. */
@ -129,6 +131,9 @@ register_name_test (struct gdbarch *gdbarch)
{
scoped_mock_context<test_target_ops> mockctx (gdbarch);
/* Track the number of times each register name appears. */
std::map<const std::string, int> name_counts;
const int num_regs = gdbarch_num_cooked_regs (gdbarch);
for (auto regnum = 0; regnum < num_regs; regnum++)
{
@ -141,8 +146,22 @@ register_name_test (struct gdbarch *gdbarch)
debug_printf ("arch: %s, register: %d returned nullptr\n",
gdbarch_bfd_arch_info (gdbarch)->printable_name,
regnum);
SELF_CHECK (name != nullptr);
/* Every register name, that is not the empty string, should be
unique. If this is not the case then the user will see duplicate
copies of the register in e.g. 'info registers' output, but will
only be able to interact with one of the copies. */
if (*name != '\0')
{
std::string s (name);
name_counts[s]++;
if (run_verbose() && name_counts[s] > 1)
debug_printf ("arch: %s, register: %d (%s) is a duplicate\n",
gdbarch_bfd_arch_info (gdbarch)->printable_name,
regnum, name);
SELF_CHECK (name_counts[s] == 1);
}
}
}