X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-source.c;h=13f2dc7cfe177904495e88fe95daad9ee92d0a0b;hb=9ae6bf640dc7c950e6f36097a3d2d760a132a542;hp=e171101e7fb2b211afb8d9b8e6d710c6c4f6dee0;hpb=1e0c09ba0bdd8b4dd1ab3a61b2ae2d326825bee1;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index e171101e7f..13f2dc7cfe 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -1,6 +1,6 @@
 /* TUI display source window.
 
-   Copyright (C) 1998-2019 Free Software Foundation, Inc.
+   Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -20,6 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include <math.h>
 #include <ctype.h>
 #include "symtab.h"
 #include "frame.h"
@@ -33,192 +34,88 @@
 #include "tui/tui-data.h"
 #include "tui/tui-io.h"
 #include "tui/tui-stack.h"
+#include "tui/tui-win.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
 #include "gdb_curses.h"
 
-/* A helper function for tui_set_source_content that extracts some
-   source text from PTR.  LINE_NO is the line number; FIRST_COL is the
-   first column to extract, and LINE_WIDTH is the number of characters
-   to display.  Returns a string holding the desired text.  */
-
-static std::string
-copy_source_line (const char **ptr, int line_no, int first_col,
-		  int line_width)
+/* Function to display source in the source window.  */
+bool
+tui_source_window::set_contents (struct gdbarch *arch,
+				 const struct symtab_and_line &sal)
 {
-  const char *lineptr = *ptr;
-
-  /* Init the line with the line number.  */
-  std::string result = string_printf ("%-6d", line_no);
-  int len = result.size ();
-  len = len - ((len / tui_tab_width) * tui_tab_width);
-  result.append (len, ' ');
+  struct symtab *s = sal.symtab;
+  int line_no = sal.line;
 
-  int column = 0;
-  char c;
-  do
-    {
-      int skip_bytes;
+  if (s == NULL)
+    return false;
 
-      c = *lineptr;
-      if (c == '\033' && skip_ansi_escape (lineptr, &skip_bytes))
-	{
-	  /* We always have to preserve escapes.  */
-	  result.append (lineptr, lineptr + skip_bytes);
-	  lineptr += skip_bytes;
-	  continue;
-	}
+  int line_width, nlines;
 
-      ++lineptr;
-      ++column;
+  line_width = width - TUI_EXECINFO_SIZE - 1;
+  /* Take hilite (window border) into account, when
+     calculating the number of lines.  */
+  nlines = (line_no + (height - 2)) - line_no;
 
-      auto process_tab = [&] ()
-	{
-	  int max_tab_len = tui_tab_width;
-
-	  --column;
-	  for (int j = column % max_tab_len;
-	       j < max_tab_len && column < first_col + line_width;
-	       column++, j++)
-	    if (column >= first_col)
-	      result.push_back (' ');
-	};
-
-      /* We have to process all the text in order to pick up all the
-	 escapes.  */
-      if (column <= first_col || column > first_col + line_width)
-	{
-	  if (c == '\t')
-	    process_tab ();
-	  continue;
-	}
+  std::string srclines;
+  const std::vector<off_t> *offsets;
+  if (!g_source_cache.get_source_lines (s, line_no, line_no + nlines,
+					&srclines)
+      || !g_source_cache.get_line_charpos (s, &offsets))
+    return false;
 
-      if (c == '\n' || c == '\r' || c == '\0')
-	{
-	  /* Nothing.  */
-	}
-      else if (c < 040 && c != '\t')
-	{
-	  result.push_back ('^');
-	  result.push_back (c + 0100);
-	}
-      else if (c == 0177)
-	{
-	  result.push_back ('^');
-	  result.push_back ('?');
-	}
-      else if (c == '\t')
-	process_tab ();
-      else
-	result.push_back (c);
-    }
-  while (c != '\0' && c != '\n' && c != '\r');
+  int cur_line_no, cur_line;
+  struct tui_locator_window *locator
+    = tui_locator_win_info_ptr ();
+  const char *s_filename = symtab_to_filename_for_display (s);
 
-  if (c == '\r' && *lineptr == '\n')
-    ++lineptr;
-  *ptr = lineptr;
+  title = s_filename;
 
-  return result;
-}
+  m_fullname = make_unique_xstrdup (symtab_to_fullname (s));
 
-/* Function to display source in the source window.  */
-enum tui_status
-tui_set_source_content (tui_source_window_base *win_info,
-			struct symtab *s, 
-			int line_no,
-			int noerror)
-{
-  enum tui_status ret = TUI_FAILURE;
+  cur_line = 0;
+  gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s));
+  start_line_or_addr.loa = LOA_LINE;
+  cur_line_no = start_line_or_addr.u.line_no = line_no;
 
-  if (s != NULL)
+  int digits = 0;
+  if (compact_source)
     {
-      int line_width, nlines;
-
-      ret = TUI_SUCCESS;
-      tui_alloc_source_buffer (win_info);
-      line_width = win_info->width - 1;
-      /* Take hilite (window border) into account, when
-	 calculating the number of lines.  */
-      nlines = (line_no + (win_info->height - 2)) - line_no;
-
-      std::string srclines;
-      if (!g_source_cache.get_source_lines (s, line_no, line_no + nlines,
-					    &srclines))
-	{
-	  if (!noerror)
-	    {
-	      const char *filename = symtab_to_filename_for_display (s);
-	      char *name = (char *) alloca (strlen (filename) + 100);
-
-	      sprintf (name, "%s:%d", filename, line_no);
-	      print_sys_errmsg (name, errno);
-	    }
-	  ret = TUI_FAILURE;
-	}
-      else
-	{
-	  int cur_line_no, cur_line;
-	  struct tui_locator_window *locator
-	    = tui_locator_win_info_ptr ();
-	  const char *s_filename = symtab_to_filename_for_display (s);
-
-	  xfree (win_info->title);
-	  win_info->title = xstrdup (s_filename);
-
-	  xfree (win_info->fullname);
-	  win_info->fullname = xstrdup (symtab_to_fullname (s));
-
-	  cur_line = 0;
-	  win_info->gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s));
-	  win_info->start_line_or_addr.loa = LOA_LINE;
-	  cur_line_no = win_info->start_line_or_addr.u.line_no = line_no;
-
-	  const char *iter = srclines.c_str ();
-	  win_info->content.resize (nlines);
-	  while (cur_line < nlines)
-	    {
-	      struct tui_source_element *element
-		= &win_info->content[cur_line];
-
-	      std::string text;
-	      if (*iter != '\0')
-		text = copy_source_line (&iter, cur_line_no,
-					 win_info->horizontal_offset,
-					 line_width);
-
-	      /* Set whether element is the execution point
-		 and whether there is a break point on it.  */
-	      element->line_or_addr.loa = LOA_LINE;
-	      element->line_or_addr.u.line_no = cur_line_no;
-	      element->is_exec_point
-		= (filename_cmp (locator->full_name,
-				 symtab_to_fullname (s)) == 0
-		   && cur_line_no == locator->line_no);
-
-	      xfree (win_info->content[cur_line].line);
-	      win_info->content[cur_line].line
-		= xstrdup (text.c_str ());
-
-	      cur_line++;
-	      cur_line_no++;
-	    }
-	  ret = TUI_SUCCESS;
-	}
+      /* Solaris 11+gcc 5.5 has ambiguous overloads of log10, so we
+	 cast to double to get the right one.  */
+      double l = log10 ((double) offsets->size ());
+      digits = 1 + (int) l;
     }
-  return ret;
-}
 
+  const char *iter = srclines.c_str ();
+  content.resize (nlines);
+  while (cur_line < nlines)
+    {
+      struct tui_source_element *element
+	= &content[cur_line];
+
+      std::string text;
+      if (*iter != '\0')
+	text = tui_copy_source_line (&iter, cur_line_no,
+				     horizontal_offset,
+				     line_width, digits);
+
+      /* Set whether element is the execution point
+	 and whether there is a break point on it.  */
+      element->line_or_addr.loa = LOA_LINE;
+      element->line_or_addr.u.line_no = cur_line_no;
+      element->is_exec_point
+	= (filename_cmp (locator->full_name.c_str (),
+			 symtab_to_fullname (s)) == 0
+	   && cur_line_no == locator->line_no);
+
+      content[cur_line].line = std::move (text);
+
+      cur_line++;
+      cur_line_no++;
+    }
 
-/* Function to display source in the source window.  This function
-   initializes the horizontal scroll to 0.  */
-void
-tui_show_symtab_source (tui_source_window_base *win_info,
-			struct gdbarch *gdbarch, struct symtab *s,
-			struct tui_line_or_address line, 
-			int noerror)
-{
-  win_info->horizontal_offset = 0;
-  tui_update_source_window_as_is (win_info, gdbarch, s, line, noerror);
+  return true;
 }
 
 
@@ -228,7 +125,7 @@ bool
 tui_source_window::showing_source_p (const char *fullname) const
 {
   return (!content.empty ()
-	  && (filename_cmp (tui_locator_win_info_ptr ()->full_name,
+	  && (filename_cmp (tui_locator_win_info_ptr ()->full_name.c_str (),
 			    fullname) == 0));
 }
 
@@ -239,47 +136,30 @@ tui_source_window::do_scroll_vertical (int num_to_scroll)
 {
   if (!content.empty ())
     {
-      struct tui_line_or_address l;
       struct symtab *s;
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
+      struct gdbarch *arch = gdbarch;
 
       if (cursal.symtab == NULL)
-	s = find_pc_line_symtab (get_frame_pc (get_selected_frame (NULL)));
+	{
+	  struct frame_info *fi = get_selected_frame (NULL);
+	  s = find_pc_line_symtab (get_frame_pc (fi));
+	  arch = get_frame_arch (fi);
+	}
       else
 	s = cursal.symtab;
 
-      l.loa = LOA_LINE;
-      l.u.line_no = content[0].line_or_addr.u.line_no
-	+ num_to_scroll;
-      if (l.u.line_no > s->nlines)
-	/* line = s->nlines - win_info->content_size + 1; */
-	/* elz: fix for dts 23398.  */
-	l.u.line_no = content[0].line_or_addr.u.line_no;
-      if (l.u.line_no <= 0)
-	l.u.line_no = 1;
-
-      print_source_lines (s, l.u.line_no, l.u.line_no + 1, 0);
-    }
-}
-
-tui_source_window::tui_source_window ()
-  : tui_source_window_base (SRC_WIN)
-{
-  gdb::observers::source_styling_changed.attach
-    (std::bind (&tui_source_window::style_changed, this),
-     m_observable);
-}
-
-tui_source_window::~tui_source_window ()
-{
-  gdb::observers::source_styling_changed.detach (m_observable);
-}
+      int line_no = start_line_or_addr.u.line_no + num_to_scroll;
+      const std::vector<off_t> *offsets;
+      if (g_source_cache.get_line_charpos (s, &offsets)
+	  && line_no > offsets->size ())
+	line_no = start_line_or_addr.u.line_no;
+      if (line_no <= 0)
+	line_no = 1;
 
-void
-tui_source_window::style_changed ()
-{
-  if (tui_active && is_visible)
-    refill ();
+      cursal.line = line_no;
+      update_source_window (arch, cursal);
+    }
 }
 
 bool
@@ -288,15 +168,49 @@ tui_source_window::location_matches_p (struct bp_location *loc, int line_no)
   return (content[line_no].line_or_addr.loa == LOA_LINE
 	  && content[line_no].line_or_addr.u.line_no == loc->line_number
 	  && loc->symtab != NULL
-	  && filename_cmp (fullname,
+	  && filename_cmp (m_fullname.get (),
 			   symtab_to_fullname (loc->symtab)) == 0);
 }
 
+/* See tui-source.h.  */
+
+bool
+tui_source_window::line_is_displayed (int line) const
+{
+  if (content.size () < SCROLL_THRESHOLD)
+    return false;
+
+  for (size_t i = 0; i < content.size () - SCROLL_THRESHOLD; ++i)
+    {
+      if (content[i].line_or_addr.loa == LOA_LINE
+	  && content[i].line_or_addr.u.line_no == line)
+	return true;
+    }
+
+  return false;
+}
+
 void
-tui_source_window_base::reset (int height, int width,
-			       int origin_x, int origin_y)
+tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal)
 {
-  tui_gen_win_info::reset (height, width - 3,
-			   origin_x + 3, origin_y);
-  execution_info->reset (height, 3, origin_x, origin_y);
+  int start_line = (sal.line - ((height - 2) / 2)) + 1;
+  if (start_line <= 0)
+    start_line = 1;
+
+  bool source_already_displayed = (sal.symtab != 0
+				   && showing_source_p (m_fullname.get ()));
+
+  if (!(source_already_displayed && line_is_displayed (sal.line)))
+    {
+      sal.line = start_line;
+      update_source_window (get_frame_arch (fi), sal);
+    }
+  else
+    {
+      struct tui_line_or_address l;
+
+      l.loa = LOA_LINE;
+      l.u.line_no = sal.line;
+      set_is_exec_point_at (l);
+    }
 }