05cba821ad
* ada-lang.c (user_select_syms): Replace symtab->filename refererences by symtab_to_filename_for_display calls. * breakpoint.c (print_breakpoint_location, resolve_sal_pc): Likewise. (clear_command): New variable sal_fullname, initialize it. Replace compare_filenames_for_search by filename_cmp with sal_fullname. (say_where, update_static_tracepoint): Replace symtab->filename refererences by symtab_to_filename_for_display calls. * cli/cli-cmds.c (edit_command, list_command, ambiguous_line_spec): Likewise. * dwarf2read.c: Include source.h. (fixup_go_packaging): Replace symtab->filename refererences by symtab_to_filename_for_display calls. * linespec.c (add_sal_to_sals): Rename variable filename to fullname. Replace symtab->filename refererences by symtab_to_filename_for_display calls. (create_sals_line_offset, convert_linespec_to_sals): New variable fullname, initialize it, replace symtab->filename reference by the variable. * linux-fork.c: Include source.h. (info_checkpoints_command): Replace symtab->filename refererences by symtab_to_filename_for_display calls. * macroscope.c (sal_macro_scope): Replace symtab->filename refererences by symtab_to_filename_for_display calls. * mdebugread.c: Include source.h. (psymtab_to_symtab_1): Replace symtab->filename refererences by symtab_to_filename_for_display calls. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file) (mi_cmd_file_list_exec_source_files): Likewise. * printcmd.c: Include source.h. (build_address_symbolic): Replace symtab->filename refererences by symtab_to_filename_for_display calls. * psymtab.c (partial_map_symtabs_matching_filename) (read_psymtabs_with_fullname): Call compare_filenames_for_search also with psymtab_to_fullname. * python/py-symtab.c (stpy_str): Replace symtab->filename refererences by symtab_to_filename_for_display calls. (stpy_get_filename): New variable filename, initialize it, use instead of symtab->filename refererences. (salpy_str): Make variable filename const char *. Replace symtab->filename refererences by symtab_to_filename_for_display calls. * skip.c: Include source.h and filenames.h. (skip_file_command): Remove const from the symtab variable. Replace symtab->filename refererences by symtab_to_fullname call. (function_name_is_marked_for_skip): New variables searched_for_fullname and fullname. Use them to search also with symtab's fullname. * source.c (find_source_lines): Replace symtab->filename refererences by symtab_to_filename_for_display calls. (print_source_lines_base): New variable filename, use it instead of symtab->filename. Replace symtab->filename refererences by symtab_to_filename_for_display calls. (line_info, forward_search_command): Replace symtab->filename refererences by symtab_to_filename_for_display calls. (reverse_search_command): Replace symtab->filename refererences by symtab_to_filename_for_display calls. New variable filename for it. * stack.c (frame_info): Likewise. * symmisc.c: Include source.h. (dump_objfile, dump_symtab_1, maintenance_print_symbols) (maintenance_info_symtabs): Replace symtab->filename refererences by symtab_to_filename_for_display calls. * symtab.c (iterate_over_some_symtabs): Call compare_filenames_for_search also with symtab_to_fullname. (lookup_symbol_aux_quick, basic_lookup_transparent_type_quick): Replace symtab->filename refererences by symtab_to_filename_for_display calls. (find_line_symtab): Replace symtab->filename refererences by symtab_to_filename_for_display calls. (file_matches): Replace filename_cmp by compare_filenames_for_search. (print_symbol_info): Make the last parameter const char *. New variable s_filename. Use it in the function. (symtab_symbol_info): Make the last_filename variable const char *. Replace symtab->filename refererences by symtab_to_filename_for_display calls. (rbreak_command): New variable fullname. Use it. Replace symtab->filename refererence by symtab_to_filename_for_display call. * tracepoint.c (set_traceframe_context, trace_find_line_command) (print_one_static_tracepoint_marker): Replace symtab->filename refererences by symtab_to_filename_for_display calls. * tui/tui-source.c (tui_set_source_content): New variables filename and s_filename. Replace symtab->filename refererences by this variable. Replace other symtab->filename refererences by symtab_to_filename_for_display calls.
107 lines
3.3 KiB
C
107 lines
3.3 KiB
C
/* MI Command Set - file commands.
|
|
Copyright (C) 2000-2013 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 "ui-out.h"
|
|
#include "symtab.h"
|
|
#include "source.h"
|
|
#include "objfiles.h"
|
|
#include "psymtab.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 (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. */
|
|
ui_out_field_int (uiout, "line", st.line);
|
|
ui_out_field_string (uiout, "file",
|
|
symtab_to_filename_for_display (st.symtab));
|
|
|
|
ui_out_field_string (uiout, "fullname", symtab_to_fullname (st.symtab));
|
|
|
|
ui_out_field_int (uiout, "macro-info", st.symtab->macro_table ? 1 : 0);
|
|
}
|
|
|
|
/* 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;
|
|
|
|
ui_out_begin (uiout, ui_out_type_tuple, NULL);
|
|
|
|
ui_out_field_string (uiout, "file", filename);
|
|
|
|
if (fullname)
|
|
ui_out_field_string (uiout, "fullname", fullname);
|
|
|
|
ui_out_end (uiout, ui_out_type_tuple);
|
|
}
|
|
|
|
void
|
|
mi_cmd_file_list_exec_source_files (char *command, char **argv, int argc)
|
|
{
|
|
struct ui_out *uiout = current_uiout;
|
|
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. */
|
|
ui_out_begin (uiout, ui_out_type_list, "files");
|
|
|
|
/* Look at all of the symtabs. */
|
|
ALL_SYMTABS (objfile, s)
|
|
{
|
|
ui_out_begin (uiout, ui_out_type_tuple, NULL);
|
|
|
|
ui_out_field_string (uiout, "file", symtab_to_filename_for_display (s));
|
|
ui_out_field_string (uiout, "fullname", symtab_to_fullname (s));
|
|
|
|
ui_out_end (uiout, ui_out_type_tuple);
|
|
}
|
|
|
|
map_partial_symbol_filenames (print_partial_file_name, NULL,
|
|
1 /*need_fullname*/);
|
|
|
|
ui_out_end (uiout, ui_out_type_list);
|
|
}
|