X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-winsource.c;h=103b1e6658e6fa61b57c4d6776392c45619fbd7f;hb=51abb421302bdd86946827727aebc878b5c756e3;hp=6b77c4010ce2098b2a1ac5319d554423f7dee9a7;hpb=d02c80cdf4c8426e911e897c4c6a9aa950354b1b;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 6b77c4010c..103b1e6658 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -1,7 +1,6 @@
/* TUI display source/assembly window.
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
- Foundation, Inc.
+ Copyright (C) 1998-2017 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
@@ -9,7 +8,7 @@
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,
@@ -18,9 +17,7 @@
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 . */
#include "defs.h"
#include
@@ -29,6 +26,8 @@
#include "breakpoint.h"
#include "value.h"
#include "source.h"
+#include "objfiles.h"
+#include "filenames.h"
#include "tui/tui.h"
#include "tui/tui-data.h"
@@ -38,14 +37,7 @@
#include "tui/tui-winsource.h"
#include "tui/tui-source.h"
#include "tui/tui-disasm.h"
-
-#ifdef HAVE_NCURSES_H
-#include
-#else
-#ifdef HAVE_CURSES_H
-#include
-#endif
-#endif
+#include "gdb_curses.h"
/* Function to display the "main" routine. */
void
@@ -53,19 +45,20 @@ tui_display_main (void)
{
if ((tui_source_windows ())->count > 0)
{
+ 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 ("??");
}
}
}
@@ -75,11 +68,14 @@ tui_display_main (void)
/* 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 line_or_addr, int noerror)
+tui_update_source_window (struct tui_win_info *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, line_or_addr, noerror);
+ tui_update_source_window_as_is (win_info, gdbarch, s, line_or_addr, noerror);
return;
}
@@ -88,15 +84,18 @@ tui_update_source_window (struct tui_win_info * win_info, struct symtab *s,
/* 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 line_or_addr, int noerror)
+tui_update_source_window_as_is (struct tui_win_info *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, line_or_addr.line_no, noerror);
+ ret = tui_set_source_content (s, line_or_addr.u.line_no, noerror);
else
- ret = tui_set_disassem_content (line_or_addr.addr);
+ ret = tui_set_disassem_content (gdbarch, line_or_addr.u.addr);
if (ret == TUI_FAILURE)
{
@@ -110,18 +109,17 @@ tui_update_source_window_as_is (struct tui_win_info * win_info, struct symtab *s
tui_update_exec_info (win_info);
if (win_info->generic.type == SRC_WIN)
{
- struct symtab_and_line sal;
-
- sal.line = line_or_addr.line_no +
+ symtab_and_line sal;
+
+ sal.line = line_or_addr.u.line_no +
(win_info->generic.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)
+ 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 (TUI_SRC_WIN);
}
}
@@ -134,26 +132,27 @@ tui_update_source_window_as_is (struct tui_win_info * win_info, struct symtab *s
/* 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 (gdbarch, sal.symtab, l, FALSE);
break;
}
}
@@ -163,7 +162,7 @@ tui_update_source_windows_with_addr (CORE_ADDR addr)
for (i = 0; i < (tui_source_windows ())->count; i++)
{
- struct tui_win_info * win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
+ struct tui_win_info *win_info = (tui_source_windows ())->list[i];
tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
tui_clear_exec_info_content (win_info);
@@ -176,23 +175,30 @@ tui_update_source_windows_with_addr (CORE_ADDR addr)
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 (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;
}
@@ -201,7 +207,8 @@ tui_update_source_windows_with_line (struct symtab *s, int line)
}
void
-tui_clear_source_content (struct tui_win_info * win_info, int display_prompt)
+tui_clear_source_content (struct tui_win_info *win_info,
+ int display_prompt)
{
if (win_info != NULL)
{
@@ -211,8 +218,8 @@ tui_clear_source_content (struct tui_win_info * win_info, int display_prompt)
tui_erase_source_content (win_info, display_prompt);
for (i = 0; i < win_info->generic.content_size; i++)
{
- struct tui_win_element * element =
- (struct tui_win_element *) win_info->generic.content[i];
+ struct tui_win_element *element = win_info->generic.content[i];
+
element->which_element.source.has_break = FALSE;
element->which_element.source.is_exec_point = FALSE;
}
@@ -221,7 +228,8 @@ tui_clear_source_content (struct tui_win_info * win_info, int display_prompt)
void
-tui_erase_source_content (struct tui_win_info * win_info, int display_prompt)
+tui_erase_source_content (struct tui_win_info *win_info,
+ int display_prompt)
{
int x_pos;
int half_width = (win_info->generic.width - 2) / 2;
@@ -232,7 +240,7 @@ tui_erase_source_content (struct tui_win_info * win_info, int display_prompt)
tui_check_and_display_highlight_if_needed (win_info);
if (display_prompt == EMPTY_SOURCE_PROMPT)
{
- char *no_src_str;
+ const char *no_src_str;
if (win_info->generic.type == SRC_WIN)
no_src_str = NO_SRC_STRING;
@@ -245,12 +253,12 @@ tui_erase_source_content (struct tui_win_info * win_info, int display_prompt)
mvwaddstr (win_info->generic.handle,
(win_info->generic.height / 2),
x_pos,
- no_src_str);
+ (char *) no_src_str);
- /* 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 */
+ /* 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, no_src_str);
}
@@ -261,31 +269,31 @@ tui_erase_source_content (struct tui_win_info * win_info, int display_prompt)
/* 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_win_info *win_info, int lineno)
{
- struct tui_win_element * line;
- int x, y;
+ struct tui_win_element *line;
+ int x;
- line = (struct tui_win_element *) win_info->generic.content[lineno - 1];
+ line = win_info->generic.content[lineno - 1];
if (line->which_element.source.is_exec_point)
wattron (win_info->generic.handle, A_STANDOUT);
mvwaddstr (win_info->generic.handle, lineno, 1,
- line->which_element.source.line);
+ (char *) line->which_element.source.line);
if (line->which_element.source.is_exec_point)
wattroff (win_info->generic.handle, A_STANDOUT);
/* Clear to end of line but stop before the border. */
- getyx (win_info->generic.handle, y, x);
+ x = getcurx (win_info->generic.handle);
while (x + 1 < win_info->generic.width)
{
waddch (win_info->generic.handle, ' ');
- getyx (win_info->generic.handle, y, x);
+ x = getcurx (win_info->generic.handle);
}
}
void
-tui_show_source_content (struct tui_win_info * win_info)
+tui_show_source_content (struct tui_win_info *win_info)
{
if (win_info->generic.content_size > 0)
{
@@ -305,33 +313,41 @@ tui_show_source_content (struct tui_win_info * win_info)
/* Scroll the source forward or backward horizontally. */
void
-tui_horizontal_source_scroll (struct tui_win_info * win_info,
+tui_horizontal_source_scroll (struct tui_win_info *win_info,
enum tui_scroll_direction direction,
int num_to_scroll)
{
if (win_info->generic.content != NULL)
{
+ struct gdbarch *gdbarch = win_info->detail.source_info.gdbarch;
int offset;
- struct symtab *s;
- struct symtab_and_line cursal = get_current_source_symtab_and_line ();
+ struct symtab *s = NULL;
- if (cursal.symtab == (struct symtab *) NULL)
- s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
- else
- s = cursal.symtab;
+ if (win_info->generic.type == SRC_WIN)
+ {
+ struct symtab_and_line cursal
+ = get_current_source_symtab_and_line ();
+
+ if (cursal.symtab == NULL)
+ s = find_pc_line_symtab (get_frame_pc (get_selected_frame (NULL)));
+ else
+ s = cursal.symtab;
+ }
if (direction == LEFT_SCROLL)
- offset = win_info->detail.source_info.horizontal_offset + num_to_scroll;
+ offset = win_info->detail.source_info.horizontal_offset
+ + num_to_scroll;
else
{
- if ((offset =
- win_info->detail.source_info.horizontal_offset - num_to_scroll) < 0)
+ offset = win_info->detail.source_info.horizontal_offset
+ - num_to_scroll;
+ if (offset < 0)
offset = 0;
}
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,
+ tui_update_source_window_as_is (win_info, gdbarch, s,
+ win_info->generic.content[0]
+ ->which_element.source.line_or_addr,
FALSE);
}
@@ -339,9 +355,12 @@ tui_horizontal_source_scroll (struct tui_win_info * win_info,
}
-/* Set or clear the has_break flag in the line whose line is line_no. */
+/* 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_set_is_exec_point_at (struct tui_line_or_address l,
+ struct tui_win_info *win_info)
{
int changed = 0;
int i;
@@ -351,8 +370,15 @@ tui_set_is_exec_point_at (union tui_line_or_address l, struct tui_win_info * win
while (i < win_info->generic.content_size)
{
int new_state;
-
- if (content[i]->which_element.source.line_or_addr.addr == l.addr)
+ struct tui_line_or_address content_loa =
+ content[i]->which_element.source.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)
+ || (content_loa.u.addr == l.u.addr)))
new_state = TRUE;
else
new_state = FALSE;
@@ -379,7 +405,7 @@ tui_update_all_breakpoint_info (void)
for (i = 0; i < list->count; i++)
{
- struct tui_win_info * win = (struct tui_win_info *) list->list[i];
+ struct tui_win_info *win = list->list[i];
if (tui_update_breakpoint_info (win, FALSE))
{
@@ -389,25 +415,28 @@ tui_update_all_breakpoint_info (void)
}
-/* 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. */
+/* 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)
+tui_update_breakpoint_info (struct tui_win_info *win,
+ int current_only)
{
int i;
int need_refresh = 0;
- struct tui_source_info * src = &win->detail.source_info;
+ struct tui_source_info *src = &win->detail.source_info;
for (i = 0; i < win->generic.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->generic.content[i]->which_element.source;
if (current_only && !line->is_exec_point)
continue;
@@ -419,24 +448,35 @@ tui_update_breakpoint_info (struct tui_win_info * win, int current_only)
bp != (struct breakpoint *) 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);
+
+ for (loc = bp->loc; loc != NULL; loc = loc->next)
+ {
+ if ((win == TUI_SRC_WIN
+ && loc->symtab != NULL
+ && filename_cmp (src->fullname,
+ symtab_to_fullname (loc->symtab)) == 0
+ && line->line_or_addr.loa == LOA_LINE
+ && loc->line_number == line->line_or_addr.u.line_no)
+ || (win == TUI_DISASM_WIN
+ && line->line_or_addr.loa == LOA_ADDRESS
+ && loc->address == line->line_or_addr.u.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->loc->cond)
+ mode |= TUI_BP_CONDITIONAL;
+ if (bp->type == bp_hardware_breakpoint)
+ mode |= TUI_BP_HARDWARE;
+ }
+ }
}
if (line->has_break != mode)
{
@@ -452,18 +492,19 @@ tui_update_breakpoint_info (struct tui_win_info * win, int current_only)
based upon the input window which is either the source or
disassembly window. */
enum tui_status
-tui_set_exec_info_content (struct tui_win_info * win_info)
+tui_set_exec_info_content (struct tui_win_info *win_info)
{
enum tui_status ret = TUI_SUCCESS;
- if (win_info->detail.source_info.execution_info != (struct tui_gen_win_info *) NULL)
+ if (win_info->detail.source_info.execution_info
+ != (struct tui_gen_win_info *) NULL)
{
- struct tui_gen_win_info * exec_info_ptr = win_info->detail.source_info.execution_info;
+ struct tui_gen_win_info *exec_info_ptr
+ = win_info->detail.source_info.execution_info;
if (exec_info_ptr->content == NULL)
exec_info_ptr->content =
- (void **) tui_alloc_content (win_info->generic.height,
- exec_info_ptr->type);
+ tui_alloc_content (win_info->generic.height, exec_info_ptr->type);
if (exec_info_ptr->content != NULL)
{
int i;
@@ -471,12 +512,12 @@ tui_set_exec_info_content (struct tui_win_info * win_info)
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 * src_element;
+ struct tui_win_element *element;
+ struct tui_win_element *src_element;
int mode;
- element = (struct tui_win_element *) exec_info_ptr->content[i];
- src_element = (struct tui_win_element *) win_info->generic.content[i];
+ element = exec_info_ptr->content[i];
+ src_element = win_info->generic.content[i];
memset(element->which_element.simple_string, ' ',
sizeof(element->which_element.simple_string));
@@ -511,9 +552,10 @@ tui_set_exec_info_content (struct tui_win_info * win_info)
void
-tui_show_exec_info_content (struct tui_win_info * win_info)
+tui_show_exec_info_content (struct tui_win_info *win_info)
{
- struct tui_gen_win_info * exec_info = win_info->detail.source_info.execution_info;
+ struct tui_gen_win_info *exec_info
+ = win_info->detail.source_info.execution_info;
int cur_line;
werase (exec_info->handle);
@@ -522,24 +564,25 @@ tui_show_exec_info_content (struct tui_win_info * win_info)
mvwaddstr (exec_info->handle,
cur_line,
0,
- ((struct tui_win_element *)
- exec_info->content[cur_line - 1])->which_element.simple_string);
+ (char *) exec_info->content[cur_line - 1]
+ ->which_element.simple_string);
tui_refresh_win (exec_info);
exec_info->content_in_use = TRUE;
}
void
-tui_erase_exec_info_content (struct tui_win_info * win_info)
+tui_erase_exec_info_content (struct tui_win_info *win_info)
{
- struct tui_gen_win_info * exec_info = win_info->detail.source_info.execution_info;
+ struct tui_gen_win_info *exec_info
+ = win_info->detail.source_info.execution_info;
werase (exec_info->handle);
tui_refresh_win (exec_info);
}
void
-tui_clear_exec_info_content (struct tui_win_info * win_info)
+tui_clear_exec_info_content (struct tui_win_info *win_info)
{
win_info->detail.source_info.execution_info->content_in_use = FALSE;
tui_erase_exec_info_content (win_info);
@@ -549,7 +592,7 @@ tui_clear_exec_info_content (struct tui_win_info * win_info)
/* Function to update the execution info window. */
void
-tui_update_exec_info (struct tui_win_info * win_info)
+tui_update_exec_info (struct tui_win_info *win_info)
{
tui_set_exec_info_content (win_info);
tui_show_exec_info_content (win_info);
@@ -560,52 +603,37 @@ tui_alloc_source_buffer (struct tui_win_info *win_info)
{
char *src_line_buf;
int i, line_width, max_lines;
- enum tui_status ret = TUI_FAILURE;
- max_lines = win_info->generic.height; /* less the highlight box */
- line_width = win_info->generic.width - 1;
+ /* The window width/height includes the highlight box. Determine actual
+ content dimensions, including string null-terminators. */
+ max_lines = win_info->generic.height - 2;
+ line_width = win_info->generic.width - 2 + 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.
+ * 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)
{
- src_line_buf = (char *) xmalloc ((max_lines * line_width) * sizeof (char));
- if (src_line_buf == (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 (max_lines, SRC_WIN)) == NULL)
- {
- xfree (src_line_buf);
- src_line_buf = (char *) NULL;
- fputs_unfiltered (
- "Unable to Allocate Memory for Source or Disassembly Display.\n",
- gdb_stderr);
- }
- }
+ src_line_buf = (char *)
+ xmalloc ((max_lines * line_width) * sizeof (char));
+ /* Allocate the content list. */
+ win_info->generic.content = tui_alloc_content (max_lines, SRC_WIN);
for (i = 0; i < max_lines; i++)
- ((struct tui_win_element *)
- win_info->generic.content[i])->which_element.source.line =
- src_line_buf + (line_width * i);
- ret = TUI_SUCCESS;
+ win_info->generic.content[i]->which_element.source.line
+ = src_line_buf + (line_width * i);
}
- else
- ret = TUI_SUCCESS;
- return ret;
+ return TUI_SUCCESS;
}
-/* 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,
+tui_line_is_displayed (int line,
+ struct tui_win_info *win_info,
int check_threshold)
{
int is_displayed = FALSE;
@@ -616,11 +644,14 @@ tui_line_is_displayed (int line, struct tui_win_info * win_info,
else
threshold = 0;
i = 0;
- while (i < win_info->generic.content_size - threshold && !is_displayed)
+ while (i < win_info->generic.content_size - threshold
+ && !is_displayed)
{
- is_displayed = (((struct tui_win_element *)
- win_info->generic.content[i])->which_element.source.line_or_addr.line_no
- == (int) line);
+ is_displayed
+ = win_info->generic.content[i]
+ ->which_element.source.line_or_addr.loa == LOA_LINE
+ && win_info->generic.content[i]
+ ->which_element.source.line_or_addr.u.line_no == (int) line;
i++;
}
@@ -628,11 +659,12 @@ tui_line_is_displayed (int line, struct tui_win_info * win_info,
}
-/* 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 check_threshold)
+tui_addr_is_displayed (CORE_ADDR addr,
+ struct tui_win_info *win_info,
+ int check_threshold)
{
int is_displayed = FALSE;
int i, threshold;
@@ -642,11 +674,14 @@ tui_addr_is_displayed (CORE_ADDR addr, struct tui_win_info * win_info,
else
threshold = 0;
i = 0;
- while (i < win_info->generic.content_size - threshold && !is_displayed)
+ while (i < win_info->generic.content_size - threshold
+ && !is_displayed)
{
- is_displayed = (((struct tui_win_element *)
- win_info->generic.content[i])->which_element.source.line_or_addr.addr
- == addr);
+ is_displayed
+ = win_info->generic.content[i]
+ ->which_element.source.line_or_addr.loa == LOA_ADDRESS
+ && win_info->generic.content[i]
+ ->which_element.source.line_or_addr.u.addr == addr;
i++;
}