/* TUI display source/assembly window.
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
- Foundation, Inc.
+ Copyright (C) 1998-2019 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
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 2 of the License, or
+ 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,
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, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include <ctype.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"
-
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#ifdef HAVE_CURSES_H
-#include <curses.h>
-#endif
-#endif
+#include "gdb_curses.h"
/* Function to display the "main" routine. */
void
-tui_display_main (void)
+tui_display_main ()
{
- if ((tui_source_windows ())->count > 0)
+ if (!tui_source_windows ().empty ())
{
+ struct gdbarch *gdbarch;
CORE_ADDR addr;
- addr = tui_get_begin_asm_address ();
+ tui_get_begin_asm_address (&gdbarch, &addr);
if (addr != (CORE_ADDR) 0)
{
- struct symtab_and_line sal;
+ struct symtab *s;
- tui_update_source_windows_with_addr (addr);
- sal = find_pc_line (addr, 0);
- if (sal.symtab)
- tui_update_locator_filename (sal.symtab->filename);
+ 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_filename ("??");
+ tui_update_locator_fullname ("??");
}
}
}
/* Function to display source in the source window. This function
initializes the horizontal scroll to 0. */
void
-tui_update_source_window (struct tui_win_info * win_info, struct symtab *s,
- union tui_line_or_address lineOrAddr, int noerror)
+tui_update_source_window (struct tui_source_window_base *win_info,
+ struct gdbarch *gdbarch,
+ struct symtab *s,
+ struct tui_line_or_address line_or_addr,
+ int noerror)
{
- win_info->detail.source_info.horizontal_offset = 0;
- tui_update_source_window_as_is (win_info, s, lineOrAddr, noerror);
-
- return;
+ win_info->horizontal_offset = 0;
+ tui_update_source_window_as_is (win_info, gdbarch, s, line_or_addr, noerror);
}
/* Function to display source in the source/asm window. This function
shows the source as specified by the horizontal offset. */
void
-tui_update_source_window_as_is (struct tui_win_info * win_info, struct symtab *s,
- union tui_line_or_address lineOrAddr, int noerror)
+tui_update_source_window_as_is (struct tui_source_window_base *win_info,
+ struct gdbarch *gdbarch,
+ struct symtab *s,
+ struct tui_line_or_address line_or_addr,
+ int noerror)
{
enum tui_status ret;
- if (win_info->generic.type == SRC_WIN)
- ret = tui_set_source_content (s, lineOrAddr.line_no, noerror);
+ if (win_info->type == SRC_WIN)
+ ret = tui_set_source_content (win_info, s, line_or_addr.u.line_no,
+ noerror);
else
- ret = tui_set_disassem_content (lineOrAddr.addr);
+ ret = tui_set_disassem_content (win_info, gdbarch, line_or_addr.u.addr);
if (ret == TUI_FAILURE)
{
- tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
+ tui_clear_source_content (win_info);
tui_clear_exec_info_content (win_info);
}
else
{
- tui_update_breakpoint_info (win_info, 0);
+ tui_update_breakpoint_info (win_info, nullptr, false);
tui_show_source_content (win_info);
tui_update_exec_info (win_info);
- if (win_info->generic.type == SRC_WIN)
+ if (win_info->type == SRC_WIN)
{
- struct symtab_and_line sal;
-
- sal.line = lineOrAddr.line_no +
- (win_info->generic.content_size - 2);
+ symtab_and_line sal;
+
+ sal.line = line_or_addr.u.line_no +
+ (win_info->content.size () - 2);
sal.symtab = 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 (TUI_SRC_WIN);
+ 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 (win_info);
}
}
-
-
- return;
}
/* Function to ensure that the source and/or disassemly windows
reflect the input address. */
void
-tui_update_source_windows_with_addr (CORE_ADDR addr)
+tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr)
{
if (addr != 0)
{
struct symtab_and_line sal;
- union tui_line_or_address l;
+ struct tui_line_or_address l;
switch (tui_current_layout ())
{
case DISASSEM_COMMAND:
case DISASSEM_DATA_COMMAND:
- tui_show_disassem (addr);
+ tui_show_disassem (gdbarch, addr);
break;
case SRC_DISASSEM_COMMAND:
- tui_show_disassem_and_update_source (addr);
+ tui_show_disassem_and_update_source (gdbarch, addr);
break;
default:
sal = find_pc_line (addr, 0);
- l.line_no = sal.line;
- tui_show_symtab_source (sal.symtab, l, FALSE);
+ l.loa = LOA_LINE;
+ l.u.line_no = sal.line;
+ tui_show_symtab_source (TUI_SRC_WIN, gdbarch, sal.symtab, l, FALSE);
break;
}
}
else
{
- int i;
-
- for (i = 0; i < (tui_source_windows ())->count; i++)
+ for (struct tui_source_window_base *win_info : tui_source_windows ())
{
- struct tui_win_info * win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
-
- tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
+ tui_clear_source_content (win_info);
tui_clear_exec_info_content (win_info);
}
}
-
- return;
-} /* tuiUpdateSourceWindowsWithAddr */
+}
/* Function to ensure that the source and/or disassemly windows
reflect the input address. */
void
tui_update_source_windows_with_line (struct symtab *s, int line)
{
+ struct gdbarch *gdbarch;
CORE_ADDR pc;
- union tui_line_or_address l;
-
+ struct tui_line_or_address l;
+
+ if (!s)
+ return;
+
+ gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s));
+
switch (tui_current_layout ())
{
case DISASSEM_COMMAND:
case DISASSEM_DATA_COMMAND:
find_line_pc (s, line, &pc);
- tui_update_source_windows_with_addr (pc);
+ tui_update_source_windows_with_addr (gdbarch, pc);
break;
default:
- l.line_no = line;
- tui_show_symtab_source (s, l, FALSE);
+ l.loa = LOA_LINE;
+ l.u.line_no = line;
+ tui_show_symtab_source (TUI_SRC_WIN, gdbarch, s, l, FALSE);
if (tui_current_layout () == SRC_DISASSEM_COMMAND)
{
find_line_pc (s, line, &pc);
- tui_show_disassem (pc);
+ tui_show_disassem (gdbarch, pc);
}
break;
}
-
- return;
}
void
-tui_clear_source_content (struct tui_win_info * win_info, int displayPrompt)
+tui_clear_source_content (struct tui_source_window_base *win_info)
{
if (win_info != NULL)
{
- register int i;
+ int i;
- win_info->generic.content_in_use = FALSE;
- tui_erase_source_content (win_info, displayPrompt);
- for (i = 0; i < win_info->generic.content_size; i++)
+ tui_erase_source_content (win_info);
+ for (i = 0; i < win_info->content.size (); i++)
{
- struct tui_win_element * element =
- (struct tui_win_element *) win_info->generic.content[i];
- element->which_element.source.has_break = FALSE;
- element->which_element.source.is_exec_point = FALSE;
+ struct tui_source_element *element = &win_info->content[i];
+
+ element->break_mode = 0;
+ element->is_exec_point = false;
}
}
-
- return;
-} /* tuiClearSourceContent */
+}
void
-tui_erase_source_content (struct tui_win_info * win_info, int displayPrompt)
+tui_erase_source_content (struct tui_source_window_base *win_info)
{
- int xPos;
- int halfWidth = (win_info->generic.width - 2) / 2;
+ int x_pos;
+ int half_width = (win_info->width - 2) / 2;
- if (win_info->generic.handle != (WINDOW *) NULL)
+ if (win_info->handle != NULL)
{
- werase (win_info->generic.handle);
- tui_check_and_display_highlight_if_needed (win_info);
- if (displayPrompt == EMPTY_SOURCE_PROMPT)
- {
- char *noSrcStr;
-
- if (win_info->generic.type == SRC_WIN)
- noSrcStr = NO_SRC_STRING;
- else
- noSrcStr = NO_DISASSEM_STRING;
- if (strlen (noSrcStr) >= halfWidth)
- xPos = 1;
- else
- xPos = halfWidth - strlen (noSrcStr);
- mvwaddstr (win_info->generic.handle,
- (win_info->generic.height / 2),
- xPos,
- noSrcStr);
-
- /* elz: added this function call to set the real contents of
- the window to what is on the screen, so that later calls
- to refresh, do display
- the correct stuff, and not the old image */
-
- tui_set_source_content_nil (win_info, noSrcStr);
- }
- tui_refresh_win (&win_info->generic);
+ werase (win_info->handle);
+ win_info->check_and_display_highlight_if_needed ();
+
+ const char *no_src_str;
+
+ if (win_info->type == SRC_WIN)
+ no_src_str = NO_SRC_STRING;
+ else
+ no_src_str = NO_DISASSEM_STRING;
+ if (strlen (no_src_str) >= half_width)
+ x_pos = 1;
+ else
+ x_pos = half_width - strlen (no_src_str);
+ mvwaddstr (win_info->handle,
+ (win_info->height / 2),
+ x_pos,
+ (char *) no_src_str);
+
+ win_info->content.clear ();
+ win_info->refresh_window ();
}
- return;
-} /* tuiEraseSourceContent */
+}
/* Redraw the complete line of a source or disassembly window. */
static void
-tui_show_source_line (struct tui_win_info * win_info, int lineno)
+tui_show_source_line (struct tui_source_window_base *win_info, int lineno)
{
- struct tui_win_element * line;
- int x, y;
+ struct tui_source_element *line;
+ int x;
- line = (struct tui_win_element *) win_info->generic.content[lineno - 1];
- if (line->which_element.source.is_exec_point)
- wattron (win_info->generic.handle, A_STANDOUT);
+ line = &win_info->content[lineno - 1];
+ if (line->is_exec_point)
+ tui_set_reverse_mode (win_info->handle, true);
- mvwaddstr (win_info->generic.handle, lineno, 1,
- line->which_element.source.line);
- if (line->which_element.source.is_exec_point)
- wattroff (win_info->generic.handle, A_STANDOUT);
+ wmove (win_info->handle, lineno, 1);
+ tui_puts (line->line,
+ win_info->handle);
+ if (line->is_exec_point)
+ tui_set_reverse_mode (win_info->handle, false);
/* Clear to end of line but stop before the border. */
- getyx (win_info->generic.handle, y, x);
- while (x + 1 < win_info->generic.width)
+ x = getcurx (win_info->handle);
+ while (x + 1 < win_info->width)
{
- waddch (win_info->generic.handle, ' ');
- getyx (win_info->generic.handle, y, x);
+ waddch (win_info->handle, ' ');
+ x = getcurx (win_info->handle);
}
}
void
-tui_show_source_content (struct tui_win_info * win_info)
+tui_show_source_content (struct tui_source_window_base *win_info)
{
- if (win_info->generic.content_size > 0)
+ if (!win_info->content.empty ())
{
int lineno;
- for (lineno = 1; lineno <= win_info->generic.content_size; lineno++)
+ for (lineno = 1; lineno <= win_info->content.size (); lineno++)
tui_show_source_line (win_info, lineno);
}
else
- tui_erase_source_content (win_info, TRUE);
+ tui_erase_source_content (win_info);
- tui_check_and_display_highlight_if_needed (win_info);
- tui_refresh_win (&win_info->generic);
- win_info->generic.content_in_use = TRUE;
+ win_info->check_and_display_highlight_if_needed ();
+ win_info->refresh_window ();
}
+/* See tui-data.h. */
+
+void
+tui_source_window_base::clear_detail ()
+{
+ gdbarch = NULL;
+ start_line_or_addr.loa = LOA_ADDRESS;
+ start_line_or_addr.u.addr = 0;
+ horizontal_offset = 0;
+}
+
+tui_source_window_base::tui_source_window_base (enum tui_win_type type)
+ : tui_win_info (type),
+ execution_info (new tui_exec_info_window ())
+{
+ gdb_assert (type == SRC_WIN || type == DISASSEM_WIN);
+ start_line_or_addr.loa = LOA_ADDRESS;
+ start_line_or_addr.u.addr = 0;
+}
+
+
+tui_source_window_base::~tui_source_window_base ()
+{
+ xfree (fullname);
+ delete execution_info;
+}
+
+void
+tui_source_window_base::reset (int height, int width,
+ int origin_x, int origin_y)
+{
+ tui_gen_win_info::reset (height, width - 3,
+ origin_x + 3, origin_y);
+ execution_info->reset (height, 3, origin_x, origin_y);
+}
+
+/* See tui-data.h. */
+
+void
+tui_source_window_base::refresh_all ()
+{
+ tui_show_source_content (this);
+ check_and_display_highlight_if_needed ();
+ tui_erase_exec_info_content (this);
+ tui_update_exec_info (this);
+}
+
+/* See tui-data.h. */
-/* Scroll the source forward or backward horizontally. */
void
-tui_horizontal_source_scroll (struct tui_win_info * win_info,
- enum tui_scroll_direction direction,
- int numToScroll)
+tui_source_window_base::update_tab_width ()
{
- if (win_info->generic.content != NULL)
+ /* We don't really change the height of any windows, but
+ calling these 2 functions causes a complete regeneration
+ and redisplay of the window's contents, which will take
+ the new tab width into account. */
+ make_invisible_and_set_new_height (height);
+ make_visible_with_new_height ();
+}
+
+/* See tui-data.h. */
+
+void
+tui_source_window_base::set_new_height (int height)
+{
+ execution_info->make_visible (false);
+ execution_info->height = height;
+ execution_info->origin.y = origin.y;
+ if (height > 1)
+ execution_info->viewport_height = height - 1;
+ else
+ execution_info->viewport_height = height;
+ execution_info->viewport_height--;
+
+ if (m_has_locator)
{
- int offset;
- struct symtab *s;
- struct symtab_and_line cursal = get_current_source_symtab_and_line ();
+ tui_locator_window *gen_win_info = tui_locator_win_info_ptr ();
+ gen_win_info->make_visible (false);
+ gen_win_info->origin.y = origin.y + height;
+ }
+}
- if (cursal.symtab == (struct symtab *) NULL)
- s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
- else
- s = cursal.symtab;
+/* See tui-data.h. */
- if (direction == LEFT_SCROLL)
- offset = win_info->detail.source_info.horizontal_offset + numToScroll;
+void
+tui_source_window_base::do_make_visible_with_new_height ()
+{
+ execution_info->make_visible (true);
+ 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;
+ tui_update_source_window (this, gdbarch,
+ cursal.symtab, line_or_addr, TRUE);
+ }
+ 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
{
- if ((offset =
- win_info->detail.source_info.horizontal_offset - numToScroll) < 0)
- offset = 0;
+ line.loa = LOA_ADDRESS;
+ find_line_pc (s, cursal.line, &line.u.addr);
}
- win_info->detail.source_info.horizontal_offset = offset;
- tui_update_source_window_as_is (win_info, s,
- ((struct tui_win_element *)
- win_info->generic.content[0])->which_element.source.line_or_addr,
- FALSE);
+ tui_update_source_window (this, gdbarch, s, line, TRUE);
+ }
+ if (m_has_locator)
+ {
+ tui_locator_win_info_ptr ()->make_visible (true);
+ tui_show_locator_content ();
}
+}
- return;
-} /* tuiHorizontalSourceScroll */
+/* See tui-data.h. */
+void
+tui_source_window_base::make_visible (bool visible)
+{
+ execution_info->make_visible (visible);
+ tui_win_info::make_visible (visible);
+}
+
+/* See tui-data.h. */
+
+void
+tui_source_window_base::refresh_window ()
+{
+ execution_info->refresh_window ();
+ tui_win_info::refresh_window ();
+}
+
+/* See tui-data.h. */
+
+void
+tui_source_window_base::refill ()
+{
+ symtab *s = nullptr;
+
+ 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);
+ }
+
+ tui_update_source_window_as_is (this, gdbarch, s,
+ content[0].line_or_addr,
+ FALSE);
+}
+
+/* Scroll the source forward or backward horizontally. */
-/* Set or clear the has_break flag in the line whose line is line_no. */
void
-tui_set_is_exec_point_at (union tui_line_or_address l, struct tui_win_info * win_info)
+tui_source_window_base::do_scroll_horizontal (int num_to_scroll)
{
- int changed = 0;
+ if (!content.empty ())
+ {
+ int offset = horizontal_offset + num_to_scroll;
+ if (offset < 0)
+ offset = 0;
+ 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;
- tui_win_content content = (tui_win_content) win_info->generic.content;
i = 0;
- while (i < win_info->generic.content_size)
+ while (i < content.size ())
{
- int newState;
-
- if (content[i]->which_element.source.line_or_addr.addr == l.addr)
- newState = TRUE;
+ bool new_state;
+ 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)))
+ new_state = true;
else
- newState = FALSE;
- if (newState != content[i]->which_element.source.is_exec_point)
+ new_state = false;
+ if (new_state != content[i].is_exec_point)
{
- changed++;
- content[i]->which_element.source.is_exec_point = newState;
- tui_show_source_line (win_info, i + 1);
+ changed = true;
+ content[i].is_exec_point = new_state;
+ tui_show_source_line (this, i + 1);
}
i++;
}
if (changed)
- tui_refresh_win (&win_info->generic);
+ refill ();
}
-/* Update the execution windows to show the active breakpoints.
- This is called whenever a breakpoint is inserted, removed or
- has its state changed. */
+/* See tui-winsource.h. */
+
void
-tui_update_all_breakpoint_info ()
+tui_update_all_breakpoint_info (struct breakpoint *being_deleted)
{
- struct tui_list *list = tui_source_windows ();
- int i;
-
- for (i = 0; i < list->count; i++)
+ for (tui_source_window_base *win : tui_source_windows ())
{
- struct tui_win_info * win = (struct tui_win_info *) list->list[i];
-
- if (tui_update_breakpoint_info (win, FALSE))
+ if (tui_update_breakpoint_info (win, being_deleted, false))
{
tui_update_exec_info (win);
}
}
-/* Scan the source window and the breakpoints to update the
- has_break information for each line.
- Returns 1 if something changed and the execution window
- must be refreshed. */
-int
-tui_update_breakpoint_info (struct tui_win_info * win, int current_only)
+/* 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_update_breakpoint_info (struct tui_source_window_base *win,
+ struct breakpoint *being_deleted,
+ bool current_only)
{
int i;
- int need_refresh = 0;
- struct tui_source_info * src = &win->detail.source_info;
+ bool need_refresh = false;
- for (i = 0; i < win->generic.content_size; i++)
+ for (i = 0; i < win->content.size (); i++)
{
struct breakpoint *bp;
extern struct breakpoint *breakpoint_chain;
- int mode;
- struct tui_source_element* line;
+ struct tui_source_element *line;
- line = &((struct tui_win_element *) win->generic.content[i])->which_element.source;
+ line = &win->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. */
- mode = 0;
+ tui_bp_flags mode = 0;
for (bp = breakpoint_chain;
- bp != (struct breakpoint *) NULL;
+ bp != NULL;
bp = bp->next)
{
- if ((win == TUI_SRC_WIN
- && bp->source_file
- && (strcmp (src->filename, bp->source_file) == 0)
- && bp->line_number == line->line_or_addr.line_no)
- || (win == TUI_DISASM_WIN
- && bp->loc->address == line->line_or_addr.addr))
- {
- 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->cond)
- mode |= TUI_BP_CONDITIONAL;
- if (bp->type == bp_hardware_breakpoint)
- mode |= TUI_BP_HARDWARE;
- }
+ 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;
+
+ for (loc = bp->loc; loc != NULL; loc = loc->next)
+ {
+ if (win->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;
+ }
+ }
}
- if (line->has_break != mode)
+ if (line->break_mode != mode)
{
- line->has_break = mode;
- need_refresh = 1;
+ line->break_mode = mode;
+ need_refresh = true;
}
}
return need_refresh;
}
+/* See tui-data.h. */
-/*
- ** tuiSetExecInfoContent().
- ** Function to initialize the content of the execution info window,
- ** based upon the input window which is either the source or
- ** disassembly window.
- */
-enum tui_status
-tuiSetExecInfoContent (struct tui_win_info * win_info)
+tui_exec_info_content *
+tui_exec_info_window::maybe_allocate_content (int n_elements)
{
- enum tui_status ret = TUI_SUCCESS;
+ if (m_content == nullptr)
+ m_content = XNEWVEC (tui_exec_info_content, n_elements);
+ return m_content;
+}
- if (win_info->detail.source_info.execution_info != (struct tui_gen_win_info *) NULL)
- {
- struct tui_gen_win_info * execInfoPtr = win_info->detail.source_info.execution_info;
- if (execInfoPtr->content == NULL)
- execInfoPtr->content =
- (void **) tui_alloc_content (win_info->generic.height,
- execInfoPtr->type);
- if (execInfoPtr->content != NULL)
- {
- int i;
+/* 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_set_exec_info_content (struct tui_source_window_base *win_info)
+{
+ tui_exec_info_content *content
+ = win_info->execution_info->maybe_allocate_content (win_info->height);
- tui_update_breakpoint_info (win_info, 1);
- for (i = 0; i < win_info->generic.content_size; i++)
- {
- struct tui_win_element * element;
- struct tui_win_element * srcElement;
- int mode;
-
- element = (struct tui_win_element *) execInfoPtr->content[i];
- srcElement = (struct tui_win_element *) win_info->generic.content[i];
-
- memset(element->which_element.simple_string, ' ',
- sizeof(element->which_element.simple_string));
- element->which_element.simple_string[TUI_EXECINFO_SIZE - 1] = 0;
-
- /* Now update the exec info content based upon the state
- of each line as indicated by the source content. */
- mode = srcElement->which_element.source.has_break;
- if (mode & TUI_BP_HIT)
- element->which_element.simple_string[TUI_BP_HIT_POS] =
- (mode & TUI_BP_HARDWARE) ? 'H' : 'B';
- else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED))
- element->which_element.simple_string[TUI_BP_HIT_POS] =
- (mode & TUI_BP_HARDWARE) ? 'h' : 'b';
-
- if (mode & TUI_BP_ENABLED)
- element->which_element.simple_string[TUI_BP_BREAK_POS] = '+';
- else if (mode & TUI_BP_DISABLED)
- element->which_element.simple_string[TUI_BP_BREAK_POS] = '-';
-
- if (srcElement->which_element.source.is_exec_point)
- element->which_element.simple_string[TUI_EXEC_POS] = '>';
- }
- execInfoPtr->content_size = win_info->generic.content_size;
- }
- else
- ret = TUI_FAILURE;
+ tui_update_breakpoint_info (win_info, nullptr, true);
+ for (int i = 0; i < win_info->content.size (); i++)
+ {
+ tui_exec_info_content &element = content[i];
+ struct tui_source_element *src_element;
+ tui_bp_flags mode;
+
+ src_element = &win_info->content[i];
+
+ memset (element, ' ', sizeof (tui_exec_info_content));
+ element[TUI_EXECINFO_SIZE - 1] = 0;
+
+ /* Now update the exec info content based upon the state
+ of each line as indicated by the source content. */
+ 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] = '>';
}
-
- return ret;
}
-/*
- ** tuiShowExecInfoContent().
- */
void
-tuiShowExecInfoContent (struct tui_win_info * win_info)
+tui_show_exec_info_content (struct tui_source_window_base *win_info)
{
- struct tui_gen_win_info * execInfo = win_info->detail.source_info.execution_info;
- int curLine;
+ struct tui_exec_info_window *exec_info = win_info->execution_info;
+ const tui_exec_info_content *content = exec_info->get_content ();
- werase (execInfo->handle);
- tui_refresh_win (execInfo);
- for (curLine = 1; (curLine <= execInfo->content_size); curLine++)
- mvwaddstr (execInfo->handle,
- curLine,
+ werase (exec_info->handle);
+ for (int cur_line = 1; cur_line <= win_info->content.size (); cur_line++)
+ mvwaddstr (exec_info->handle,
+ cur_line,
0,
- ((struct tui_win_element *)
- execInfo->content[curLine - 1])->which_element.simple_string);
- tui_refresh_win (execInfo);
- execInfo->content_in_use = TRUE;
-
- return;
+ content[cur_line - 1]);
+ exec_info->refresh_window ();
}
void
-tui_erase_exec_info_content (struct tui_win_info * win_info)
+tui_erase_exec_info_content (struct tui_source_window_base *win_info)
{
- struct tui_gen_win_info * execInfo = win_info->detail.source_info.execution_info;
+ struct tui_gen_win_info *exec_info = win_info->execution_info;
- werase (execInfo->handle);
- tui_refresh_win (execInfo);
-
- return;
+ werase (exec_info->handle);
+ exec_info->refresh_window ();
}
void
-tui_clear_exec_info_content (struct tui_win_info * win_info)
+tui_clear_exec_info_content (struct tui_source_window_base *win_info)
{
- win_info->detail.source_info.execution_info->content_in_use = FALSE;
tui_erase_exec_info_content (win_info);
-
- return;
}
/* Function to update the execution info window. */
void
-tui_update_exec_info (struct tui_win_info * win_info)
-{
- tuiSetExecInfoContent (win_info);
- tuiShowExecInfoContent (win_info);
-} /* tuiUpdateExecInfo */
-
-enum tui_status
-tui_alloc_source_buffer (struct tui_win_info *win_info)
-{
- register char *srcLineBuf;
- register int i, lineWidth, maxLines;
- enum tui_status ret = TUI_FAILURE;
-
- maxLines = win_info->generic.height; /* less the highlight box */
- lineWidth = win_info->generic.width - 1;
- /*
- ** Allocate the buffer for the source lines. Do this only once since they
- ** will be re-used for all source displays. The only other time this will
- ** be done is when a window's size changes.
- */
- if (win_info->generic.content == NULL)
+tui_update_exec_info (struct tui_source_window_base *win_info)
+{
+ tui_set_exec_info_content (win_info);
+ tui_show_exec_info_content (win_info);
+}
+
+void
+tui_alloc_source_buffer (struct tui_source_window_base *win_info)
+{
+ int i, line_width, max_lines;
+
+ /* The window width/height includes the highlight box. Determine actual
+ content dimensions, including string null-terminators. */
+ max_lines = win_info->height - 2;
+ line_width = win_info->width - 2 + 1;
+
+ /* Allocate the buffer for the source lines. */
+ win_info->content.resize (max_lines);
+ for (i = 0; i < max_lines; i++)
{
- srcLineBuf = (char *) xmalloc ((maxLines * lineWidth) * sizeof (char));
- if (srcLineBuf == (char *) NULL)
- fputs_unfiltered (
- "Unable to Allocate Memory for Source or Disassembly Display.\n",
- gdb_stderr);
- else
- {
- /* allocate the content list */
- if ((win_info->generic.content =
- (void **) tui_alloc_content (maxLines, SRC_WIN)) == NULL)
- {
- xfree (srcLineBuf);
- srcLineBuf = (char *) NULL;
- fputs_unfiltered (
- "Unable to Allocate Memory for Source or Disassembly Display.\n",
- gdb_stderr);
- }
- }
- for (i = 0; i < maxLines; i++)
- ((struct tui_win_element *)
- win_info->generic.content[i])->which_element.source.line =
- srcLineBuf + (lineWidth * i);
- ret = TUI_SUCCESS;
+ if (win_info->content[i].line == nullptr)
+ win_info->content[i].line = (char *) xmalloc (line_width);
}
- else
- ret = TUI_SUCCESS;
-
- return ret;
-} /* tuiAllocSourceBuffer */
+}
-/* Answer whether the a particular line number or address is displayed
+/* Answer whether a particular line number or address is displayed
in the current source window. */
int
-tui_line_is_displayed (int line, struct tui_win_info * win_info,
- int checkThreshold)
+tui_line_is_displayed (int line,
+ struct tui_source_window_base *win_info,
+ int check_threshold)
{
- int isDisplayed = FALSE;
+ int is_displayed = FALSE;
int i, threshold;
- if (checkThreshold)
+ if (check_threshold)
threshold = SCROLL_THRESHOLD;
else
threshold = 0;
i = 0;
- while (i < win_info->generic.content_size - threshold && !isDisplayed)
+ while (i < win_info->content.size () - threshold
+ && !is_displayed)
{
- isDisplayed = (((struct tui_win_element *)
- win_info->generic.content[i])->which_element.source.line_or_addr.line_no
- == (int) line);
+ is_displayed
+ = win_info->content[i].line_or_addr.loa == LOA_LINE
+ && win_info->content[i].line_or_addr.u.line_no == line;
i++;
}
- return isDisplayed;
+ return is_displayed;
}
-/* Answer whether the a particular line number or address is displayed
+/* Answer whether a particular line number or address is displayed
in the current source window. */
int
-tui_addr_is_displayed (CORE_ADDR addr, struct tui_win_info * win_info,
- int checkThreshold)
+tui_addr_is_displayed (CORE_ADDR addr,
+ struct tui_source_window_base *win_info,
+ int check_threshold)
{
- int isDisplayed = FALSE;
+ int is_displayed = FALSE;
int i, threshold;
- if (checkThreshold)
+ if (check_threshold)
threshold = SCROLL_THRESHOLD;
else
threshold = 0;
i = 0;
- while (i < win_info->generic.content_size - threshold && !isDisplayed)
+ while (i < win_info->content.size () - threshold
+ && !is_displayed)
{
- isDisplayed = (((struct tui_win_element *)
- win_info->generic.content[i])->which_element.source.line_or_addr.addr
- == addr);
+ is_displayed
+ = win_info->content[i].line_or_addr.loa == LOA_ADDRESS
+ && win_info->content[i].line_or_addr.u.addr == addr;
i++;
}
- return isDisplayed;
+ return is_displayed;
}
-
-
-/*****************************************
-** STATIC LOCAL FUNCTIONS **
-******************************************/