FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use filtered output in some dumping commands

Browse source 
There are several commands that may optionally send their output to a
file -- they take an optional filename argument and open a file.  This
patch changes these commands to use filtered output.  The rationale
here is that, when printing to gdb_stdout, filtering is appropriate --
it is, and should be, the default for all commands.  And, when writing
to a file, paging will not happen anyway (it only happens when the
stream==gdb_stdout), so using the _filtered form will not change
anything.
This commit is contained in:
Tom Tromey 2021-12-30 12:16:58 -07:00
parent 34fda50bee
commit 7befbbd4c3
5 changed files with 61 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/dummy-frame.c
View file

@ -405,10 +405,10 @@ fprint_dummy_frames (struct ui_file *file)
struct dummy_frame *s; struct dummy_frame *s;
for (s = dummy_frame_stack; s != NULL; s = s->next) for (s = dummy_frame_stack; s != NULL; s = s->next)
fprintf_unfiltered (file, "%s: id=%s, ptid=%s\n", fprintf_filtered (file, "%s: id=%s, ptid=%s\n",
host_address_to_string (s), host_address_to_string (s),
s->id.id.to_string ().c_str (), s->id.id.to_string ().c_str (),
target_pid_to_str (s->id.thread->ptid).c_str ()); target_pid_to_str (s->id.thread->ptid).c_str ());
} }
static void static void

32
gdb/maint-test-options.c
View file

@ -143,22 +143,22 @@ struct test_options_opts
arguments. */ arguments. */
void dump (ui_file *file, const char *args) const void dump (ui_file *file, const char *args) const
{ {
fprintf_unfiltered (file, fprintf_filtered (file,
_("-flag %d -xx1 %d -xx2 %d -bool %d " _("-flag %d -xx1 %d -xx2 %d -bool %d "
"-enum %s -uint %s -zuint-unl %s -string '%s' -- %s\n"), "-enum %s -uint %s -zuint-unl %s -string '%s' -- %s\n"),
flag_opt, flag_opt,
xx1_opt, xx1_opt,
xx2_opt, xx2_opt,
boolean_opt, boolean_opt,
enum_opt, enum_opt,
(uint_opt == UINT_MAX (uint_opt == UINT_MAX
? "unlimited" ? "unlimited"
: pulongest (uint_opt)), : pulongest (uint_opt)),
(zuint_unl_opt == -1 (zuint_unl_opt == -1
? "unlimited" ? "unlimited"
: plongest (zuint_unl_opt)), : plongest (zuint_unl_opt)),
string_opt.c_str (), string_opt.c_str (),
args); args);
} }
}; };

30
gdb/regcache-dump.c
View file

@ -43,9 +43,9 @@ protected:
if (regnum < 0) if (regnum < 0)
{ {
if (m_dump_pseudo) if (m_dump_pseudo)
fprintf_unfiltered (file, "Cooked value"); fprintf_filtered (file, "Cooked value");
else else
fprintf_unfiltered (file, "Raw value"); fprintf_filtered (file, "Raw value");
} }
else else
{ {
@ -60,9 +60,9 @@ protected:
auto status = m_regcache->cooked_read (regnum, buf.data ()); auto status = m_regcache->cooked_read (regnum, buf.data ());
if (status == REG_UNKNOWN) if (status == REG_UNKNOWN)
fprintf_unfiltered (file, "<invalid>"); fprintf_filtered (file, "<invalid>");
else if (status == REG_UNAVAILABLE) else if (status == REG_UNAVAILABLE)
fprintf_unfiltered (file, "<unavailable>"); fprintf_filtered (file, "<unavailable>");
else else
{ {
print_hex_chars (file, buf.data (), size, print_hex_chars (file, buf.data (), size,
@ -73,7 +73,7 @@ protected:
{ {
/* Just print "<cooked>" for pseudo register when /* Just print "<cooked>" for pseudo register when
regcache_dump_raw. */ regcache_dump_raw. */
fprintf_unfiltered (file, "<cooked>"); fprintf_filtered (file, "<cooked>");
} }
} }
} }
@ -102,9 +102,9 @@ protected:
if (regnum < 0) if (regnum < 0)
{ {
if (m_has_pseudo) if (m_has_pseudo)
fprintf_unfiltered (file, "Cooked value"); fprintf_filtered (file, "Cooked value");
else else
fprintf_unfiltered (file, "Raw value"); fprintf_filtered (file, "Raw value");
} }
else else
{ {
@ -120,15 +120,15 @@ protected:
gdb_assert (status != REG_VALID); gdb_assert (status != REG_VALID);
if (status == REG_UNKNOWN) if (status == REG_UNKNOWN)
fprintf_unfiltered (file, "<invalid>"); fprintf_filtered (file, "<invalid>");
else else
fprintf_unfiltered (file, "<unavailable>"); fprintf_filtered (file, "<unavailable>");
} }
else else
{ {
/* Just print "<cooked>" for pseudo register when /* Just print "<cooked>" for pseudo register when
regcache_dump_raw. */ regcache_dump_raw. */
fprintf_unfiltered (file, "<cooked>"); fprintf_filtered (file, "<cooked>");
} }
} }
} }
@ -162,7 +162,7 @@ protected:
{ {
if (regnum < 0) if (regnum < 0)
{ {
fprintf_unfiltered (file, "Rmt Nr g/G Offset"); fprintf_filtered (file, "Rmt Nr g/G Offset");
} }
else if (regnum < gdbarch_num_regs (m_gdbarch)) else if (regnum < gdbarch_num_regs (m_gdbarch))
{ {
@ -170,7 +170,7 @@ protected:
if (remote_register_number_and_offset (m_gdbarch, regnum, if (remote_register_number_and_offset (m_gdbarch, regnum,
&pnum, &poffset)) &pnum, &poffset))
fprintf_unfiltered (file, "%7d %11d", pnum, poffset); fprintf_filtered (file, "%7d %11d", pnum, poffset);
} }
} }
}; };
@ -188,7 +188,7 @@ protected:
void dump_reg (ui_file *file, int regnum) override void dump_reg (ui_file *file, int regnum) override
{ {
if (regnum < 0) if (regnum < 0)
fprintf_unfiltered (file, "Groups"); fprintf_filtered (file, "Groups");
else else
{ {
const char *sep = ""; const char *sep = "";
@ -200,8 +200,8 @@ protected:
{ {
if (gdbarch_register_reggroup_p (m_gdbarch, regnum, group)) if (gdbarch_register_reggroup_p (m_gdbarch, regnum, group))
{ {
fprintf_unfiltered (file, fprintf_filtered (file,
"%s%s", sep, reggroup_name (group)); "%s%s", sep, reggroup_name (group));
sep = ","; sep = ",";
} }
} }

46
gdb/regcache.c
View file

@ -1436,7 +1436,7 @@ register_dump::dump (ui_file *file)
{ {
/* Name. */ /* Name. */
if (regnum < 0) if (regnum < 0)
fprintf_unfiltered (file, " %-10s", "Name"); fprintf_filtered (file, " %-10s", "Name");
else else
{ {
const char *p = gdbarch_register_name (m_gdbarch, regnum); const char *p = gdbarch_register_name (m_gdbarch, regnum);
@ -1445,31 +1445,31 @@ register_dump::dump (ui_file *file)
p = ""; p = "";
else if (p[0] == '\0') else if (p[0] == '\0')
p = "''"; p = "''";
fprintf_unfiltered (file, " %-10s", p); fprintf_filtered (file, " %-10s", p);
} }
/* Number. */ /* Number. */
if (regnum < 0) if (regnum < 0)
fprintf_unfiltered (file, " %4s", "Nr"); fprintf_filtered (file, " %4s", "Nr");
else else
fprintf_unfiltered (file, " %4d", regnum); fprintf_filtered (file, " %4d", regnum);
/* Relative number. */ /* Relative number. */
if (regnum < 0) if (regnum < 0)
fprintf_unfiltered (file, " %4s", "Rel"); fprintf_filtered (file, " %4s", "Rel");
else if (regnum < gdbarch_num_regs (m_gdbarch)) else if (regnum < gdbarch_num_regs (m_gdbarch))
fprintf_unfiltered (file, " %4d", regnum); fprintf_filtered (file, " %4d", regnum);
else else
fprintf_unfiltered (file, " %4d", fprintf_filtered (file, " %4d",
(regnum - gdbarch_num_regs (m_gdbarch))); (regnum - gdbarch_num_regs (m_gdbarch)));
/* Offset. */ /* Offset. */
if (regnum < 0) if (regnum < 0)
fprintf_unfiltered (file, " %6s ", "Offset"); fprintf_filtered (file, " %6s ", "Offset");
else else
{ {
fprintf_unfiltered (file, " %6ld", fprintf_filtered (file, " %6ld",
descr->register_offset[regnum]); descr->register_offset[regnum]);
if (register_offset != descr->register_offset[regnum] if (register_offset != descr->register_offset[regnum]
|| (regnum > 0 || (regnum > 0
&& (descr->register_offset[regnum] && (descr->register_offset[regnum]
@ -1479,19 +1479,19 @@ register_dump::dump (ui_file *file)
{ {
if (!footnote_register_offset) if (!footnote_register_offset)
footnote_register_offset = ++footnote_nr; footnote_register_offset = ++footnote_nr;
fprintf_unfiltered (file, "*%d", footnote_register_offset); fprintf_filtered (file, "*%d", footnote_register_offset);
} }
else else
fprintf_unfiltered (file, " "); fprintf_filtered (file, " ");
register_offset = (descr->register_offset[regnum] register_offset = (descr->register_offset[regnum]
+ descr->sizeof_register[regnum]); + descr->sizeof_register[regnum]);
} }
/* Size. */ /* Size. */
if (regnum < 0) if (regnum < 0)
fprintf_unfiltered (file, " %5s ", "Size"); fprintf_filtered (file, " %5s ", "Size");
else else
fprintf_unfiltered (file, " %5ld", descr->sizeof_register[regnum]); fprintf_filtered (file, " %5ld", descr->sizeof_register[regnum]);
/* Type. */ /* Type. */
{ {
@ -1517,24 +1517,24 @@ register_dump::dump (ui_file *file)
if (startswith (t, blt)) if (startswith (t, blt))
t += strlen (blt); t += strlen (blt);
} }
fprintf_unfiltered (file, " %-15s", t); fprintf_filtered (file, " %-15s", t);
} }
/* Leading space always present. */ /* Leading space always present. */
fprintf_unfiltered (file, " "); fprintf_filtered (file, " ");
dump_reg (file, regnum); dump_reg (file, regnum);
fprintf_unfiltered (file, "\n"); fprintf_filtered (file, "\n");
} }
if (footnote_register_offset) if (footnote_register_offset)
fprintf_unfiltered (file, "*%d: Inconsistent register offsets.\n", fprintf_filtered (file, "*%d: Inconsistent register offsets.\n",
footnote_register_offset); footnote_register_offset);
if (footnote_register_type_name_null) if (footnote_register_type_name_null)
fprintf_unfiltered (file, fprintf_filtered (file,
"*%d: Register type's name NULL.\n", "*%d: Register type's name NULL.\n",
footnote_register_type_name_null); footnote_register_type_name_null);
} }
#if GDB_SELF_TEST #if GDB_SELF_TEST

6
gdb/reggroups.c
View file

@ -251,7 +251,7 @@ reggroups_dump (struct gdbarch *gdbarch, struct ui_file *file)
name = "Group"; name = "Group";
else else
name = reggroup_name (group); name = reggroup_name (group);
fprintf_unfiltered (file, " %-10s", name); fprintf_filtered (file, " %-10s", name);
} }
/* Group type. */ /* Group type. */
@ -274,13 +274,13 @@ reggroups_dump (struct gdbarch *gdbarch, struct ui_file *file)
internal_error (__FILE__, __LINE__, _("bad switch")); internal_error (__FILE__, __LINE__, _("bad switch"));
} }
} }
fprintf_unfiltered (file, " %-10s", type); fprintf_filtered (file, " %-10s", type);
} }
/* Note: If you change this, be sure to also update the /* Note: If you change this, be sure to also update the
documentation. */ documentation. */
fprintf_unfiltered (file, "\n"); fprintf_filtered (file, "\n");
group = reggroup_next (gdbarch, group); group = reggroup_next (gdbarch, group);
} }