7f6aba03b9
This introduces a new "metadata" style and changes many places in gdb to use it. The idea here is to let the user distinguish gdb output from output that (conceptually at least) comes directly from the inferior. The newly-styled category includes text that gdb traditionally surrounds in "<...>", like "<unavailable>". I only added a single test for this. In many cases this output is difficult to test. Also, while developing this errors in the implementation of the new printf formats showed up as regressions. gdb/ChangeLog 2019-10-01 Tom Tromey <tom@tromey.com> * p-lang.c (pascal_printstr): Use metadata style. * value.c (show_convenience): Use metadata style. * valprint.c (valprint_check_validity, val_print_optimized_out) (val_print_not_saved, val_print_unavailable) (val_print_invalid_address, generic_val_print, val_print) (value_check_printable, val_print_array_elements): Use metadata style. * ui-out.h (class ui_out) <field_fmt>: New overload. <do_field_fmt>: Add style parameter. * ui-out.c (ui_out::field_fmt): New overload. * typeprint.c (type_print_unknown_return_type) (val_print_not_allocated, val_print_not_associated): Use metadata style. * tui/tui-out.h (class tui_ui_out) <do_field_fmt>: Add style parameter. * tui/tui-out.c (tui_ui_out::do_field_fmt): Update. * tracepoint.c (tvariables_info_1): Use metadata style. * stack.c (print_frame_arg, print_frame_info, print_frame) (info_frame_command_core): Use metadata style. * skip.c (info_skip_command): Use metadata style. * rust-lang.c (rust_print_enum): Use metadata style. * python/py-prettyprint.c (print_stack_unless_memory_error): Use metadata style. * python/py-framefilter.c (py_print_single_arg): Use metadata style. * printcmd.c (do_one_display, print_variable_and_value): Use metadata style. * p-valprint.c (pascal_val_print) (pascal_object_print_value_fields): Use metadata style. * p-typeprint.c (pascal_type_print_base): Use metadata style. * mi/mi-out.h (class mi_ui_out) <do_field_fmt>: Add style parameter. * mi/mi-out.c (mi_ui_out::do_field_fmt): Update. * m2-valprint.c (m2_print_long_set): Use metadata style. * m2-typeprint.c (m2_print_type): Use metadata style. * infcmd.c (print_return_value_1): Use metadata style. * gnu-v3-abi.c (print_one_vtable): Use metadata style. * f-valprint.c (info_common_command_for_block): Use metadata style. * f-typeprint.c (f_type_print_base): Use metadata style. * expprint.c (print_subexp_standard): Use metadata style. * cp-valprint.c (cp_print_value_fields): Use metadata style. * cli/cli-style.h (class cli_style_option): Add constructor. (metadata_style): Declare. * cli/cli-style.c (metadata_style): New global. (_initialize_cli_style): Register metadata style. * cli-out.h (class cli_ui_out) <do_field_fmt>: Add style parameter. * cli-out.c (cli_ui_out::do_field_fmt): Update. * c-typeprint.c (c_type_print_base_struct_union) (c_type_print_base_1): Use metadata style. * breakpoint.c (watchpoint_value_print) (print_one_breakpoint_location): Use metadata style. * break-catch-syscall.c (print_one_catch_syscall): Use metadata style. * break-catch-sig.c (signal_catchpoint_print_one): Use metadata style. * ada-valprint.c (val_print_packed_array_elements, printstr) (print_field_values, ada_val_print_ref, ada_val_print): Use metadata style. * ada-typeprint.c (print_array_type, ada_print_type): Use metadata style. * ada-tasks.c (print_ada_task_info, info_task): Use metadata style. * ada-lang.c (user_select_syms): Use metadata style. gdb/testsuite/ChangeLog 2019-10-01 Tom Tromey <tom@tromey.com> * lib/gdb-utils.exp (style): Handle "metadata" argument. * gdb.base/style.exp: Add metadata style test.
399 lines
8.3 KiB
C
399 lines
8.3 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_file_style ());
|
|
}
|
|
|
|
/* 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_signed (int fldno, int width, ui_align alignment,
|
|
const char *fldname, LONGEST value)
|
|
{
|
|
if (m_suppress_output)
|
|
return;
|
|
|
|
do_field_string (fldno, width, alignment, fldname, plongest (value),
|
|
ui_file_style ());
|
|
}
|
|
|
|
/* output an unsigned field */
|
|
|
|
void
|
|
cli_ui_out::do_field_unsigned (int fldno, int width, ui_align alignment,
|
|
const char *fldname, ULONGEST value)
|
|
{
|
|
if (m_suppress_output)
|
|
return;
|
|
|
|
do_field_string (fldno, width, alignment, fldname, pulongest (value),
|
|
ui_file_style ());
|
|
}
|
|
|
|
/* 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_file_style ());
|
|
}
|
|
|
|
/* 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,
|
|
const ui_file_style &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)
|
|
{
|
|
if (test_flags (unfiltered_output))
|
|
fputs_styled_unfiltered (string, style, m_streams.back ());
|
|
else
|
|
fputs_styled (string, style, 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 ui_file_style &style,
|
|
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 (), style);
|
|
}
|
|
|
|
void
|
|
cli_ui_out::do_spaces (int numspaces)
|
|
{
|
|
if (m_suppress_output)
|
|
return;
|
|
|
|
if (test_flags (unfiltered_output))
|
|
print_spaces (numspaces, m_streams.back ());
|
|
else
|
|
print_spaces_filtered (numspaces, m_streams.back ());
|
|
}
|
|
|
|
void
|
|
cli_ui_out::do_text (const char *string)
|
|
{
|
|
if (m_suppress_output)
|
|
return;
|
|
|
|
if (test_flags (unfiltered_output))
|
|
fputs_unfiltered (string, m_streams.back ());
|
|
else
|
|
fputs_filtered (string, m_streams.back ());
|
|
}
|
|
|
|
void
|
|
cli_ui_out::do_message (const ui_file_style &style,
|
|
const char *format, va_list args)
|
|
{
|
|
if (m_suppress_output)
|
|
return;
|
|
|
|
/* Use the "no_gdbfmt" variant here to avoid recursion.
|
|
vfprintf_styled calls into cli_ui_out::message to handle the
|
|
gdb-specific printf formats. */
|
|
vfprintf_styled_no_gdbfmt (m_streams.back (), style,
|
|
!test_flags (unfiltered_output), 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 ()
|
|
{
|
|
if (test_flags (unfiltered_output))
|
|
fputc_unfiltered (' ', m_streams.back ());
|
|
else
|
|
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;
|
|
}
|
|
|
|
bool
|
|
cli_ui_out::can_emit_style_escape () const
|
|
{
|
|
return m_streams.back ()->can_emit_style_escape ();
|
|
}
|
|
|
|
/* 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 ();
|
|
}
|