diff options
author | Andrew Burgess <aburgess@redhat.com> | 2022-08-31 13:32:59 +0100 |
---|---|---|
committer | Andrew Burgess <aburgess@redhat.com> | 2022-10-02 14:21:25 +0100 |
commit | 9b9e61c7cf49abdf9c2703c4d1f555d762c6e49f (patch) | |
tree | 72ea91b5f98c1da25d5fde14425980aebd71a1b4 /gdb/ft32-tdep.c | |
parent | 7ac20d65a8d0c9cdb329d49e8d9e58e38c39fec4 (diff) | |
download | binutils-gdb-9b9e61c7cf49abdf9c2703c4d1f555d762c6e49f.tar.gz |
gdb: final cleanup of various gdbarch_register_name methods
Building on the previous commits, this commit goes through the various
gdbarch_register_name methods and removes all the remaining 'return
NULL' cases, I claim that these either couldn't be hit, or should be
returning the empty string.
In all cases the return of NULL was used if the register number being
passed to gdbarch_register_name was "invalid", i.e. negative, or
greater than the total number of declared registers. I don't believe
either of these cases can occur, and the previous commit asserts that
this is the case. As a result we can simplify the code by removing
these checks. In many cases, where the register names are held in an
array, I was able to add a static assert that the array contains the
correct number of strings, after that, a direct access into the array
is fine.
I don't have any means of testing these changes.
Diffstat (limited to 'gdb/ft32-tdep.c')
-rw-r--r-- | gdb/ft32-tdep.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c index 4ba3e9f3cbc..4105f650b2d 100644 --- a/gdb/ft32-tdep.c +++ b/gdb/ft32-tdep.c @@ -96,10 +96,7 @@ static const char *const ft32_register_names[] = static const char * ft32_register_name (struct gdbarch *gdbarch, int reg_nr) { - if (reg_nr < 0) - return NULL; - if (reg_nr >= FT32_NUM_REGS) - return NULL; + gdb_static_assert (ARRAY_SIZE (ft32_register_names) == FT32_NUM_REGS); return ft32_register_names[reg_nr]; } |