08feed99cb
This changes get_objfile_arch to be a new inline method, objfile::arch. To my surprise, this function came up while profiling DWARF psymbol reading. Making this change improved performance from 1.986 seconds to 1.869 seconds. Both measurements were done by taking the mean of 10 runs on a fixed copy of the gdb executable. gdb/ChangeLog 2020-04-18 Tom Tromey <tom@tromey.com> * xcoffread.c (enter_line_range, scan_xcoff_symtab): Update. * value.c (value_fn_field): Update. * valops.c (find_function_in_inferior) (value_allocate_space_in_inferior): Update. * tui/tui-winsource.c (tui_update_source_windows_with_line): Update. * tui/tui-source.c (tui_source_window::set_contents): Update. * symtab.c (lookup_global_or_static_symbol) (find_function_start_sal_1, skip_prologue_sal) (print_msymbol_info, find_gnu_ifunc, symbol_arch): Update. * symmisc.c (dump_msymbols, dump_symtab_1) (maintenance_print_one_line_table): Update. * symfile.c (init_entry_point_info, section_is_mapped) (list_overlays_command, simple_read_overlay_table) (simple_overlay_update_1): Update. * stap-probe.c (handle_stap_probe): Update. * stabsread.c (dbx_init_float_type, define_symbol) (read_one_struct_field, read_enum_type, read_range_type): Update. * source.c (info_line_command): Update. * python/python.c (gdbpy_source_objfile_script) (gdbpy_execute_objfile_script): Update. * python/py-type.c (save_objfile_types): Update. * python/py-objfile.c (py_free_objfile): Update. * python/py-inferior.c (python_new_objfile): Update. * psymtab.c (psym_find_pc_sect_compunit_symtab, dump_psymtab) (dump_psymtab_addrmap_1, maintenance_info_psymtabs) (maintenance_check_psymtabs): Update. * printcmd.c (info_address_command): Update. * objfiles.h (struct objfile) <arch>: New method, from get_objfile_arch. (get_objfile_arch): Don't declare. * objfiles.c (get_objfile_arch): Remove. (filter_overlapping_sections): Update. * minsyms.c (msymbol_is_function): Update. * mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines) (output_nondebug_symbol): Update. * mdebugread.c (parse_symbol, basic_type, parse_partial_symbols) (mdebug_expand_psymtab): Update. * machoread.c (macho_add_oso_symfile): Update. * linux-tdep.c (linux_infcall_mmap, linux_infcall_munmap): Update. * linux-fork.c (checkpoint_command): Update. * linespec.c (convert_linespec_to_sals): Update. * jit.c (finalize_symtab): Update. * infrun.c (insert_exception_resume_from_probe): Update. * ia64-tdep.c (ia64_find_unwind_table): Update. * hppa-tdep.c (internalize_unwinds): Update. * gdbtypes.c (get_type_arch, init_float_type, objfile_type): Update. * gcore.c (call_target_sbrk): Update. * elfread.c (record_minimal_symbol, elf_symtab_read) (elf_rel_plt_read, elf_gnu_ifunc_record_cache) (elf_gnu_ifunc_resolve_by_got): Update. * dwarf2/read.c (create_addrmap_from_index) (create_addrmap_from_aranges, dw2_find_pc_sect_compunit_symtab) (read_debug_names_from_section) (process_psymtab_comp_unit_reader, add_partial_symbol) (add_partial_subprogram, process_full_comp_unit) (read_file_scope, read_func_scope, read_lexical_block_scope) (read_call_site_scope, dwarf2_ranges_read) (dwarf2_record_block_ranges, dwarf2_add_field) (mark_common_block_symbol_computed, read_tag_pointer_type) (read_tag_string_type, dwarf2_init_float_type) (dwarf2_init_complex_target_type, read_base_type) (partial_die_info::read, partial_die_info::read) (read_attribute_value, dwarf_decode_lines_1, new_symbol) (dwarf2_fetch_die_loc_sect_off): Update. * dwarf2/loc.c (dwarf2_find_location_expression) (class dwarf_evaluate_loc_desc, rw_pieced_value) (dwarf2_evaluate_loc_desc_full, dwarf2_locexpr_baton_eval) (dwarf2_loc_desc_get_symbol_read_needs) (locexpr_describe_location_piece, locexpr_describe_location_1) (loclist_describe_location): Update. * dwarf2/index-write.c (write_debug_names): Update. * dwarf2/frame.c (dwarf2_build_frame_info): Update. * dtrace-probe.c (dtrace_process_dof): Update. * dbxread.c (read_dbx_symtab, dbx_end_psymtab) (process_one_symbol): Update. * ctfread.c (ctf_init_float_type, read_base_type): Update. * coffread.c (coff_symtab_read, enter_linenos, decode_base_type) (coff_read_enum_type): Update. * cli/cli-cmds.c (edit_command, list_command): Update. * buildsym.c (buildsym_compunit::finish_block_internal): Update. * breakpoint.c (create_overlay_event_breakpoint) (create_longjmp_master_breakpoint) (create_std_terminate_master_breakpoint) (create_exception_master_breakpoint, get_sal_arch): Update. * block.c (block_gdbarch): Update. * annotate.c (annotate_source_line): Update.
526 lines
12 KiB
C
526 lines
12 KiB
C
/* TUI display source/assembly window.
|
|
|
|
Copyright (C) 1998-2020 Free Software Foundation, Inc.
|
|
|
|
Contributed by Hewlett-Packard 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 <ctype.h>
|
|
#include "symtab.h"
|
|
#include "frame.h"
|
|
#include "breakpoint.h"
|
|
#include "value.h"
|
|
#include "source.h"
|
|
#include "objfiles.h"
|
|
#include "filenames.h"
|
|
|
|
#include "tui/tui.h"
|
|
#include "tui/tui-data.h"
|
|
#include "tui/tui-io.h"
|
|
#include "tui/tui-stack.h"
|
|
#include "tui/tui-win.h"
|
|
#include "tui/tui-wingeneral.h"
|
|
#include "tui/tui-winsource.h"
|
|
#include "tui/tui-source.h"
|
|
#include "tui/tui-disasm.h"
|
|
#include "gdb_curses.h"
|
|
|
|
/* Function to display the "main" routine. */
|
|
void
|
|
tui_display_main ()
|
|
{
|
|
auto adapter = tui_source_windows ();
|
|
if (adapter.begin () != adapter.end ())
|
|
{
|
|
struct gdbarch *gdbarch;
|
|
CORE_ADDR addr;
|
|
|
|
tui_get_begin_asm_address (&gdbarch, &addr);
|
|
if (addr != (CORE_ADDR) 0)
|
|
{
|
|
struct symtab *s;
|
|
|
|
tui_update_source_windows_with_addr (gdbarch, addr);
|
|
s = find_pc_line_symtab (addr);
|
|
tui_update_locator_fullname (s);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* See tui-winsource.h. */
|
|
|
|
std::string
|
|
tui_copy_source_line (const char **ptr, int line_no, int first_col,
|
|
int line_width, int ndigits)
|
|
{
|
|
const char *lineptr = *ptr;
|
|
|
|
/* Init the line with the line number. */
|
|
std::string result;
|
|
|
|
if (line_no > 0)
|
|
{
|
|
if (ndigits > 0)
|
|
result = string_printf ("%*d ", ndigits, line_no);
|
|
else
|
|
{
|
|
result = string_printf ("%-6d", line_no);
|
|
int len = result.size ();
|
|
len = len - ((len / tui_tab_width) * tui_tab_width);
|
|
result.append (len, ' ');
|
|
}
|
|
}
|
|
|
|
int column = 0;
|
|
char c;
|
|
do
|
|
{
|
|
int skip_bytes;
|
|
|
|
c = *lineptr;
|
|
if (c == '\033' && skip_ansi_escape (lineptr, &skip_bytes))
|
|
{
|
|
/* We always have to preserve escapes. */
|
|
result.append (lineptr, lineptr + skip_bytes);
|
|
lineptr += skip_bytes;
|
|
continue;
|
|
}
|
|
if (c == '\0')
|
|
break;
|
|
|
|
++lineptr;
|
|
++column;
|
|
|
|
auto process_tab = [&] ()
|
|
{
|
|
int max_tab_len = tui_tab_width;
|
|
|
|
--column;
|
|
for (int j = column % max_tab_len;
|
|
j < max_tab_len && column < first_col + line_width;
|
|
column++, j++)
|
|
if (column >= first_col)
|
|
result.push_back (' ');
|
|
};
|
|
|
|
/* We have to process all the text in order to pick up all the
|
|
escapes. */
|
|
if (column <= first_col || column > first_col + line_width)
|
|
{
|
|
if (c == '\t')
|
|
process_tab ();
|
|
continue;
|
|
}
|
|
|
|
if (c == '\n' || c == '\r' || c == '\0')
|
|
{
|
|
/* Nothing. */
|
|
}
|
|
else if (c < 040 && c != '\t')
|
|
{
|
|
result.push_back ('^');
|
|
result.push_back (c + 0100);
|
|
}
|
|
else if (c == 0177)
|
|
{
|
|
result.push_back ('^');
|
|
result.push_back ('?');
|
|
}
|
|
else if (c == '\t')
|
|
process_tab ();
|
|
else
|
|
result.push_back (c);
|
|
}
|
|
while (c != '\0' && c != '\n' && c != '\r');
|
|
|
|
if (c == '\r' && *lineptr == '\n')
|
|
++lineptr;
|
|
*ptr = lineptr;
|
|
|
|
return result;
|
|
}
|
|
|
|
void
|
|
tui_source_window_base::style_changed ()
|
|
{
|
|
if (tui_active && is_visible ())
|
|
refill ();
|
|
}
|
|
|
|
/* Function to display source in the source window. This function
|
|
initializes the horizontal scroll to 0. */
|
|
void
|
|
tui_source_window_base::update_source_window
|
|
(struct gdbarch *gdbarch,
|
|
const struct symtab_and_line &sal)
|
|
{
|
|
m_horizontal_offset = 0;
|
|
update_source_window_as_is (gdbarch, sal);
|
|
}
|
|
|
|
|
|
/* Function to display source in the source/asm window. This function
|
|
shows the source as specified by the horizontal offset. */
|
|
void
|
|
tui_source_window_base::update_source_window_as_is
|
|
(struct gdbarch *gdbarch,
|
|
const struct symtab_and_line &sal)
|
|
{
|
|
bool ret = set_contents (gdbarch, sal);
|
|
|
|
if (!ret)
|
|
erase_source_content ();
|
|
else
|
|
{
|
|
update_breakpoint_info (nullptr, false);
|
|
show_source_content ();
|
|
update_exec_info ();
|
|
}
|
|
}
|
|
|
|
|
|
/* Function to ensure that the source and/or disassemly windows
|
|
reflect the input address. */
|
|
void
|
|
tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr)
|
|
{
|
|
struct symtab_and_line sal {};
|
|
if (addr != 0)
|
|
sal = find_pc_line (addr, 0);
|
|
|
|
for (struct tui_source_window_base *win_info : tui_source_windows ())
|
|
win_info->update_source_window (gdbarch, sal);
|
|
}
|
|
|
|
/* Function to ensure that the source and/or disassembly windows
|
|
reflect the symtab and line. */
|
|
void
|
|
tui_update_source_windows_with_line (struct symtab_and_line sal)
|
|
{
|
|
struct gdbarch *gdbarch = nullptr;
|
|
if (sal.symtab != nullptr)
|
|
{
|
|
find_line_pc (sal.symtab, sal.line, &sal.pc);
|
|
gdbarch = SYMTAB_OBJFILE (sal.symtab)->arch ();
|
|
}
|
|
|
|
for (struct tui_source_window_base *win_info : tui_source_windows ())
|
|
win_info->update_source_window (gdbarch, sal);
|
|
}
|
|
|
|
void
|
|
tui_source_window_base::do_erase_source_content (const char *str)
|
|
{
|
|
int x_pos;
|
|
int half_width = (width - 2) / 2;
|
|
|
|
m_content.clear ();
|
|
if (handle != NULL)
|
|
{
|
|
werase (handle.get ());
|
|
check_and_display_highlight_if_needed ();
|
|
|
|
if (strlen (str) >= half_width)
|
|
x_pos = 1;
|
|
else
|
|
x_pos = half_width - strlen (str);
|
|
mvwaddstr (handle.get (),
|
|
(height / 2),
|
|
x_pos,
|
|
(char *) str);
|
|
|
|
refresh_window ();
|
|
}
|
|
}
|
|
|
|
|
|
/* Redraw the complete line of a source or disassembly window. */
|
|
void
|
|
tui_source_window_base::show_source_line (int lineno)
|
|
{
|
|
struct tui_source_element *line;
|
|
int x;
|
|
|
|
line = &m_content[lineno - 1];
|
|
if (line->is_exec_point)
|
|
tui_set_reverse_mode (handle.get (), true);
|
|
|
|
wmove (handle.get (), lineno, TUI_EXECINFO_SIZE);
|
|
tui_puts (line->line.c_str (), handle.get ());
|
|
if (line->is_exec_point)
|
|
tui_set_reverse_mode (handle.get (), false);
|
|
|
|
/* Clear to end of line but stop before the border. */
|
|
x = getcurx (handle.get ());
|
|
while (x + 1 < width)
|
|
{
|
|
waddch (handle.get (), ' ');
|
|
x = getcurx (handle.get ());
|
|
}
|
|
}
|
|
|
|
void
|
|
tui_source_window_base::show_source_content ()
|
|
{
|
|
gdb_assert (!m_content.empty ());
|
|
|
|
for (int lineno = 1; lineno <= m_content.size (); lineno++)
|
|
show_source_line (lineno);
|
|
|
|
check_and_display_highlight_if_needed ();
|
|
refresh_window ();
|
|
}
|
|
|
|
tui_source_window_base::tui_source_window_base ()
|
|
{
|
|
m_start_line_or_addr.loa = LOA_ADDRESS;
|
|
m_start_line_or_addr.u.addr = 0;
|
|
|
|
gdb::observers::source_styling_changed.attach
|
|
(std::bind (&tui_source_window::style_changed, this),
|
|
m_observable);
|
|
}
|
|
|
|
tui_source_window_base::~tui_source_window_base ()
|
|
{
|
|
gdb::observers::source_styling_changed.detach (m_observable);
|
|
}
|
|
|
|
/* See tui-data.h. */
|
|
|
|
void
|
|
tui_source_window_base::update_tab_width ()
|
|
{
|
|
werase (handle.get ());
|
|
rerender ();
|
|
}
|
|
|
|
void
|
|
tui_source_window_base::rerender ()
|
|
{
|
|
if (!m_content.empty ())
|
|
{
|
|
struct symtab_and_line cursal
|
|
= get_current_source_symtab_and_line ();
|
|
|
|
if (m_start_line_or_addr.loa == LOA_LINE)
|
|
cursal.line = m_start_line_or_addr.u.line_no;
|
|
else
|
|
cursal.pc = m_start_line_or_addr.u.addr;
|
|
update_source_window (m_gdbarch, cursal);
|
|
}
|
|
else if (deprecated_safe_get_selected_frame () != NULL)
|
|
{
|
|
struct symtab_and_line cursal
|
|
= get_current_source_symtab_and_line ();
|
|
struct frame_info *frame = deprecated_safe_get_selected_frame ();
|
|
struct gdbarch *gdbarch = get_frame_arch (frame);
|
|
|
|
struct symtab *s = find_pc_line_symtab (get_frame_pc (frame));
|
|
if (this != TUI_SRC_WIN)
|
|
find_line_pc (s, cursal.line, &cursal.pc);
|
|
update_source_window (gdbarch, cursal);
|
|
}
|
|
else
|
|
erase_source_content ();
|
|
}
|
|
|
|
/* See tui-data.h. */
|
|
|
|
void
|
|
tui_source_window_base::refill ()
|
|
{
|
|
symtab_and_line sal {};
|
|
|
|
if (this == TUI_SRC_WIN)
|
|
{
|
|
sal = get_current_source_symtab_and_line ();
|
|
if (sal.symtab == NULL)
|
|
{
|
|
struct frame_info *fi = deprecated_safe_get_selected_frame ();
|
|
if (fi != nullptr)
|
|
sal = find_pc_line (get_frame_pc (fi), 0);
|
|
}
|
|
}
|
|
|
|
if (sal.pspace == nullptr)
|
|
sal.pspace = current_program_space;
|
|
|
|
if (m_start_line_or_addr.loa == LOA_LINE)
|
|
sal.line = m_start_line_or_addr.u.line_no;
|
|
else
|
|
sal.pc = m_start_line_or_addr.u.addr;
|
|
|
|
update_source_window_as_is (m_gdbarch, sal);
|
|
}
|
|
|
|
/* Scroll the source forward or backward horizontally. */
|
|
|
|
void
|
|
tui_source_window_base::do_scroll_horizontal (int num_to_scroll)
|
|
{
|
|
if (!m_content.empty ())
|
|
{
|
|
int offset = m_horizontal_offset + num_to_scroll;
|
|
if (offset < 0)
|
|
offset = 0;
|
|
m_horizontal_offset = offset;
|
|
refill ();
|
|
}
|
|
}
|
|
|
|
|
|
/* Set or clear the is_exec_point flag in the line whose line is
|
|
line_no. */
|
|
|
|
void
|
|
tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l)
|
|
{
|
|
bool changed = false;
|
|
int i;
|
|
|
|
i = 0;
|
|
while (i < m_content.size ())
|
|
{
|
|
bool new_state;
|
|
struct tui_line_or_address content_loa =
|
|
m_content[i].line_or_addr;
|
|
|
|
if (content_loa.loa == l.loa
|
|
&& ((l.loa == LOA_LINE && content_loa.u.line_no == l.u.line_no)
|
|
|| (l.loa == LOA_ADDRESS && content_loa.u.addr == l.u.addr)))
|
|
new_state = true;
|
|
else
|
|
new_state = false;
|
|
if (new_state != m_content[i].is_exec_point)
|
|
{
|
|
changed = true;
|
|
m_content[i].is_exec_point = new_state;
|
|
show_source_line (i + 1);
|
|
}
|
|
i++;
|
|
}
|
|
if (changed)
|
|
refill ();
|
|
}
|
|
|
|
/* See tui-winsource.h. */
|
|
|
|
void
|
|
tui_update_all_breakpoint_info (struct breakpoint *being_deleted)
|
|
{
|
|
for (tui_source_window_base *win : tui_source_windows ())
|
|
{
|
|
if (win->update_breakpoint_info (being_deleted, false))
|
|
win->update_exec_info ();
|
|
}
|
|
}
|
|
|
|
|
|
/* Scan the source window and the breakpoints to update the break_mode
|
|
information for each line.
|
|
|
|
Returns true if something changed and the execution window must be
|
|
refreshed. */
|
|
|
|
bool
|
|
tui_source_window_base::update_breakpoint_info
|
|
(struct breakpoint *being_deleted, bool current_only)
|
|
{
|
|
int i;
|
|
bool need_refresh = false;
|
|
|
|
for (i = 0; i < m_content.size (); i++)
|
|
{
|
|
struct tui_source_element *line;
|
|
|
|
line = &m_content[i];
|
|
if (current_only && !line->is_exec_point)
|
|
continue;
|
|
|
|
/* Scan each breakpoint to see if the current line has something to
|
|
do with it. Identify enable/disabled breakpoints as well as
|
|
those that we already hit. */
|
|
tui_bp_flags mode = 0;
|
|
iterate_over_breakpoints ([&] (breakpoint *bp) -> bool
|
|
{
|
|
struct bp_location *loc;
|
|
|
|
if (bp == being_deleted)
|
|
return false;
|
|
|
|
for (loc = bp->loc; loc != NULL; loc = loc->next)
|
|
{
|
|
if (location_matches_p (loc, i))
|
|
{
|
|
if (bp->enable_state == bp_disabled)
|
|
mode |= TUI_BP_DISABLED;
|
|
else
|
|
mode |= TUI_BP_ENABLED;
|
|
if (bp->hit_count)
|
|
mode |= TUI_BP_HIT;
|
|
if (bp->loc->cond)
|
|
mode |= TUI_BP_CONDITIONAL;
|
|
if (bp->type == bp_hardware_breakpoint)
|
|
mode |= TUI_BP_HARDWARE;
|
|
}
|
|
}
|
|
return false;
|
|
});
|
|
if (line->break_mode != mode)
|
|
{
|
|
line->break_mode = mode;
|
|
need_refresh = true;
|
|
}
|
|
}
|
|
return need_refresh;
|
|
}
|
|
|
|
/* Function to initialize the content of the execution info window,
|
|
based upon the input window which is either the source or
|
|
disassembly window. */
|
|
void
|
|
tui_source_window_base::update_exec_info ()
|
|
{
|
|
update_breakpoint_info (nullptr, true);
|
|
for (int i = 0; i < m_content.size (); i++)
|
|
{
|
|
struct tui_source_element *src_element = &m_content[i];
|
|
char element[TUI_EXECINFO_SIZE] = " ";
|
|
|
|
/* Now update the exec info content based upon the state
|
|
of each line as indicated by the source content. */
|
|
tui_bp_flags mode = src_element->break_mode;
|
|
if (mode & TUI_BP_HIT)
|
|
element[TUI_BP_HIT_POS] = (mode & TUI_BP_HARDWARE) ? 'H' : 'B';
|
|
else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED))
|
|
element[TUI_BP_HIT_POS] = (mode & TUI_BP_HARDWARE) ? 'h' : 'b';
|
|
|
|
if (mode & TUI_BP_ENABLED)
|
|
element[TUI_BP_BREAK_POS] = '+';
|
|
else if (mode & TUI_BP_DISABLED)
|
|
element[TUI_BP_BREAK_POS] = '-';
|
|
|
|
if (src_element->is_exec_point)
|
|
element[TUI_EXEC_POS] = '>';
|
|
|
|
mvwaddstr (handle.get (), i + 1, 1, element);
|
|
}
|
|
refresh_window ();
|
|
}
|