binutils-gdb/gdb/cli-out.c
Tom Tromey 4de283e4b5 Revert the header-sorting patch
Andreas Schwab and John Baldwin pointed out some bugs in the header
sorting patch; and I noticed that the output was not correct when
limited to a subset of files (a bug in my script).

So, I'm reverting the patch.  I may try again after fixing the issues
pointed out.

gdb/ChangeLog
2019-04-05  Tom Tromey  <tom@tromey.com>

	Revert the header-sorting patch.
	* ft32-tdep.c: Revert.
	* frv-tdep.c: Revert.
	* frv-linux-tdep.c: Revert.
	* frame.c: Revert.
	* frame-unwind.c: Revert.
	* frame-base.c: Revert.
	* fork-child.c: Revert.
	* findvar.c: Revert.
	* findcmd.c: Revert.
	* filesystem.c: Revert.
	* filename-seen-cache.h: Revert.
	* filename-seen-cache.c: Revert.
	* fbsd-tdep.c: Revert.
	* fbsd-nat.h: Revert.
	* fbsd-nat.c: Revert.
	* f-valprint.c: Revert.
	* f-typeprint.c: Revert.
	* f-lang.c: Revert.
	* extension.h: Revert.
	* extension.c: Revert.
	* extension-priv.h: Revert.
	* expprint.c: Revert.
	* exec.h: Revert.
	* exec.c: Revert.
	* exceptions.c: Revert.
	* event-top.c: Revert.
	* event-loop.c: Revert.
	* eval.c: Revert.
	* elfread.c: Revert.
	* dwarf2read.h: Revert.
	* dwarf2read.c: Revert.
	* dwarf2loc.c: Revert.
	* dwarf2expr.h: Revert.
	* dwarf2expr.c: Revert.
	* dwarf2-frame.c: Revert.
	* dwarf2-frame-tailcall.c: Revert.
	* dwarf-index-write.h: Revert.
	* dwarf-index-write.c: Revert.
	* dwarf-index-common.c: Revert.
	* dwarf-index-cache.h: Revert.
	* dwarf-index-cache.c: Revert.
	* dummy-frame.c: Revert.
	* dtrace-probe.c: Revert.
	* disasm.h: Revert.
	* disasm.c: Revert.
	* disasm-selftests.c: Revert.
	* dictionary.c: Revert.
	* dicos-tdep.c: Revert.
	* demangle.c: Revert.
	* dcache.h: Revert.
	* dcache.c: Revert.
	* darwin-nat.h: Revert.
	* darwin-nat.c: Revert.
	* darwin-nat-info.c: Revert.
	* d-valprint.c: Revert.
	* d-namespace.c: Revert.
	* d-lang.c: Revert.
	* ctf.c: Revert.
	* csky-tdep.c: Revert.
	* csky-linux-tdep.c: Revert.
	* cris-tdep.c: Revert.
	* cris-linux-tdep.c: Revert.
	* cp-valprint.c: Revert.
	* cp-support.c: Revert.
	* cp-namespace.c: Revert.
	* cp-abi.c: Revert.
	* corelow.c: Revert.
	* corefile.c: Revert.
	* continuations.c: Revert.
	* completer.h: Revert.
	* completer.c: Revert.
	* complaints.c: Revert.
	* coffread.c: Revert.
	* coff-pe-read.c: Revert.
	* cli-out.h: Revert.
	* cli-out.c: Revert.
	* charset.c: Revert.
	* c-varobj.c: Revert.
	* c-valprint.c: Revert.
	* c-typeprint.c: Revert.
	* c-lang.c: Revert.
	* buildsym.c: Revert.
	* buildsym-legacy.c: Revert.
	* build-id.h: Revert.
	* build-id.c: Revert.
	* btrace.c: Revert.
	* bsd-uthread.c: Revert.
	* breakpoint.h: Revert.
	* breakpoint.c: Revert.
	* break-catch-throw.c: Revert.
	* break-catch-syscall.c: Revert.
	* break-catch-sig.c: Revert.
	* blockframe.c: Revert.
	* block.c: Revert.
	* bfin-tdep.c: Revert.
	* bfin-linux-tdep.c: Revert.
	* bfd-target.c: Revert.
	* bcache.c: Revert.
	* ax-general.c: Revert.
	* ax-gdb.h: Revert.
	* ax-gdb.c: Revert.
	* avr-tdep.c: Revert.
	* auxv.c: Revert.
	* auto-load.c: Revert.
	* arm-wince-tdep.c: Revert.
	* arm-tdep.c: Revert.
	* arm-symbian-tdep.c: Revert.
	* arm-pikeos-tdep.c: Revert.
	* arm-obsd-tdep.c: Revert.
	* arm-nbsd-tdep.c: Revert.
	* arm-nbsd-nat.c: Revert.
	* arm-linux-tdep.c: Revert.
	* arm-linux-nat.c: Revert.
	* arm-fbsd-tdep.c: Revert.
	* arm-fbsd-nat.c: Revert.
	* arm-bsd-tdep.c: Revert.
	* arch-utils.c: Revert.
	* arc-tdep.c: Revert.
	* arc-newlib-tdep.c: Revert.
	* annotate.h: Revert.
	* annotate.c: Revert.
	* amd64-windows-tdep.c: Revert.
	* amd64-windows-nat.c: Revert.
	* amd64-tdep.c: Revert.
	* amd64-sol2-tdep.c: Revert.
	* amd64-obsd-tdep.c: Revert.
	* amd64-obsd-nat.c: Revert.
	* amd64-nbsd-tdep.c: Revert.
	* amd64-nbsd-nat.c: Revert.
	* amd64-nat.c: Revert.
	* amd64-linux-tdep.c: Revert.
	* amd64-linux-nat.c: Revert.
	* amd64-fbsd-tdep.c: Revert.
	* amd64-fbsd-nat.c: Revert.
	* amd64-dicos-tdep.c: Revert.
	* amd64-darwin-tdep.c: Revert.
	* amd64-bsd-nat.c: Revert.
	* alpha-tdep.c: Revert.
	* alpha-obsd-tdep.c: Revert.
	* alpha-nbsd-tdep.c: Revert.
	* alpha-mdebug-tdep.c: Revert.
	* alpha-linux-tdep.c: Revert.
	* alpha-linux-nat.c: Revert.
	* alpha-bsd-tdep.c: Revert.
	* alpha-bsd-nat.c: Revert.
	* aix-thread.c: Revert.
	* agent.c: Revert.
	* addrmap.c: Revert.
	* ada-varobj.c: Revert.
	* ada-valprint.c: Revert.
	* ada-typeprint.c: Revert.
	* ada-tasks.c: Revert.
	* ada-lang.c: Revert.
	* aarch64-tdep.c: Revert.
	* aarch64-ravenscar-thread.c: Revert.
	* aarch64-newlib-tdep.c: Revert.
	* aarch64-linux-tdep.c: Revert.
	* aarch64-linux-nat.c: Revert.
	* aarch64-fbsd-tdep.c: Revert.
	* aarch64-fbsd-nat.c: Revert.
	* aarch32-linux-nat.c: Revert.
2019-04-06 13:47:34 -06:00

388 lines
7.8 KiB
C

/* Output generating routines for GDB CLI.
Copyright (C) 1999-2019 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "ui-out.h"
#include "cli-out.h"
#include "completer.h"
#include "readline/readline.h"
#include "cli/cli-style.h"
/* These are the CLI output functions */
/* Mark beginning of a table */
void
cli_ui_out::do_table_begin (int nbrofcols, int nr_rows, const char *tblid)
{
if (nr_rows == 0)
m_suppress_output = true;
else
/* Only the table suppresses the output and, fortunately, a table
is not a recursive data structure. */
gdb_assert (!m_suppress_output);
}
/* Mark beginning of a table body */
void
cli_ui_out::do_table_body ()
{
if (m_suppress_output)
return;
/* first, close the table header line */
text ("\n");
}
/* Mark end of a table */
void
cli_ui_out::do_table_end ()
{
m_suppress_output = false;
}
/* Specify table header */
void
cli_ui_out::do_table_header (int width, ui_align alignment,
const std::string &col_name,
const std::string &col_hdr)
{
if (m_suppress_output)
return;
do_field_string (0, width, alignment, 0, col_hdr.c_str (),
ui_out_style_kind::DEFAULT);
}
/* Mark beginning of a list */
void
cli_ui_out::do_begin (ui_out_type type, const char *id)
{
}
/* Mark end of a list */
void
cli_ui_out::do_end (ui_out_type type)
{
}
/* output an int field */
void
cli_ui_out::do_field_int (int fldno, int width, ui_align alignment,
const char *fldname, int value)
{
if (m_suppress_output)
return;
std::string str = string_printf ("%d", value);
do_field_string (fldno, width, alignment, fldname, str.c_str (),
ui_out_style_kind::DEFAULT);
}
/* used to omit a field */
void
cli_ui_out::do_field_skip (int fldno, int width, ui_align alignment,
const char *fldname)
{
if (m_suppress_output)
return;
do_field_string (fldno, width, alignment, fldname, "",
ui_out_style_kind::DEFAULT);
}
/* other specific cli_field_* end up here so alignment and field
separators are both handled by cli_field_string */
void
cli_ui_out::do_field_string (int fldno, int width, ui_align align,
const char *fldname, const char *string,
ui_out_style_kind style)
{
int before = 0;
int after = 0;
if (m_suppress_output)
return;
if ((align != ui_noalign) && string)
{
before = width - strlen (string);
if (before <= 0)
before = 0;
else
{
if (align == ui_right)
after = 0;
else if (align == ui_left)
{
after = before;
before = 0;
}
else
/* ui_center */
{
after = before / 2;
before -= after;
}
}
}
if (before)
spaces (before);
if (string)
{
ui_file_style fstyle;
switch (style)
{
case ui_out_style_kind::DEFAULT:
/* Nothing. */
break;
case ui_out_style_kind::FILE:
/* Nothing. */
fstyle = file_name_style.style ();
break;
case ui_out_style_kind::FUNCTION:
fstyle = function_name_style.style ();
break;
case ui_out_style_kind::VARIABLE:
fstyle = variable_name_style.style ();
break;
case ui_out_style_kind::ADDRESS:
fstyle = address_style.style ();
break;
default:
gdb_assert_not_reached ("missing case");
}
fputs_styled (string, fstyle, m_streams.back ());
}
if (after)
spaces (after);
if (align != ui_noalign)
field_separator ();
}
/* Output field containing ARGS using printf formatting in FORMAT. */
void
cli_ui_out::do_field_fmt (int fldno, int width, ui_align align,
const char *fldname, const char *format,
va_list args)
{
if (m_suppress_output)
return;
std::string str = string_vprintf (format, args);
do_field_string (fldno, width, align, fldname, str.c_str (),
ui_out_style_kind::DEFAULT);
}
void
cli_ui_out::do_spaces (int numspaces)
{
if (m_suppress_output)
return;
print_spaces_filtered (numspaces, m_streams.back ());
}
void
cli_ui_out::do_text (const char *string)
{
if (m_suppress_output)
return;
fputs_filtered (string, m_streams.back ());
}
void
cli_ui_out::do_message (const char *format, va_list args)
{
if (m_suppress_output)
return;
vfprintf_unfiltered (m_streams.back (), format, args);
}
void
cli_ui_out::do_wrap_hint (const char *identstring)
{
if (m_suppress_output)
return;
wrap_here (identstring);
}
void
cli_ui_out::do_flush ()
{
gdb_flush (m_streams.back ());
}
/* OUTSTREAM as non-NULL will push OUTSTREAM on the stack of output streams
and make it therefore active. OUTSTREAM as NULL will pop the last pushed
output stream; it is an internal error if it does not exist. */
void
cli_ui_out::do_redirect (ui_file *outstream)
{
if (outstream != NULL)
m_streams.push_back (outstream);
else
m_streams.pop_back ();
}
/* local functions */
void
cli_ui_out::field_separator ()
{
fputc_filtered (' ', m_streams.back ());
}
/* Constructor for cli_ui_out. */
cli_ui_out::cli_ui_out (ui_file *stream, ui_out_flags flags)
: ui_out (flags),
m_suppress_output (false)
{
gdb_assert (stream != NULL);
m_streams.push_back (stream);
}
cli_ui_out::~cli_ui_out ()
{
}
/* Initialize private members at startup. */
cli_ui_out *
cli_out_new (struct ui_file *stream)
{
return new cli_ui_out (stream, ui_source_list);
}
ui_file *
cli_ui_out::set_stream (struct ui_file *stream)
{
ui_file *old;
old = m_streams.back ();
m_streams.back () = stream;
return old;
}
/* CLI interface to display tab-completion matches. */
/* CLI version of displayer.crlf. */
static void
cli_mld_crlf (const struct match_list_displayer *displayer)
{
rl_crlf ();
}
/* CLI version of displayer.putch. */
static void
cli_mld_putch (const struct match_list_displayer *displayer, int ch)
{
putc (ch, rl_outstream);
}
/* CLI version of displayer.puts. */
static void
cli_mld_puts (const struct match_list_displayer *displayer, const char *s)
{
fputs (s, rl_outstream);
}
/* CLI version of displayer.flush. */
static void
cli_mld_flush (const struct match_list_displayer *displayer)
{
fflush (rl_outstream);
}
EXTERN_C void _rl_erase_entire_line (void);
/* CLI version of displayer.erase_entire_line. */
static void
cli_mld_erase_entire_line (const struct match_list_displayer *displayer)
{
_rl_erase_entire_line ();
}
/* CLI version of displayer.beep. */
static void
cli_mld_beep (const struct match_list_displayer *displayer)
{
rl_ding ();
}
/* CLI version of displayer.read_key. */
static int
cli_mld_read_key (const struct match_list_displayer *displayer)
{
return rl_read_key ();
}
/* CLI version of rl_completion_display_matches_hook.
See gdb_display_match_list for a description of the arguments. */
void
cli_display_match_list (char **matches, int len, int max)
{
struct match_list_displayer displayer;
rl_get_screen_size (&displayer.height, &displayer.width);
displayer.crlf = cli_mld_crlf;
displayer.putch = cli_mld_putch;
displayer.puts = cli_mld_puts;
displayer.flush = cli_mld_flush;
displayer.erase_entire_line = cli_mld_erase_entire_line;
displayer.beep = cli_mld_beep;
displayer.read_key = cli_mld_read_key;
gdb_display_match_list (matches, len, max, &displayer);
rl_forced_update_display ();
}