binutils-gdb/gdb/mi/mi-cmd-file.c
Tom Tromey 76f9c9cfd4 Use ui_out_emit_tuple in more places
This changes more places to use ui_out_emit_tuple, removing cleanups.

ChangeLog
2017-09-09  Tom Tromey  <tom@tromey.com>

	* target.c (flash_erase_command): Use ui_out_emit_tuple.
	* stack.c (print_frame): Use ui_out_emit_tuple.
	* spu-tdep.c (info_spu_event_command): Use ui_out_emit_tuple.
	(info_spu_mailbox_command, info_spu_dma_command)
	(info_spu_proxydma_command): Likewise.
	* mi/mi-main.c (mi_cmd_trace_frame_collected): Use
	ui_out_emit_tuple, gdb::byte_vector, bin2hex.
	* mi/mi-cmd-file.c (mi_cmd_file_list_shared_libraries): Use
	ui_out_emit_tuple.
	* breakpoint.c (print_it_watchpoint): Use ui_out_emit_tuple.
2017-09-09 13:46:05 -06:00

160 lines
4.3 KiB
C

/* MI Command Set - file commands.
Copyright (C) 2000-2017 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-cmds.h"
#include "mi-getopt.h"
#include "mi-interp.h"
#include "ui-out.h"
#include "symtab.h"
#include "source.h"
#include "objfiles.h"
#include "psymtab.h"
#include "solib.h"
#include "solist.h"
#include "gdb_regex.h"
/* Return to the client the absolute path and line number of the
current file being executed. */
void
mi_cmd_file_list_exec_source_file (const char *command, char **argv, int argc)
{
struct symtab_and_line st;
struct ui_out *uiout = current_uiout;
if (!mi_valid_noargs ("-file-list-exec-source-file", argc, argv))
error (_("-file-list-exec-source-file: Usage: No args"));
/* Set the default file and line, also get them. */
set_default_source_symtab_and_line ();
st = get_current_source_symtab_and_line ();
/* We should always get a symtab. Apparently, filename does not
need to be tested for NULL. The documentation in symtab.h
suggests it will always be correct. */
if (!st.symtab)
error (_("-file-list-exec-source-file: No symtab"));
/* Print to the user the line, filename and fullname. */
uiout->field_int ("line", st.line);
uiout->field_string ("file", symtab_to_filename_for_display (st.symtab));
uiout->field_string ("fullname", symtab_to_fullname (st.symtab));
uiout->field_int ("macro-info",
COMPUNIT_MACRO_TABLE (SYMTAB_COMPUNIT (st.symtab)) != NULL);
}
/* A callback for map_partial_symbol_filenames. */
static void
print_partial_file_name (const char *filename, const char *fullname,
void *ignore)
{
struct ui_out *uiout = current_uiout;
uiout->begin (ui_out_type_tuple, NULL);
uiout->field_string ("file", filename);
if (fullname)
uiout->field_string ("fullname", fullname);
uiout->end (ui_out_type_tuple);
}
void
mi_cmd_file_list_exec_source_files (const char *command, char **argv, int argc)
{
struct ui_out *uiout = current_uiout;
struct compunit_symtab *cu;
struct symtab *s;
struct objfile *objfile;
if (!mi_valid_noargs ("-file-list-exec-source-files", argc, argv))
error (_("-file-list-exec-source-files: Usage: No args"));
/* Print the table header. */
uiout->begin (ui_out_type_list, "files");
/* Look at all of the file symtabs. */
ALL_FILETABS (objfile, cu, s)
{
uiout->begin (ui_out_type_tuple, NULL);
uiout->field_string ("file", symtab_to_filename_for_display (s));
uiout->field_string ("fullname", symtab_to_fullname (s));
uiout->end (ui_out_type_tuple);
}
map_symbol_filenames (print_partial_file_name, NULL,
1 /*need_fullname*/);
uiout->end (ui_out_type_list);
}
/* See mi-cmds.h. */
void
mi_cmd_file_list_shared_libraries (const char *command, char **argv, int argc)
{
struct ui_out *uiout = current_uiout;
const char *pattern;
struct so_list *so = NULL;
struct gdbarch *gdbarch = target_gdbarch ();
switch (argc)
{
case 0:
pattern = NULL;
break;
case 1:
pattern = argv[0];
break;
default:
error (_("Usage: -file-list-shared-libraries [REGEXP]"));
}
if (pattern != NULL)
{
const char *re_err = re_comp (pattern);
if (re_err != NULL)
error (_("Invalid regexp: %s"), re_err);
}
update_solib_list (1);
/* Print the table header. */
ui_out_emit_list list_emitter (uiout, "shared-libraries");
ALL_SO_LIBS (so)
{
if (so->so_name[0] == '\0')
continue;
if (pattern != NULL && !re_exec (so->so_name))
continue;
ui_out_emit_tuple tuple_emitter (uiout, NULL);
mi_output_solib_attribs (uiout, so);
}
}