mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
381befeedf
This renames ui_out::field_int to field_signed, and field_fmt_int to field_fmt_signed; and changes the type of the "value" parameter from int to LONGEST. Tested by the buildbot. gdb/ChangeLog 2019-07-17 Tom Tromey <tromey@adacore.com> * ui-out.h (class ui_out) <field_signed, field_fmt_signed, do_field_signed>: Rename. Change type of "value". * ui-out.c (ui_out::field_signed): Rename from field_int. Change type of "value". (ui_out::field_fmt_signed): Rename from field_fmt_int. Change type of "value". * tui/tui-out.h (class tui_ui_out) <do_field_signed>: Rename from do_field_int. Change type of "value". * tui/tui-out.c (tui_ui_out::do_field_signed): Rename from do_field_int. Change type of "value". * tracepoint.c (trace_status_mi, tfind_1) (print_one_static_tracepoint_marker): Update. * thread.c (print_thread_info_1, print_selected_thread_frame): Update. * stack.c (print_frame, print_frame_info): Update. * spu-tdep.c (info_spu_signal_command, info_spu_dma_cmdlist): Update. * source.c (print_source_lines_base): Update. * skip.c (info_skip_command): Update. * record-btrace.c (btrace_ui_out_decode_error) (btrace_call_history_src_line): Update. * python/py-framefilter.c (py_print_single_arg, py_print_frame): Update. * progspace.c (print_program_space): Update. * mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Update. * mi/mi-out.h (class mi_ui_out) <do_field_signed>: Rename from do_field_int. Change type of "value". * mi/mi-out.c (mi_ui_out::do_table_begin) (mi_ui_out::do_table_header): Update. (mi_ui_out::do_field_signed): Rename from do_field_int. Change type of "value". * mi/mi-main.c (mi_cmd_thread_list_ids, print_one_inferior) (mi_cmd_data_list_changed_registers, output_register) (mi_cmd_data_read_memory, mi_load_progress) (mi_cmd_trace_frame_collected): Update. * mi/mi-interp.c (mi_on_normal_stop_1, mi_output_solib_attribs): Update. * mi/mi-cmd-var.c (print_varobj, mi_cmd_var_create) (mi_cmd_var_delete, mi_cmd_var_info_num_children) (mi_cmd_var_list_children, varobj_update_one): Update. * mi/mi-cmd-stack.c (mi_cmd_stack_info_depth) (mi_cmd_stack_list_args, list_arg_or_local): Update. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file): Update. * inferior.c (print_inferior): Update. * gdb_bfd.c (print_one_bfd): Update. * disasm.c (gdb_pretty_print_disassembler::pretty_print_insn): Update. * darwin-nat-info.c (darwin_debug_regions_recurse): Update. * cli-out.h (class cli_ui_out) <do_field_signed>: Rename from do_field_int. Change type of "value". * cli-out.c (cli_ui_out::do_field_signed): Rename from do_field_int. Change type of "value". * breakpoint.c (watchpoint_check, print_breakpoint_location) (print_one_breakpoint_location, print_it_catch_fork) (print_one_catch_fork, print_it_catch_vfork) (print_one_catch_vfork, print_it_catch_solib) (print_it_catch_exec, print_it_ranged_breakpoint) (print_mention_watchpoint, print_mention_masked_watchpoint) (bkpt_print_it, update_static_tracepoint): Update. * break-catch-throw.c (print_it_exception_catchpoint): Update. * break-catch-syscall.c (print_it_catch_syscall): Update. * ada-tasks.c (print_ada_task_info): Update. * ada-lang.c (print_it_exception, print_mention_exception): Update.
351 lines
7.1 KiB
C
351 lines
7.1 KiB
C
/* MI Command Set - output generating routines.
|
|
|
|
Copyright (C) 2000-2019 Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Solutions (a Red Hat company).
|
|
|
|
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 "mi-out.h"
|
|
|
|
#include <vector>
|
|
|
|
#include "interps.h"
|
|
#include "ui-out.h"
|
|
#include "utils.h"
|
|
|
|
/* Mark beginning of a table. */
|
|
|
|
void
|
|
mi_ui_out::do_table_begin (int nr_cols, int nr_rows,
|
|
const char *tblid)
|
|
{
|
|
open (tblid, ui_out_type_tuple);
|
|
do_field_signed (-1, -1, ui_left, "nr_rows", nr_rows);
|
|
do_field_signed (-1, -1, ui_left, "nr_cols", nr_cols);
|
|
open ("hdr", ui_out_type_list);
|
|
}
|
|
|
|
/* Mark beginning of a table body. */
|
|
|
|
void
|
|
mi_ui_out::do_table_body ()
|
|
{
|
|
/* close the table header line if there were any headers */
|
|
close (ui_out_type_list);
|
|
open ("body", ui_out_type_list);
|
|
}
|
|
|
|
/* Mark end of a table. */
|
|
|
|
void
|
|
mi_ui_out::do_table_end ()
|
|
{
|
|
close (ui_out_type_list); /* body */
|
|
close (ui_out_type_tuple);
|
|
}
|
|
|
|
/* Specify table header. */
|
|
|
|
void
|
|
mi_ui_out::do_table_header (int width, ui_align alignment,
|
|
const std::string &col_name,
|
|
const std::string &col_hdr)
|
|
{
|
|
open (NULL, ui_out_type_tuple);
|
|
do_field_signed (0, 0, ui_center, "width", width);
|
|
do_field_signed (0, 0, ui_center, "alignment", alignment);
|
|
do_field_string (0, 0, ui_center, "col_name", col_name.c_str (),
|
|
ui_out_style_kind::DEFAULT);
|
|
do_field_string (0, width, alignment, "colhdr", col_hdr.c_str (),
|
|
ui_out_style_kind::DEFAULT);
|
|
close (ui_out_type_tuple);
|
|
}
|
|
|
|
/* Mark beginning of a list. */
|
|
|
|
void
|
|
mi_ui_out::do_begin (ui_out_type type, const char *id)
|
|
{
|
|
open (id, type);
|
|
}
|
|
|
|
/* Mark end of a list. */
|
|
|
|
void
|
|
mi_ui_out::do_end (ui_out_type type)
|
|
{
|
|
close (type);
|
|
}
|
|
|
|
/* Output an int field. */
|
|
|
|
void
|
|
mi_ui_out::do_field_signed (int fldno, int width, ui_align alignment,
|
|
const char *fldname, LONGEST value)
|
|
{
|
|
do_field_string (fldno, width, alignment, fldname, plongest (value),
|
|
ui_out_style_kind::DEFAULT);
|
|
}
|
|
|
|
/* Output an unsigned field. */
|
|
|
|
void
|
|
mi_ui_out::do_field_unsigned (int fldno, int width, ui_align alignment,
|
|
const char *fldname, ULONGEST value)
|
|
{
|
|
do_field_string (fldno, width, alignment, fldname, pulongest (value),
|
|
ui_out_style_kind::DEFAULT);
|
|
}
|
|
|
|
/* Used to omit a field. */
|
|
|
|
void
|
|
mi_ui_out::do_field_skip (int fldno, int width, ui_align alignment,
|
|
const char *fldname)
|
|
{
|
|
}
|
|
|
|
/* Other specific mi_field_* end up here so alignment and field
|
|
separators are both handled by mi_field_string. */
|
|
|
|
void
|
|
mi_ui_out::do_field_string (int fldno, int width, ui_align align,
|
|
const char *fldname, const char *string,
|
|
ui_out_style_kind style)
|
|
{
|
|
ui_file *stream = m_streams.back ();
|
|
field_separator ();
|
|
|
|
if (fldname)
|
|
fprintf_unfiltered (stream, "%s=", fldname);
|
|
fprintf_unfiltered (stream, "\"");
|
|
if (string)
|
|
fputstr_unfiltered (string, '"', stream);
|
|
fprintf_unfiltered (stream, "\"");
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_field_fmt (int fldno, int width, ui_align align,
|
|
const char *fldname, const char *format,
|
|
va_list args)
|
|
{
|
|
ui_file *stream = m_streams.back ();
|
|
field_separator ();
|
|
|
|
if (fldname)
|
|
fprintf_unfiltered (stream, "%s=\"", fldname);
|
|
else
|
|
fputs_unfiltered ("\"", stream);
|
|
vfprintf_unfiltered (stream, format, args);
|
|
fputs_unfiltered ("\"", stream);
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_spaces (int numspaces)
|
|
{
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_text (const char *string)
|
|
{
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_message (const char *format, va_list args)
|
|
{
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_wrap_hint (const char *identstring)
|
|
{
|
|
wrap_here (identstring);
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_flush ()
|
|
{
|
|
|
|
gdb_flush (m_streams.back ());
|
|
}
|
|
|
|
void
|
|
mi_ui_out::do_redirect (ui_file *outstream)
|
|
{
|
|
if (outstream != NULL)
|
|
m_streams.push_back (outstream);
|
|
else
|
|
m_streams.pop_back ();
|
|
}
|
|
|
|
void
|
|
mi_ui_out::field_separator ()
|
|
{
|
|
if (m_suppress_field_separator)
|
|
m_suppress_field_separator = false;
|
|
else
|
|
fputc_unfiltered (',', m_streams.back ());
|
|
}
|
|
|
|
void
|
|
mi_ui_out::open (const char *name, ui_out_type type)
|
|
{
|
|
ui_file *stream = m_streams.back ();
|
|
|
|
field_separator ();
|
|
m_suppress_field_separator = true;
|
|
|
|
if (name)
|
|
fprintf_unfiltered (stream, "%s=", name);
|
|
|
|
switch (type)
|
|
{
|
|
case ui_out_type_tuple:
|
|
fputc_unfiltered ('{', stream);
|
|
break;
|
|
|
|
case ui_out_type_list:
|
|
fputc_unfiltered ('[', stream);
|
|
break;
|
|
|
|
default:
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
|
}
|
|
}
|
|
|
|
void
|
|
mi_ui_out::close (ui_out_type type)
|
|
{
|
|
ui_file *stream = m_streams.back ();
|
|
|
|
switch (type)
|
|
{
|
|
case ui_out_type_tuple:
|
|
fputc_unfiltered ('}', stream);
|
|
break;
|
|
|
|
case ui_out_type_list:
|
|
fputc_unfiltered (']', stream);
|
|
break;
|
|
|
|
default:
|
|
internal_error (__FILE__, __LINE__, _("bad switch"));
|
|
}
|
|
|
|
m_suppress_field_separator = false;
|
|
}
|
|
|
|
string_file *
|
|
mi_ui_out::main_stream ()
|
|
{
|
|
gdb_assert (m_streams.size () == 1);
|
|
|
|
return (string_file *) m_streams.back ();
|
|
}
|
|
|
|
/* Clear the buffer. */
|
|
|
|
void
|
|
mi_ui_out::rewind ()
|
|
{
|
|
main_stream ()->clear ();
|
|
}
|
|
|
|
/* Dump the buffer onto the specified stream. */
|
|
|
|
void
|
|
mi_ui_out::put (ui_file *where)
|
|
{
|
|
string_file *mi_stream = main_stream ();
|
|
|
|
where->write (mi_stream->data (), mi_stream->size ());
|
|
mi_stream->clear ();
|
|
}
|
|
|
|
/* Return the current MI version. */
|
|
|
|
int
|
|
mi_ui_out::version ()
|
|
{
|
|
return m_mi_version;
|
|
}
|
|
|
|
/* Constructor for an `mi_out_data' object. */
|
|
|
|
mi_ui_out::mi_ui_out (int mi_version)
|
|
: ui_out (mi_version >= 3
|
|
? fix_multi_location_breakpoint_output : (ui_out_flag) 0),
|
|
m_suppress_field_separator (false),
|
|
m_suppress_output (false),
|
|
m_mi_version (mi_version)
|
|
{
|
|
string_file *stream = new string_file ();
|
|
m_streams.push_back (stream);
|
|
}
|
|
|
|
mi_ui_out::~mi_ui_out ()
|
|
{
|
|
}
|
|
|
|
/* See mi/mi-out.h. */
|
|
|
|
mi_ui_out *
|
|
mi_out_new (const char *mi_version)
|
|
{
|
|
if (streq (mi_version, INTERP_MI3) || streq (mi_version, INTERP_MI))
|
|
return new mi_ui_out (3);
|
|
|
|
if (streq (mi_version, INTERP_MI2))
|
|
return new mi_ui_out (2);
|
|
|
|
if (streq (mi_version, INTERP_MI1))
|
|
return new mi_ui_out (1);
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
/* Helper function to return the given UIOUT as an mi_ui_out. It is an error
|
|
to call this function with an ui_out that is not an MI. */
|
|
|
|
static mi_ui_out *
|
|
as_mi_ui_out (ui_out *uiout)
|
|
{
|
|
mi_ui_out *mi_uiout = dynamic_cast<mi_ui_out *> (uiout);
|
|
|
|
gdb_assert (mi_uiout != NULL);
|
|
|
|
return mi_uiout;
|
|
}
|
|
|
|
int
|
|
mi_version (ui_out *uiout)
|
|
{
|
|
return as_mi_ui_out (uiout)->version ();
|
|
}
|
|
|
|
void
|
|
mi_out_put (ui_out *uiout, struct ui_file *stream)
|
|
{
|
|
return as_mi_ui_out (uiout)->put (stream);
|
|
}
|
|
|
|
void
|
|
mi_out_rewind (ui_out *uiout)
|
|
{
|
|
return as_mi_ui_out (uiout)->rewind ();
|
|
}
|