mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-10-17 21:03:55 +08:00
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:
39
gdb/source.c
39
gdb/source.c
@ -1167,7 +1167,7 @@ find_source_lines (struct symtab *s, int desc)
|
||||
gdb_assert (s);
|
||||
line_charpos = (int *) xmalloc (lines_allocated * sizeof (int));
|
||||
if (fstat (desc, &st) < 0)
|
||||
perror_with_name (s->filename);
|
||||
perror_with_name (symtab_to_filename_for_display (s));
|
||||
|
||||
if (s->objfile && s->objfile->obfd)
|
||||
mtime = s->objfile->mtime;
|
||||
@ -1192,7 +1192,7 @@ find_source_lines (struct symtab *s, int desc)
|
||||
/* Reassign `size' to result of read for systems where \r\n -> \n. */
|
||||
size = myread (desc, data, size);
|
||||
if (size < 0)
|
||||
perror_with_name (s->filename);
|
||||
perror_with_name (symtab_to_filename_for_display (s));
|
||||
end = data + size;
|
||||
p = data;
|
||||
line_charpos[0] = 0;
|
||||
@ -1333,17 +1333,19 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
|
||||
|
||||
if (!(flags & PRINT_SOURCE_LINES_NOERROR))
|
||||
{
|
||||
int len = strlen (s->filename) + 100;
|
||||
const char *filename = symtab_to_filename_for_display (s);
|
||||
int len = strlen (filename) + 100;
|
||||
char *name = alloca (len);
|
||||
|
||||
xsnprintf (name, len, "%d\t%s", line, s->filename);
|
||||
xsnprintf (name, len, "%d\t%s", line, filename);
|
||||
print_sys_errmsg (name, errno);
|
||||
}
|
||||
else
|
||||
{
|
||||
ui_out_field_int (uiout, "line", line);
|
||||
ui_out_text (uiout, "\tin ");
|
||||
ui_out_field_string (uiout, "file", s->filename);
|
||||
ui_out_field_string (uiout, "file",
|
||||
symtab_to_filename_for_display (s));
|
||||
if (ui_out_is_mi_like_p (uiout))
|
||||
{
|
||||
const char *fullname = symtab_to_fullname (s);
|
||||
@ -1365,13 +1367,13 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
|
||||
{
|
||||
close (desc);
|
||||
error (_("Line number %d out of range; %s has %d lines."),
|
||||
line, s->filename, s->nlines);
|
||||
line, symtab_to_filename_for_display (s), s->nlines);
|
||||
}
|
||||
|
||||
if (lseek (desc, s->line_charpos[line - 1], 0) < 0)
|
||||
{
|
||||
close (desc);
|
||||
perror_with_name (s->filename);
|
||||
perror_with_name (symtab_to_filename_for_display (s));
|
||||
}
|
||||
|
||||
stream = fdopen (desc, FDOPEN_MODE);
|
||||
@ -1388,7 +1390,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
|
||||
last_line_listed = current_source_line;
|
||||
if (flags & PRINT_SOURCE_LINES_FILENAME)
|
||||
{
|
||||
ui_out_text (uiout, s->filename);
|
||||
ui_out_text (uiout, symtab_to_filename_for_display (s));
|
||||
ui_out_text (uiout, ":");
|
||||
}
|
||||
xsnprintf (buf, sizeof (buf), "%d\t", current_source_line++);
|
||||
@ -1502,7 +1504,8 @@ line_info (char *arg, int from_tty)
|
||||
if (start_pc == end_pc)
|
||||
{
|
||||
printf_filtered ("Line %d of \"%s\"",
|
||||
sal.line, sal.symtab->filename);
|
||||
sal.line,
|
||||
symtab_to_filename_for_display (sal.symtab));
|
||||
wrap_here (" ");
|
||||
printf_filtered (" is at address ");
|
||||
print_address (gdbarch, start_pc, gdb_stdout);
|
||||
@ -1512,7 +1515,8 @@ line_info (char *arg, int from_tty)
|
||||
else
|
||||
{
|
||||
printf_filtered ("Line %d of \"%s\"",
|
||||
sal.line, sal.symtab->filename);
|
||||
sal.line,
|
||||
symtab_to_filename_for_display (sal.symtab));
|
||||
wrap_here (" ");
|
||||
printf_filtered (" starts at address ");
|
||||
print_address (gdbarch, start_pc, gdb_stdout);
|
||||
@ -1538,7 +1542,7 @@ line_info (char *arg, int from_tty)
|
||||
which the user would want to see? If we have debugging symbols
|
||||
and no line numbers? */
|
||||
printf_filtered (_("Line number %d is out of range for \"%s\".\n"),
|
||||
sal.line, sal.symtab->filename);
|
||||
sal.line, symtab_to_filename_for_display (sal.symtab));
|
||||
}
|
||||
do_cleanups (cleanups);
|
||||
}
|
||||
@ -1566,7 +1570,7 @@ forward_search_command (char *regex, int from_tty)
|
||||
|
||||
desc = open_source_file (current_source_symtab);
|
||||
if (desc < 0)
|
||||
perror_with_name (current_source_symtab->filename);
|
||||
perror_with_name (symtab_to_filename_for_display (current_source_symtab));
|
||||
cleanups = make_cleanup_close (desc);
|
||||
|
||||
if (current_source_symtab->line_charpos == 0)
|
||||
@ -1576,7 +1580,7 @@ forward_search_command (char *regex, int from_tty)
|
||||
error (_("Expression not found"));
|
||||
|
||||
if (lseek (desc, current_source_symtab->line_charpos[line - 1], 0) < 0)
|
||||
perror_with_name (current_source_symtab->filename);
|
||||
perror_with_name (symtab_to_filename_for_display (current_source_symtab));
|
||||
|
||||
discard_cleanups (cleanups);
|
||||
stream = fdopen (desc, FDOPEN_MODE);
|
||||
@ -1655,7 +1659,7 @@ reverse_search_command (char *regex, int from_tty)
|
||||
|
||||
desc = open_source_file (current_source_symtab);
|
||||
if (desc < 0)
|
||||
perror_with_name (current_source_symtab->filename);
|
||||
perror_with_name (symtab_to_filename_for_display (current_source_symtab));
|
||||
cleanups = make_cleanup_close (desc);
|
||||
|
||||
if (current_source_symtab->line_charpos == 0)
|
||||
@ -1665,7 +1669,7 @@ reverse_search_command (char *regex, int from_tty)
|
||||
error (_("Expression not found"));
|
||||
|
||||
if (lseek (desc, current_source_symtab->line_charpos[line - 1], 0) < 0)
|
||||
perror_with_name (current_source_symtab->filename);
|
||||
perror_with_name (symtab_to_filename_for_display (current_source_symtab));
|
||||
|
||||
discard_cleanups (cleanups);
|
||||
stream = fdopen (desc, FDOPEN_MODE);
|
||||
@ -1708,8 +1712,11 @@ reverse_search_command (char *regex, int from_tty)
|
||||
line--;
|
||||
if (fseek (stream, current_source_symtab->line_charpos[line - 1], 0) < 0)
|
||||
{
|
||||
const char *filename;
|
||||
|
||||
do_cleanups (cleanups);
|
||||
perror_with_name (current_source_symtab->filename);
|
||||
filename = symtab_to_filename_for_display (current_source_symtab);
|
||||
perror_with_name (filename);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user