X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-winsource.c;h=9b936e11613010605209a6dc9f1f32d16b949e84;hb=f8eba3c61629b3c03ac1f33853eab4d8507adb9c;hp=5b498dffb27482bc1403208753e7a3d84b222463;hpb=88d83552b190308353cbb345b5f07b2b995ef37c;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 5b498dffb2..9b936e1161 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -1,7 +1,7 @@
/* TUI display source/assembly window.
- Copyright (C) 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.
@@ -9,7 +9,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 +18,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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include "defs.h"
#include
@@ -29,6 +27,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"
@@ -49,14 +49,15 @@ 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;
- 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);
@@ -71,11 +72,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,
- struct 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;
}
@@ -84,15 +88,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,
- struct 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.u.line_no, noerror);
else
- ret = tui_set_disassem_content (line_or_addr.u.addr);
+ ret = tui_set_disassem_content (gdbarch, line_or_addr.u.addr);
if (ret == TUI_FAILURE)
{
@@ -108,16 +115,16 @@ tui_update_source_window_as_is (struct tui_win_info * win_info, struct symtab *s
{
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
- */
- 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);
}
}
@@ -130,7 +137,7 @@ 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)
{
@@ -141,16 +148,16 @@ tui_update_source_windows_with_addr (CORE_ADDR addr)
{
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.loa = LOA_LINE;
l.u.line_no = sal.line;
- tui_show_symtab_source (sal.symtab, l, FALSE);
+ tui_show_symtab_source (gdbarch, sal.symtab, l, FALSE);
break;
}
}
@@ -160,7 +167,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);
@@ -173,24 +180,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;
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.loa = LOA_LINE;
l.u.line_no = line;
- tui_show_symtab_source (s, l, FALSE);
+ 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;
}
@@ -199,7 +212,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)
{
@@ -209,8 +223,9 @@ 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 =
+ (struct tui_win_element *) win_info->generic.content[i];
+
element->which_element.source.has_break = FALSE;
element->which_element.source.is_exec_point = FALSE;
}
@@ -219,7 +234,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;
@@ -245,10 +261,10 @@ tui_erase_source_content (struct tui_win_info * win_info, int display_prompt)
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, no_src_str);
}
@@ -259,9 +275,9 @@ 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;
+ struct tui_win_element *line;
int x, y;
line = (struct tui_win_element *) win_info->generic.content[lineno - 1];
@@ -283,7 +299,7 @@ tui_show_source_line (struct tui_win_info * win_info, int lineno)
}
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)
{
@@ -303,31 +319,39 @@ 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_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,
+ 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);
@@ -337,9 +361,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 (struct 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;
@@ -384,7 +411,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))
{
@@ -394,25 +421,29 @@ 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 = &((struct tui_win_element *)
+ win->generic.content[i])->which_element.source;
if (current_only && !line->is_exec_point)
continue;
@@ -424,28 +455,34 @@ tui_update_breakpoint_info (struct tui_win_info * win, int current_only)
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->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->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->source_file
+ && (filename_cmp (src->filename, loc->source_file) == 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)
{
@@ -461,13 +498,15 @@ 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 =
@@ -480,12 +519,13 @@ 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];
+ src_element = (struct tui_win_element *)
+ win_info->generic.content[i];
memset(element->which_element.simple_string, ' ',
sizeof(element->which_element.simple_string));
@@ -520,9 +560,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);
@@ -539,16 +580,17 @@ tui_show_exec_info_content (struct tui_win_info * win_info)
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);
@@ -558,7 +600,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);
@@ -569,52 +611,50 @@ 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 */
+ 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)
{
- src_line_buf = (char *) xmalloc ((max_lines * line_width) * sizeof (char));
+ 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);
- }
+ fputs_unfiltered ("Unable to Allocate Memory for "
+ "Source or Disassembly Display.\n",
+ gdb_stderr);
+ return TUI_FAILURE;
+ }
+ /* 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 =
src_line_buf + (line_width * i);
- ret = TUI_SUCCESS;
}
- 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;
@@ -625,14 +665,15 @@ 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.loa
+ 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);
+ && (((struct tui_win_element *)
+ win_info->generic.content[i])->which_element.source.line_or_addr.u.line_no
+ == (int) line);
i++;
}
@@ -640,11 +681,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;
@@ -654,14 +696,15 @@ 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.loa
+ 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);
+ && (((struct tui_win_element *)
+ win_info->generic.content[i])->which_element.source.line_or_addr.u.addr
+ == addr);
i++;
}