riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

gdb: update now gdbarch_register_name doesn't return nullptr 

After the previous few commit, gdbarch_register_name no longer returns
nullptr.  This commit audits all the calls to gdbarch_register_name
and removes any code that checks the result against nullptr.

There should be no visible change after this commit.
users/aburgess/try-mips-disasm-styling
Andrew Burgess 4 years ago
parent
9b9e61c7cf
commit
637b2f8613
16 changed files with 27 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      gdb/alpha-tdep.c
  2. 3
      gdb/arch-utils.c
  3. 3
      gdb/csky-tdep.c
  4. 2
      gdb/h8300-tdep.c
  5. 3
      gdb/infcmd.c
  6. 2
      gdb/m68hc11-tdep.c
  7. 20
      gdb/mi/mi-main.c
  8. 8
      gdb/mips-tdep.c
  9. 3
      gdb/nds32-tdep.c
  10. 5
      gdb/regcache.c
  11. 3
      gdb/reggroups.c
  12. 9
      gdb/riscv-tdep.c
  13. 3
      gdb/sh-tdep.c
  14. 4
      gdb/tui/tui-regs.c
  15. 10
      gdb/user-regs.c
  16. 2
      gdb/valops.c

3
gdb/alpha-tdep.c
View File

@ -140,8 +140,7 @@ alpha_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
{
/* Filter out any registers eliminated, but whose regnum is
reserved for backward compatibility, e.g. the vfp. */
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *gdbarch_register_name (gdbarch, regnum) == '\0')
if (*gdbarch_register_name (gdbarch, regnum) == '\0')
return 0;
if (group == all_reggroup)

3
gdb/arch-utils.c
View File

@ -76,8 +76,7 @@ legacy_register_sim_regno (struct gdbarch *gdbarch, int regnum)
suspected that some GDB/SIM combinations may rely on this
behaviour. The default should be one2one_register_sim_regno
(below). */
if (gdbarch_register_name (gdbarch, regnum) != NULL
&& gdbarch_register_name (gdbarch, regnum)[0] != '\0')
if (gdbarch_register_name (gdbarch, regnum)[0] != '\0')
return regnum;
else
return LEGACY_SIM_REGNO_IGNORE;

3
gdb/csky-tdep.c
View File

@ -2353,8 +2353,7 @@ csky_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
{
int raw_p;
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| gdbarch_register_name (gdbarch, regnum)[0] == '\0')
if (gdbarch_register_name (gdbarch, regnum)[0] == '\0')
return 0;
if (reggroup == all_reggroup)

2
gdb/h8300-tdep.c
View File

@ -996,7 +996,7 @@ h8300_print_register (struct gdbarch *gdbarch, struct ui_file *file,
LONGEST rval;
const char *name = gdbarch_register_name (gdbarch, regno);
if (!name || !*name)
if (*name == '\0')
return;
rval = get_frame_register_signed (frame, regno);

3
gdb/infcmd.c
View File

@ -2224,8 +2224,7 @@ default_print_registers_info (struct gdbarch *gdbarch,
/* If the register name is empty, it is undefined for this
processor, so don't display anything. */
if (gdbarch_register_name (gdbarch, i) == NULL
|| *(gdbarch_register_name (gdbarch, i)) == '\0')
if (*(gdbarch_register_name (gdbarch, i)) == '\0')
continue;
default_print_one_register_info (file,

2
gdb/m68hc11-tdep.c
View File

@ -1090,7 +1090,7 @@ m68hc11_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file,
{
const char *name = gdbarch_register_name (gdbarch, regno);
if (!name || !*name)
if (*name == '\0')
return;
gdb_printf (file, "%-10s ", name);

20
gdb/mi/mi-main.c
View File

@ -880,8 +880,7 @@ mi_cmd_data_list_register_names (const char *command, char **argv, int argc)
regnum < numregs;
regnum++)
{
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
uiout->field_string (NULL, "");
else
uiout->field_string (NULL, gdbarch_register_name (gdbarch, regnum));
@ -895,8 +894,7 @@ mi_cmd_data_list_register_names (const char *command, char **argv, int argc)
if (regnum < 0 || regnum >= numregs)
error (_("bad register number"));
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
uiout->field_string (NULL, "");
else
uiout->field_string (NULL, gdbarch_register_name (gdbarch, regnum));
@ -940,8 +938,7 @@ mi_cmd_data_list_changed_registers (const char *command, char **argv, int argc)
regnum < numregs;
regnum++)
{
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
continue;
if (register_changed_p (regnum, prev_regs.get (),
@ -957,7 +954,6 @@ mi_cmd_data_list_changed_registers (const char *command, char **argv, int argc)
if (regnum >= 0
&& regnum < numregs
&& gdbarch_register_name (gdbarch, regnum) != NULL
&& *gdbarch_register_name (gdbarch, regnum) != '\000')
{
if (register_changed_p (regnum, prev_regs.get (),
@ -1067,8 +1063,7 @@ mi_cmd_data_list_register_values (const char *command, char **argv, int argc)
regnum < numregs;
regnum++)
{
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
continue;
output_register (frame, regnum, format, skip_unavailable);
@ -1082,7 +1077,6 @@ mi_cmd_data_list_register_values (const char *command, char **argv, int argc)
if (regnum >= 0
&& regnum < numregs
&& gdbarch_register_name (gdbarch, regnum) != NULL
&& *gdbarch_register_name (gdbarch, regnum) != '\000')
output_register (frame, regnum, format, skip_unavailable);
else
@ -1163,8 +1157,7 @@ mi_cmd_data_write_register_values (const char *command, char **argv, int argc)
int regnum = atoi (argv[i]);
if (regnum >= 0 && regnum < numregs
&& gdbarch_register_name (gdbarch, regnum)
&& *gdbarch_register_name (gdbarch, regnum))
&& *gdbarch_register_name (gdbarch, regnum) != '\0')
{
LONGEST value;
@ -2632,8 +2625,7 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
for (regnum = 0; regnum < numregs; regnum++)
{
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
continue;
output_register (frame, regnum, registers_format, 1);

8
gdb/mips-tdep.c
View File

@ -712,8 +712,7 @@ mips_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
/* FIXME: cagney/2003-04-13: Can't yet use gdbarch_num_regs
(gdbarch), as not all architectures are multi-arch. */
raw_p = rawnum < gdbarch_num_regs (gdbarch);
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| gdbarch_register_name (gdbarch, regnum)[0] == '\0')
if (gdbarch_register_name (gdbarch, regnum)[0] == '\0')
return 0;
if (reggroup == float_reggroup)
return float_p && pseudo;
@ -7952,10 +7951,7 @@ mips_register_sim_regno (struct gdbarch *gdbarch, int regnum)
decide if it is valid. Should instead define a standard sim/gdb
register numbering scheme. */
if (gdbarch_register_name (gdbarch,
gdbarch_num_regs (gdbarch) + regnum) != NULL
&& gdbarch_register_name (gdbarch,
gdbarch_num_regs (gdbarch)
+ regnum)[0] != '\0')
gdbarch_num_regs (gdbarch) + regnum)[0] != '\0')
return regnum;
else
return LEGACY_SIM_REGNO_IGNORE;

3
gdb/nds32-tdep.c
View File

@ -2030,8 +2030,7 @@ nds32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
{
const char *regname = gdbarch_register_name (gdbarch, j);
if (regname != NULL
&& strcmp (regname, nds32_register_aliases[i].name) == 0)
if (strcmp (regname, nds32_register_aliases[i].name) == 0)
{
regnum = j;
break;

5
gdb/regcache.c
View File

@ -1392,7 +1392,6 @@ regcache::debug_print_register (const char *func, int regno)
gdb_printf (gdb_stdlog, "%s ", func);
if (regno >= 0 && regno < gdbarch_num_regs (gdbarch)
&& gdbarch_register_name (gdbarch, regno) != NULL
&& gdbarch_register_name (gdbarch, regno)[0] != '\0')
gdb_printf (gdb_stdlog, "(%s)",
gdbarch_register_name (gdbarch, regno));
@ -1453,9 +1452,7 @@ register_dump::dump (ui_file *file)
{
const char *p = gdbarch_register_name (m_gdbarch, regnum);
if (p == NULL)
p = "";
else if (p[0] == '\0')
if (p[0] == '\0')
p = "''";
gdb_printf (file, " %-10s", p);
}

3
gdb/reggroups.c
View File

@ -146,8 +146,7 @@ default_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
int float_p;
int raw_p;
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *gdbarch_register_name (gdbarch, regnum) == '\0')
if (*gdbarch_register_name (gdbarch, regnum) == '\0')
return 0;
if (group == all_reggroup)
return 1;

9
gdb/riscv-tdep.c
View File

@ -1352,8 +1352,7 @@ riscv_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
/* Used by 'info registers' and 'info registers <groupname>'. */
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| gdbarch_register_name (gdbarch, regnum)[0] == '\0')
if (gdbarch_register_name (gdbarch, regnum)[0] == '\0')
return 0;
if (regnum > RISCV_LAST_REGNUM && regnum < gdbarch_num_regs (gdbarch))
@ -1478,8 +1477,7 @@ riscv_print_registers_info (struct gdbarch *gdbarch,
if (regnum != -1)
{
/* Print one specified register. */
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
error (_("Not a valid register for the current processor type"));
riscv_print_one_register_info (gdbarch, file, frame, regnum);
}
@ -1499,8 +1497,7 @@ riscv_print_registers_info (struct gdbarch *gdbarch,
continue;
/* Registers with no name are not valid on this ISA. */
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *(gdbarch_register_name (gdbarch, regnum)) == '\0')
if (*(gdbarch_register_name (gdbarch, regnum)) == '\0')
continue;
/* Is the register in the group we're interested in? */

3
gdb/sh-tdep.c
View File

@ -1452,8 +1452,7 @@ static int
sh_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
const struct reggroup *reggroup)
{
if (gdbarch_register_name (gdbarch, regnum) == NULL
|| *gdbarch_register_name (gdbarch, regnum) == '\0')
if (*gdbarch_register_name (gdbarch, regnum) == '\0')
return 0;
if (reggroup == float_reggroup

4
gdb/tui/tui-regs.c
View File

@ -231,7 +231,7 @@ tui_data_window::show_register_group (const reggroup *group,
/* If the register name is empty, it is undefined for this
processor, so don't display anything. */
name = gdbarch_register_name (gdbarch, regnum);
if (name == 0 || *name == '\0')
if (*name == '\0')
continue;
nr_regs++;
@ -253,7 +253,7 @@ tui_data_window::show_register_group (const reggroup *group,
/* If the register name is empty, it is undefined for this
processor, so don't display anything. */
name = gdbarch_register_name (gdbarch, regnum);
if (name == 0 || *name == '\0')
if (*name == '\0')
continue;
data_item_win = &m_regs_content[pos];

10
gdb/user-regs.c
View File

@ -139,18 +139,14 @@ user_reg_map_name_to_regnum (struct gdbarch *gdbarch, const char *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++)
for (int 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;
}
if (len == strlen (regname) && strncmp (regname, name, len) == 0)
return i;
}
}

2
gdb/valops.c
View File

@ -1417,7 +1417,7 @@ address_of_variable (struct symbol *var, const struct block *b)
regname = gdbarch_register_name (get_frame_arch (frame),
VALUE_REGNUM (val));
gdb_assert (regname && *regname);
gdb_assert (regname != nullptr && *regname != '\0');
error (_("Address requested for identifier "
"\"%s\" which is in register $%s"),

Write Preview
Loading…
Cancel
Save