2011-03-25 Kai Tietz <ktietz@redhat.com>

[deliverable/binutils-gdb.git] / gdb / tui / tui-winsource.c

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 52ba3468a81ba801c4f15140d85a875da50f63a7..4c8658d5156e2e532cf721e99fb5844599e3f1ec 100644 (file)
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -28,6 +28,7 @@
 #include "value.h"
 #include "source.h"
 #include "objfiles.h"
+#include "filenames.h"
 
 #include "tui/tui.h"
 #include "tui/tui-data.h"
@@ -114,9 +115,11 @@ tui_update_source_window_as_is (struct tui_win_info *win_info,
        {
          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.  */
@@ -328,7 +331,8 @@ tui_horizontal_source_scroll (struct tui_win_info *win_info,
 
       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)));
@@ -337,11 +341,13 @@ tui_horizontal_source_scroll (struct tui_win_info *win_info,
        }
 
       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;
@@ -436,7 +442,8 @@ tui_update_breakpoint_info (struct tui_win_info *win,
       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;
 
@@ -452,7 +459,7 @@ tui_update_breakpoint_info (struct tui_win_info *win,
                      || line->line_or_addr.loa == LOA_ADDRESS);
           if ((win == TUI_SRC_WIN
                && bp->source_file
-               && (strcmp (src->filename, bp->source_file) == 0)
+               && (filename_cmp (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
@@ -490,9 +497,11 @@ 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 =
@@ -510,7 +519,8 @@ tui_set_exec_info_content (struct tui_win_info *win_info)
               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));
@@ -547,7 +557,8 @@ tui_set_exec_info_content (struct tui_win_info *win_info)
 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);
@@ -566,7 +577,8 @@ tui_show_exec_info_content (struct tui_win_info *win_info)
 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);
@@ -608,7 +620,8 @@ tui_alloc_source_buffer (struct tui_win_info *win_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;
        }
@@ -617,7 +630,8 @@ tui_alloc_source_buffer (struct tui_win_info *win_info)
           (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;
        }
@@ -631,7 +645,7 @@ tui_alloc_source_buffer (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_line_is_displayed (int line, 
@@ -662,7 +676,7 @@ 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,