/* TUI display source/assembly window.
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
- Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008,
+ 2009, 2010, 2011 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 "tui/tui.h"
#include "tui/tui-data.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_string.h"
+#include "gdb_curses.h"
+#include "gdb_assert.h"
/* Function to display the "main" routine. */
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;
- tui_update_source_windows_with_addr (addr);
+ tui_update_source_windows_with_addr (gdbarch, addr);
sal = find_pc_line (addr, 0);
if (sal.symtab)
tui_update_locator_filename (sal.symtab->filename);
/* 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_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, lineOrAddr, noerror);
+ tui_update_source_window_as_is (win_info, gdbarch, s, line_or_addr, noerror);
return;
}
/* 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_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, lineOrAddr.line_no, noerror);
+ ret = tui_set_source_content (s, line_or_addr.u.line_no, noerror);
else
- ret = tui_set_disassem_content (lineOrAddr.addr);
+ ret = tui_set_disassem_content (gdbarch, line_or_addr.u.addr);
if (ret == TUI_FAILURE)
{
{
struct symtab_and_line sal;
- sal.line = lineOrAddr.line_no +
+ 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)
+ /* 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);
}
}
/* 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;
}
}
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);
}
}
-
- 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 (s->objfile);
+
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;
}
}
void
-tui_clear_source_content (struct tui_win_info * win_info, int displayPrompt)
+tui_clear_source_content (struct tui_win_info *win_info,
+ int display_prompt)
{
if (win_info != NULL)
{
- register int i;
+ int i;
win_info->generic.content_in_use = FALSE;
- tui_erase_source_content (win_info, displayPrompt);
+ 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 =
+ (struct tui_win_element *) win_info->generic.content[i];
+
element->which_element.source.has_break = FALSE;
element->which_element.source.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_win_info *win_info,
+ int display_prompt)
{
- int xPos;
- int halfWidth = (win_info->generic.width - 2) / 2;
+ int x_pos;
+ int half_width = (win_info->generic.width - 2) / 2;
if (win_info->generic.handle != (WINDOW *) NULL)
{
werase (win_info->generic.handle);
tui_check_and_display_highlight_if_needed (win_info);
- if (displayPrompt == EMPTY_SOURCE_PROMPT)
+ if (display_prompt == EMPTY_SOURCE_PROMPT)
{
- char *noSrcStr;
+ char *no_src_str;
if (win_info->generic.type == SRC_WIN)
- noSrcStr = NO_SRC_STRING;
+ no_src_str = NO_SRC_STRING;
else
- noSrcStr = NO_DISASSEM_STRING;
- if (strlen (noSrcStr) >= halfWidth)
- xPos = 1;
+ no_src_str = NO_DISASSEM_STRING;
+ if (strlen (no_src_str) >= half_width)
+ x_pos = 1;
else
- xPos = halfWidth - strlen (noSrcStr);
+ x_pos = half_width - strlen (no_src_str);
mvwaddstr (win_info->generic.handle,
(win_info->generic.height / 2),
- xPos,
- noSrcStr);
+ x_pos,
+ 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, noSrcStr);
+ tui_set_source_content_nil (win_info, no_src_str);
}
tui_refresh_win (&win_info->generic);
}
- 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_win_info *win_info, int lineno)
{
- struct tui_win_element * line;
+ struct tui_win_element *line;
int x, y;
line = (struct tui_win_element *) win_info->generic.content[lineno - 1];
}
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)
{
/* 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 numToScroll)
+ 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_symtab (get_frame_pc (get_selected_frame (NULL)));
+ else
+ s = cursal.symtab;
+ }
if (direction == LEFT_SCROLL)
- offset = win_info->detail.source_info.horizontal_offset + numToScroll;
+ offset = win_info->detail.source_info.horizontal_offset + num_to_scroll;
else
{
if ((offset =
- win_info->detail.source_info.horizontal_offset - numToScroll) < 0)
+ win_info->detail.source_info.horizontal_offset - num_to_scroll) < 0)
offset = 0;
}
win_info->detail.source_info.horizontal_offset = offset;
- tui_update_source_window_as_is (win_info, s,
+ tui_update_source_window_as_is (win_info, gdbarch, s,
((struct tui_win_element *)
win_info->generic.content[0])->which_element.source.line_or_addr,
FALSE);
}
return;
-} /* tuiHorizontalSourceScroll */
+}
+
+/* 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;
i = 0;
while (i < win_info->generic.content_size)
{
- int newState;
-
- if (content[i]->which_element.source.line_or_addr.addr == l.addr)
- newState = TRUE;
+ int new_state;
+ 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
- newState = FALSE;
- if (newState != content[i]->which_element.source.is_exec_point)
+ new_state = FALSE;
+ if (new_state != content[i]->which_element.source.is_exec_point)
{
changed++;
- content[i]->which_element.source.is_exec_point = newState;
+ content[i]->which_element.source.is_exec_point = new_state;
tui_show_source_line (win_info, i + 1);
}
i++;
This is called whenever a breakpoint is inserted, removed or
has its state changed. */
void
-tui_update_all_breakpoint_info ()
+tui_update_all_breakpoint_info (void)
{
struct tui_list *list = tui_source_windows ();
int i;
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))
{
}
-/* 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;
if (current_only && !line->is_exec_point)
bp != (struct breakpoint *) NULL;
bp = bp->next)
{
+ gdb_assert (line->line_or_addr.loa == LOA_LINE
+ || line->line_or_addr.loa == LOA_ADDRESS);
if ((win == TUI_SRC_WIN
&& bp->source_file
&& (strcmp (src->filename, bp->source_file) == 0)
- && bp->line_number == line->line_or_addr.line_no)
+ && line->line_or_addr.loa == LOA_LINE
+ && bp->line_number == line->line_or_addr.u.line_no)
|| (win == TUI_DISASM_WIN
- && bp->loc->address == line->line_or_addr.addr))
+ && line->line_or_addr.loa == LOA_ADDRESS
+ && bp->loc != NULL
+ && bp->loc->address == line->line_or_addr.u.addr))
{
if (bp->enable_state == bp_disabled)
mode |= TUI_BP_DISABLED;
mode |= TUI_BP_ENABLED;
if (bp->hit_count)
mode |= TUI_BP_HIT;
- if (bp->cond)
+ if (bp->loc->cond)
mode |= TUI_BP_CONDITIONAL;
if (bp->type == bp_hardware_breakpoint)
mode |= TUI_BP_HARDWARE;
}
-/*
- ** tuiSetExecInfoContent().
- ** Function to initialize the content of the execution info window,
- ** based upon the input window which is either the source or
- ** disassembly window.
- */
+/* 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_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)
{
- struct tui_gen_win_info * execInfoPtr = win_info->detail.source_info.execution_info;
+ struct tui_gen_win_info *exec_info_ptr = win_info->detail.source_info.execution_info;
- if (execInfoPtr->content == NULL)
- execInfoPtr->content =
+ if (exec_info_ptr->content == NULL)
+ exec_info_ptr->content =
(void **) tui_alloc_content (win_info->generic.height,
- execInfoPtr->type);
- if (execInfoPtr->content != NULL)
+ exec_info_ptr->type);
+ if (exec_info_ptr->content != NULL)
{
int i;
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;
+ struct tui_win_element *element;
+ struct tui_win_element *src_element;
int mode;
- element = (struct tui_win_element *) execInfoPtr->content[i];
- srcElement = (struct tui_win_element *) win_info->generic.content[i];
+ element = (struct tui_win_element *) exec_info_ptr->content[i];
+ src_element = (struct tui_win_element *) win_info->generic.content[i];
memset(element->which_element.simple_string, ' ',
sizeof(element->which_element.simple_string));
/* 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;
+ mode = src_element->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_DISABLED)
element->which_element.simple_string[TUI_BP_BREAK_POS] = '-';
- if (srcElement->which_element.source.is_exec_point)
+ if (src_element->which_element.source.is_exec_point)
element->which_element.simple_string[TUI_EXEC_POS] = '>';
}
- execInfoPtr->content_size = win_info->generic.content_size;
+ exec_info_ptr->content_size = win_info->generic.content_size;
}
else
ret = TUI_FAILURE;
}
-/*
- ** tuiShowExecInfoContent().
- */
void
-tuiShowExecInfoContent (struct tui_win_info * win_info)
+tui_show_exec_info_content (struct tui_win_info *win_info)
{
- struct tui_gen_win_info * execInfo = win_info->detail.source_info.execution_info;
- int curLine;
-
- werase (execInfo->handle);
- tui_refresh_win (execInfo);
- for (curLine = 1; (curLine <= execInfo->content_size); curLine++)
- mvwaddstr (execInfo->handle,
- curLine,
+ struct tui_gen_win_info *exec_info = win_info->detail.source_info.execution_info;
+ int cur_line;
+
+ werase (exec_info->handle);
+ tui_refresh_win (exec_info);
+ for (cur_line = 1; (cur_line <= exec_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;
+ 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 * execInfo = win_info->detail.source_info.execution_info;
+ struct tui_gen_win_info *exec_info = win_info->detail.source_info.execution_info;
- werase (execInfo->handle);
- tui_refresh_win (execInfo);
-
- return;
+ 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);
/* 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)
{
- tuiSetExecInfoContent (win_info);
- tuiShowExecInfoContent (win_info);
-} /* tuiUpdateExecInfo */
+ tui_set_exec_info_content (win_info);
+ tui_show_exec_info_content (win_info);
+}
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;
+ char *src_line_buf;
+ int i, line_width, max_lines;
- maxLines = win_info->generic.height; /* less the highlight box */
- lineWidth = win_info->generic.width - 1;
+ max_lines = win_info->generic.height; /* Less the highlight box. */
+ line_width = 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.
+ * 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)
{
- 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
+ src_line_buf = (char *)
+ xmalloc ((max_lines * line_width) * sizeof (char));
+ if (src_line_buf == (char *) NULL)
{
- /* 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);
- }
+ fputs_unfiltered ("Unable to Allocate Memory for Source or Disassembly Display.\n",
+ gdb_stderr);
+ return TUI_FAILURE;
}
- for (i = 0; i < maxLines; i++)
+ /* Allocate the content list. */
+ if ((win_info->generic.content =
+ (void **) tui_alloc_content (max_lines, SRC_WIN)) == NULL)
+ {
+ xfree (src_line_buf);
+ fputs_unfiltered ("Unable to Allocate Memory for Source or Disassembly Display.\n",
+ gdb_stderr);
+ return TUI_FAILURE;
+ }
+ for (i = 0; i < max_lines; i++)
((struct tui_win_element *)
win_info->generic.content[i])->which_element.source.line =
- srcLineBuf + (lineWidth * i);
- ret = TUI_SUCCESS;
+ src_line_buf + (line_width * i);
}
- else
- ret = TUI_SUCCESS;
- return ret;
-} /* tuiAllocSourceBuffer */
+ return TUI_SUCCESS;
+}
/* Answer whether the 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_win_info *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->generic.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 = (((struct tui_win_element *)
+ win_info->generic.content[i])->which_element.source.line_or_addr.loa
+ == LOA_LINE)
+ && (((struct tui_win_element *)
+ win_info->generic.content[i])->which_element.source.line_or_addr.u.line_no
+ == (int) line);
i++;
}
- return isDisplayed;
+ return is_displayed;
}
/* Answer whether the 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_win_info *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->generic.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 = (((struct tui_win_element *)
+ win_info->generic.content[i])->which_element.source.line_or_addr.loa
+ == LOA_ADDRESS)
+ && (((struct tui_win_element *)
+ win_info->generic.content[i])->which_element.source.line_or_addr.u.addr
+ == addr);
i++;
}
- return isDisplayed;
+ return is_displayed;
}
projects / thirdparty / binutils-gdb.git / blobdiff