gdb/
* 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.
This commit is contained in:
parent
1b56eb5540
commit
05cba821ad
20 changed files with 269 additions and 95 deletions
|
@ -91,7 +91,7 @@ stpy_str (PyObject *self)
|
|||
|
||||
STPY_REQUIRE_VALID (self, symtab);
|
||||
|
||||
result = PyString_FromString (symtab->filename);
|
||||
result = PyString_FromString (symtab_to_filename_for_display (symtab));
|
||||
|
||||
return result;
|
||||
}
|
||||
|
@ -101,11 +101,12 @@ stpy_get_filename (PyObject *self, void *closure)
|
|||
{
|
||||
PyObject *str_obj;
|
||||
struct symtab *symtab = NULL;
|
||||
const char *filename;
|
||||
|
||||
STPY_REQUIRE_VALID (self, symtab);
|
||||
filename = symtab_to_filename_for_display (symtab);
|
||||
|
||||
str_obj = PyString_Decode (symtab->filename,
|
||||
strlen (symtab->filename),
|
||||
str_obj = PyString_Decode (filename, strlen (filename),
|
||||
host_charset (), NULL);
|
||||
return str_obj;
|
||||
}
|
||||
|
@ -186,7 +187,8 @@ stpy_static_block (PyObject *self, PyObject *args)
|
|||
static PyObject *
|
||||
salpy_str (PyObject *self)
|
||||
{
|
||||
char *s, *filename;
|
||||
char *s;
|
||||
const char *filename;
|
||||
sal_object *sal_obj;
|
||||
PyObject *result;
|
||||
struct symtab_and_line *sal = NULL;
|
||||
|
@ -195,7 +197,7 @@ salpy_str (PyObject *self)
|
|||
|
||||
sal_obj = (sal_object *) self;
|
||||
filename = (sal_obj->symtab == (symtab_object *) Py_None)
|
||||
? "<unknown>" : sal_obj->symtab->symtab->filename;
|
||||
? "<unknown>" : symtab_to_filename_for_display (sal_obj->symtab->symtab);
|
||||
|
||||
s = xstrprintf ("symbol and line for %s, line %d", filename,
|
||||
sal->line);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue