mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
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.
121 lines
2.9 KiB
C
121 lines
2.9 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 "tui-out.h"
|
|
#include "tui.h"
|
|
|
|
/* Output an int field. */
|
|
|
|
void
|
|
tui_ui_out::do_field_signed (int fldno, int width, ui_align alignment,
|
|
const char *fldname, LONGEST value)
|
|
{
|
|
if (suppress_output ())
|
|
return;
|
|
|
|
/* Don't print line number, keep it for later. */
|
|
if (m_start_of_line == 0 && strcmp (fldname, "line") == 0)
|
|
{
|
|
m_start_of_line++;
|
|
m_line = value;
|
|
return;
|
|
}
|
|
m_start_of_line++;
|
|
|
|
cli_ui_out::do_field_signed (fldno, width, alignment, fldname, value);
|
|
}
|
|
|
|
/* Other cli_field_* end up here so alignment and field separators are
|
|
both handled by tui_field_string. */
|
|
|
|
void
|
|
tui_ui_out::do_field_string (int fldno, int width, ui_align align,
|
|
const char *fldname, const char *string,
|
|
const ui_file_style &style)
|
|
{
|
|
if (suppress_output ())
|
|
return;
|
|
|
|
m_start_of_line++;
|
|
|
|
if (fldname && m_line > 0 && strcmp (fldname, "fullname") == 0)
|
|
{
|
|
tui_show_source (string, m_line);
|
|
return;
|
|
}
|
|
|
|
cli_ui_out::do_field_string (fldno, width, align, fldname, string, style);
|
|
}
|
|
|
|
void
|
|
tui_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 (suppress_output ())
|
|
return;
|
|
|
|
m_start_of_line++;
|
|
|
|
cli_ui_out::do_field_fmt (fldno, width, align, fldname, style, format, args);
|
|
}
|
|
|
|
void
|
|
tui_ui_out::do_text (const char *string)
|
|
{
|
|
if (suppress_output ())
|
|
return;
|
|
|
|
m_start_of_line++;
|
|
if (m_line > 0)
|
|
{
|
|
/* Printing a source line, so suppress regular output -- the
|
|
line was shown on the TUI's source window by tui_show_source
|
|
above instead. */
|
|
if (strchr (string, '\n') != 0)
|
|
{
|
|
/* We've reached the end of the line, so go back to letting
|
|
text output go to the console. */
|
|
m_line = 0;
|
|
m_start_of_line = 0;
|
|
}
|
|
return;
|
|
}
|
|
if (strchr (string, '\n'))
|
|
m_start_of_line = 0;
|
|
|
|
cli_ui_out::do_text (string);
|
|
}
|
|
|
|
tui_ui_out::tui_ui_out (ui_file *stream)
|
|
: cli_ui_out (stream, 0)
|
|
{
|
|
}
|
|
|
|
tui_ui_out *
|
|
tui_out_new (struct ui_file *stream)
|
|
{
|
|
return new tui_ui_out (stream);
|
|
}
|