PR symtab/17559

[thirdparty/binutils-gdb.git] / gdb / tui / tui-source.c

diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 52b6f41f1f27ee94f058a709dcbdbd89d81b24d9..9842bb37e3a9411b1b14d461f887c94023b58b86 100644 (file)
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -1,6 +1,6 @@
 /* TUI display source window.
 
-   Copyright (C) 1998-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -34,8 +34,6 @@
 #include "tui/tui-stack.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
-
-#include "gdb_string.h"
 #include "gdb_curses.h"
 
 /* Function to display source in the source window.  */
@@ -153,8 +151,8 @@ tui_set_source_content (struct symtab *s,
                        cur_line_no;
                      element->which_element.source.is_exec_point =
                        (filename_cmp (((struct tui_win_element *)
-                                      locator->content[0])->which_element.locator.file_name,
-                                      s->filename) == 0
+                                      locator->content[0])->which_element.locator.full_name,
+                                      symtab_to_fullname (s)) == 0
                         && cur_line_no == ((struct tui_win_element *)
                                            locator->content[0])->which_element.locator.line_no);
                      if (c != EOF)
@@ -335,14 +333,14 @@ tui_show_symtab_source (struct gdbarch *gdbarch, struct symtab *s,
 /* Answer whether the source is currently displayed in the source
    window.  */
 int
-tui_source_is_displayed (const char *fname)
+tui_source_is_displayed (const char *fullname)
 {
   return (TUI_SRC_WIN != NULL
          && TUI_SRC_WIN->generic.content_in_use 
          && (filename_cmp (((struct tui_win_element *)
                             (tui_locator_win_info_ptr ())->
-                            content[0])->which_element.locator.file_name,
-                           fname) == 0));
+                            content[0])->which_element.locator.full_name,
+                           fullname) == 0));
 }
 
 
@@ -359,7 +357,7 @@ tui_vertical_source_scroll (enum tui_scroll_direction scroll_direction,
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
 
       if (cursal.symtab == (struct 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;