/* TUI display source/assembly window.
- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008,
- 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1998-2014 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
#include "value.h"
#include "source.h"
#include "objfiles.h"
+#include "filenames.h"
#include "tui/tui.h"
#include "tui/tui-data.h"
#include "tui/tui-winsource.h"
#include "tui/tui-source.h"
#include "tui/tui-disasm.h"
-
-#include "gdb_string.h"
#include "gdb_curses.h"
-#include "gdb_assert.h"
/* Function to display the "main" routine. */
void
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 (gdbarch, addr);
- sal = find_pc_line (addr, 0);
- if (sal.symtab)
- tui_update_locator_filename (sal.symtab->filename);
+ 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 ("??");
}
}
}
{
struct symtab_and_line sal;
+ init_sal (&sal);
sal.line = line_or_addr.u.line_no +
(win_info->generic.content_size - 2);
sal.symtab = s;
+ sal.pspace = s->objfile->pspace;
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. */
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 *) win_info->generic.content[i];
+
element->which_element.source.has_break = FALSE;
element->which_element.source.is_exec_point = FALSE;
}
if (win_info->generic.type == SRC_WIN)
{
- struct symtab_and_line cursal = get_current_source_symtab_and_line ();
+ 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)));
+ 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;
int mode;
struct tui_source_element *line;
- line = &((struct tui_win_element *) win->generic.content[i])->which_element.source;
+ line = &((struct tui_win_element *)
+ win->generic.content[i])->which_element.source;
if (current_only && !line->is_exec_point)
continue;
bp != (struct breakpoint *) NULL;
bp = bp->next)
{
+ struct bp_location *loc;
+
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)
- && line->line_or_addr.loa == LOA_LINE
- && bp->line_number == line->line_or_addr.u.line_no)
- || (win == TUI_DISASM_WIN
- && 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;
- 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;
- }
+
+ 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)
{
{
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 =
int mode;
element = (struct tui_win_element *) exec_info_ptr->content[i];
- src_element = (struct tui_win_element *) win_info->generic.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));
void
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);
void
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);
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",
+ fputs_unfiltered ("Unable to Allocate Memory for "
+ "Source or Disassembly Display.\n",
gdb_stderr);
return TUI_FAILURE;
}
(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",
+ fputs_unfiltered ("Unable to Allocate Memory for "
+ "Source or Disassembly Display.\n",
gdb_stderr);
return TUI_FAILURE;
}
}
-/* 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,
}
-/* 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,
projects / deliverable / binutils-gdb.git / blobdiff