/* TUI display source/assembly window.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
tui_update_source_windows_with_addr (gdbarch, addr);
s = find_pc_line_symtab (addr);
- if (s != NULL)
- tui_update_locator_fullname (symtab_to_fullname (s));
- else
- tui_update_locator_fullname ("??");
+ 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,
- struct symtab *s,
- struct tui_line_or_address line_or_addr)
+ const struct symtab_and_line &sal)
{
horizontal_offset = 0;
- update_source_window_as_is (gdbarch, s, line_or_addr);
+ update_source_window_as_is (gdbarch, sal);
}
void
tui_source_window_base::update_source_window_as_is
(struct gdbarch *gdbarch,
- struct symtab *s,
- struct tui_line_or_address line_or_addr)
+ const struct symtab_and_line &sal)
{
- enum tui_status ret
- = set_contents (gdbarch, s, line_or_addr);
+ bool ret = set_contents (gdbarch, sal);
- if (ret == TUI_FAILURE)
+ if (!ret)
erase_source_content ();
else
{
update_breakpoint_info (nullptr, false);
show_source_content ();
update_exec_info ();
- if (type == SRC_WIN)
- {
- symtab_and_line sal;
-
- sal.line = line_or_addr.u.line_no + (content.size () - 2);
- sal.symtab = s;
- sal.pspace = SYMTAB_PSPACE (s);
- set_current_source_symtab_and_line (sal);
- /* If the focus was in the asm win, put it in the src win if
- we don't have a split layout. */
- if (tui_win_with_focus () == TUI_DISASM_WIN
- && tui_current_layout () != SRC_DISASSEM_COMMAND)
- tui_set_win_focus_to (this);
- }
}
}
void
tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr)
{
+ struct symtab_and_line sal {};
if (addr != 0)
- {
- struct symtab_and_line sal;
- struct tui_line_or_address l;
-
- switch (tui_current_layout ())
- {
- case DISASSEM_COMMAND:
- case DISASSEM_DATA_COMMAND:
- tui_show_disassem (gdbarch, addr);
- break;
- case SRC_DISASSEM_COMMAND:
- tui_show_disassem_and_update_source (gdbarch, addr);
- break;
- default:
- sal = find_pc_line (addr, 0);
- l.loa = LOA_LINE;
- l.u.line_no = sal.line;
- TUI_SRC_WIN->show_symtab_source (gdbarch, sal.symtab, l);
- break;
- }
- }
- else
- {
- for (struct tui_source_window_base *win_info : tui_source_windows ())
- win_info->erase_source_content ();
- }
+ 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 disassemly windows
- reflect the input address. */
+/* Function to ensure that the source and/or disassembly windows
+ reflect the symtab and line. */
void
-tui_update_source_windows_with_line (struct symtab *s, int line)
+tui_update_source_windows_with_line (struct symtab_and_line sal)
{
- struct gdbarch *gdbarch;
- CORE_ADDR pc;
- struct tui_line_or_address l;
-
- if (!s)
+ if (!sal.symtab)
return;
- gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s));
+ find_line_pc (sal.symtab, sal.line, &sal.pc);
+ struct gdbarch *gdbarch = get_objfile_arch (SYMTAB_OBJFILE (sal.symtab));
- switch (tui_current_layout ())
- {
- case DISASSEM_COMMAND:
- case DISASSEM_DATA_COMMAND:
- find_line_pc (s, line, &pc);
- tui_update_source_windows_with_addr (gdbarch, pc);
- break;
- default:
- l.loa = LOA_LINE;
- l.u.line_no = line;
- TUI_SRC_WIN->show_symtab_source (gdbarch, s, l);
- if (tui_current_layout () == SRC_DISASSEM_COMMAND)
- {
- find_line_pc (s, line, &pc);
- tui_show_disassem (gdbarch, pc);
- }
- break;
- }
+ for (struct tui_source_window_base *win_info : tui_source_windows ())
+ win_info->update_source_window (gdbarch, sal);
}
void
content.clear ();
if (handle != NULL)
{
- werase (handle);
+ 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,
+ mvwaddstr (handle.get (),
(height / 2),
x_pos,
(char *) str);
line = &win_info->content[lineno - 1];
if (line->is_exec_point)
- tui_set_reverse_mode (win_info->handle, true);
+ tui_set_reverse_mode (win_info->handle.get (), true);
- wmove (win_info->handle, lineno, TUI_EXECINFO_SIZE);
- tui_puts (line->line.get (), win_info->handle);
+ wmove (win_info->handle.get (), lineno, TUI_EXECINFO_SIZE);
+ tui_puts (line->line.c_str (), win_info->handle.get ());
if (line->is_exec_point)
- tui_set_reverse_mode (win_info->handle, false);
+ tui_set_reverse_mode (win_info->handle.get (), false);
/* Clear to end of line but stop before the border. */
- x = getcurx (win_info->handle);
+ x = getcurx (win_info->handle.get ());
while (x + 1 < win_info->width)
{
- waddch (win_info->handle, ' ');
- x = getcurx (win_info->handle);
+ waddch (win_info->handle.get (), ' ');
+ x = getcurx (win_info->handle.get ());
}
}
gdb_assert (type == SRC_WIN || type == DISASSEM_WIN);
start_line_or_addr.loa = LOA_ADDRESS;
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);
+ werase (handle.get ());
rerender ();
}
{
if (!content.empty ())
{
- struct tui_line_or_address line_or_addr;
struct symtab_and_line cursal
= get_current_source_symtab_and_line ();
- line_or_addr = start_line_or_addr;
- update_source_window (gdbarch, cursal.symtab, line_or_addr);
+ if (start_line_or_addr.loa == LOA_LINE)
+ cursal.line = start_line_or_addr.u.line_no;
+ else
+ cursal.pc = start_line_or_addr.u.addr;
+ update_source_window (gdbarch, cursal);
}
else if (deprecated_safe_get_selected_frame () != NULL)
{
- struct tui_line_or_address line;
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 (type == SRC_WIN)
- {
- line.loa = LOA_LINE;
- line.u.line_no = cursal.line;
- }
- else
- {
- line.loa = LOA_ADDRESS;
- find_line_pc (s, cursal.line, &line.u.addr);
- }
- update_source_window (gdbarch, s, line);
+ if (type != SRC_WIN)
+ find_line_pc (s, cursal.line, &cursal.pc);
+ update_source_window (gdbarch, cursal);
}
else
erase_source_content ();
void
tui_source_window_base::refill ()
{
- symtab *s = nullptr;
+ symtab_and_line sal {};
if (type == SRC_WIN)
{
- symtab_and_line cursal = get_current_source_symtab_and_line ();
- s = (cursal.symtab == NULL
- ? find_pc_line_symtab (get_frame_pc (get_selected_frame (NULL)))
- : cursal.symtab);
+ 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);
+ }
}
- update_source_window_as_is (gdbarch, s, content[0].line_or_addr);
+ if (sal.pspace == nullptr)
+ sal.pspace = current_program_space;
+
+ if (start_line_or_addr.loa == LOA_LINE)
+ sal.line = start_line_or_addr.u.line_no;
+ else
+ sal.pc = start_line_or_addr.u.addr;
+
+ update_source_window_as_is (gdbarch, sal);
}
/* Scroll the source forward or backward horizontally. */
struct tui_line_or_address content_loa =
content[i].line_or_addr;
- gdb_assert (l.loa == LOA_ADDRESS || l.loa == LOA_LINE);
- gdb_assert (content_loa.loa == LOA_LINE
- || content_loa.loa == LOA_ADDRESS);
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)))
for (i = 0; i < content.size (); i++)
{
- struct breakpoint *bp;
- extern struct breakpoint *breakpoint_chain;
struct tui_source_element *line;
line = &content[i];
do with it. Identify enable/disabled breakpoints as well as
those that we already hit. */
tui_bp_flags mode = 0;
- for (bp = breakpoint_chain;
- bp != NULL;
- bp = bp->next)
+ iterate_over_breakpoints ([&] (breakpoint *bp) -> bool
{
struct bp_location *loc;
- gdb_assert (line->line_or_addr.loa == LOA_LINE
- || line->line_or_addr.loa == LOA_ADDRESS);
-
if (bp == being_deleted)
- continue;
+ return false;
for (loc = bp->loc; loc != NULL; loc = loc->next)
{
mode |= TUI_BP_HARDWARE;
}
}
- }
+ return false;
+ });
if (line->break_mode != mode)
{
line->break_mode = mode;
if (src_element->is_exec_point)
element[TUI_EXEC_POS] = '>';
- mvwaddstr (handle, i + 1, 1, element);
+ mvwaddstr (handle.get (), i + 1, 1, element);
}
refresh_window ();
}
projects / deliverable / binutils-gdb.git / blobdiff