X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-source.c;h=912eaa4544018b44988a55373149d561500c4fb1;hb=f5a7c406b1975cde626efed526960f2cf1bdaceb;hp=057383f8bf2b2bec78d775008b5a77a7296723c3;hpb=13274fc342aae3c94dbb38f01ba7d8f2e3821ddf;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 057383f8bf..912eaa4544 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -1,7 +1,6 @@
 /* TUI display source window.
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -21,353 +20,199 @@
    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"
 #include "breakpoint.h"
 #include "source.h"
-#include "symtab.h"
 #include "objfiles.h"
+#include "filenames.h"
+#include "source-cache.h"
 
 #include "tui/tui.h"
 #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_string.h"
 #include "gdb_curses.h"
 
 /* Function to display source in the source window.  */
-enum tui_status
-tui_set_source_content (struct symtab *s, 
-			int line_no,
-			int noerror)
+bool
+tui_source_window::set_contents (struct gdbarch *arch,
+				 const struct symtab_and_line &sal)
 {
-  enum tui_status ret = TUI_FAILURE;
-
-  if (s != (struct symtab *) NULL && s->filename != (char *) NULL)
-    {
-      FILE *stream;
-      int i, desc, c, line_width, nlines;
-      char *src_line = 0;
+  struct symtab *s = sal.symtab;
+  int line_no = sal.line;
 
-      if ((ret = tui_alloc_source_buffer (TUI_SRC_WIN)) == TUI_SUCCESS)
-	{
-	  line_width = TUI_SRC_WIN->generic.width - 1;
-	  /* Take hilite (window border) into account, when
-	     calculating the number of lines.  */
-	  nlines = (line_no + (TUI_SRC_WIN->generic.height - 2)) - line_no;
-	  desc = open_source_file (s);
-	  if (desc < 0)
-	    {
-	      if (!noerror)
-		{
-		  char *name = alloca (strlen (s->filename) + 100);
-		  sprintf (name, "%s:%d", s->filename, line_no);
-		  print_sys_errmsg (name, errno);
-		}
-	      ret = TUI_FAILURE;
-	    }
-	  else
-	    {
-	      if (s->line_charpos == 0)
-		find_source_lines (s, desc);
-
-	      if (line_no < 1 || line_no > s->nlines)
-		{
-		  close (desc);
-		  printf_unfiltered (
-			  "Line number %d out of range; %s has %d lines.\n",
-				      line_no, s->filename, s->nlines);
-		}
-	      else if (lseek (desc, s->line_charpos[line_no - 1], 0) < 0)
-		{
-		  close (desc);
-		  perror_with_name (s->filename);
-		}
-	      else
-		{
-		  int offset, cur_line_no, cur_line, cur_len, threshold;
-		  struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
-                  struct tui_source_info *src = &TUI_SRC_WIN->detail.source_info;
-
-                  if (TUI_SRC_WIN->generic.title)
-                    xfree (TUI_SRC_WIN->generic.title);
-                  TUI_SRC_WIN->generic.title = xstrdup (s->filename);
-
-                  if (src->filename)
-                    xfree (src->filename);
-                  src->filename = xstrdup (s->filename);
-
-		  /* Determine the threshold for the length of the
-                     line and the offset to start the display.  */
-		  offset = src->horizontal_offset;
-		  threshold = (line_width - 1) + offset;
-		  stream = fdopen (desc, FOPEN_RT);
-		  clearerr (stream);
-		  cur_line = 0;
-		  src->gdbarch = get_objfile_arch (s->objfile);
-		  src->start_line_or_addr.loa = LOA_LINE;
-		  cur_line_no = src->start_line_or_addr.u.line_no = line_no;
-		  if (offset > 0)
-		    src_line = (char *) xmalloc (
-					   (threshold + 1) * sizeof (char));
-		  while (cur_line < nlines)
-		    {
-		      struct tui_win_element *element = (struct tui_win_element *)
-		      TUI_SRC_WIN->generic.content[cur_line];
-
-		      /* Get the first character in the line.  */
-		      c = fgetc (stream);
-
-		      if (offset == 0)
-			src_line = ((struct tui_win_element *)
-				   TUI_SRC_WIN->generic.content[
-					cur_line])->which_element.source.line;
-		      /* Init the line with the line number.  */
-		      sprintf (src_line, "%-6d", cur_line_no);
-		      cur_len = strlen (src_line);
-		      i = cur_len -
-			((cur_len / tui_default_tab_len ()) * tui_default_tab_len ());
-		      while (i < tui_default_tab_len ())
-			{
-			  src_line[cur_len] = ' ';
-			  i++;
-			  cur_len++;
-			}
-		      src_line[cur_len] = (char) 0;
-
-		      /* Set whether element is the execution point
-		         and whether there is a break point on it.  */
-		      element->which_element.source.line_or_addr.loa =
-			LOA_LINE;
-		      element->which_element.source.line_or_addr.u.line_no =
-			cur_line_no;
-		      element->which_element.source.is_exec_point =
-			(strcmp (((struct tui_win_element *)
-				  locator->content[0])->which_element.locator.file_name,
-				 s->filename) == 0
-			 && cur_line_no == ((struct tui_win_element *)
-					    locator->content[0])->which_element.locator.line_no);
-		      if (c != EOF)
-			{
-			  i = strlen (src_line) - 1;
-			  do
-			    {
-			      if ((c != '\n') && (c != '\r') 
-				  && (++i < threshold))
-				{
-				  if (c < 040 && c != '\t')
-				    {
-				      src_line[i++] = '^';
-				      src_line[i] = c + 0100;
-				    }
-				  else if (c == 0177)
-				    {
-				      src_line[i++] = '^';
-				      src_line[i] = '?';
-				    }
-				  else
-				    { /* Store the charcter in the
-					 line buffer.  If it is a tab,
-					 then translate to the correct
-					 number of chars so we don't
-					 overwrite our buffer.  */
-				      if (c == '\t')
-					{
-					  int j, max_tab_len = tui_default_tab_len ();
-
-					  for (j = i - ((i / max_tab_len) * max_tab_len);
-					       j < max_tab_len
-						 && i < threshold;
-					       i++, j++)
-					    src_line[i] = ' ';
-					  i--;
-					}
-				      else
-					src_line[i] = c;
-				    }
-				  src_line[i + 1] = 0;
-				}
-			      else
-				{ /* If we have not reached EOL, then
-				     eat chars until we do.  */
-				  while (c != EOF && c != '\n' && c != '\r')
-				    c = fgetc (stream);
-				  /* Handle non-'\n' end-of-line.  */
-				  if (c == '\r' 
-				      && (c = fgetc (stream)) != '\n' 
-				      && c != EOF)
-				    {
-				       ungetc (c, stream);
-				       c = '\r';
-				    }
-				  
-				}
-			    }
-			  while (c != EOF && c != '\n' && c != '\r' 
-				 && i < threshold 
-				 && (c = fgetc (stream)));
-			}
-		      /* Now copy the line taking the offset into
-			 account.  */
-		      if (strlen (src_line) > offset)
-			strcpy (((struct tui_win_element *) TUI_SRC_WIN->generic.content[
-					cur_line])->which_element.source.line,
-				&src_line[offset]);
-		      else
-			((struct tui_win_element *)
-			 TUI_SRC_WIN->generic.content[
-			  cur_line])->which_element.source.line[0] = (char) 0;
-		      cur_line++;
-		      cur_line_no++;
-		    }
-		  if (offset > 0)
-		    xfree (src_line);
-		  fclose (stream);
-		  TUI_SRC_WIN->generic.content_size = nlines;
-		  ret = TUI_SUCCESS;
-		}
-	    }
-	}
-    }
-  return ret;
-}
+  if (s == NULL)
+    return false;
 
+  int line_width, nlines;
 
-/* elz: This function sets the contents of the source window to empty
-   except for a line in the middle with a warning message about the
-   source not being available.  This function is called by
-   tui_erase_source_contents(), which in turn is invoked when the
-   source files cannot be accessed.  */
-
-void
-tui_set_source_content_nil (struct tui_win_info *win_info, 
-			    char *warning_string)
-{
-  int line_width;
-  int n_lines;
-  int curr_line = 0;
-
-  line_width = win_info->generic.width - 1;
-  n_lines = win_info->generic.height - 2;
-
-  /* Set to empty each line in the window, except for the one which
-     contains the message.  */
-  while (curr_line < win_info->generic.content_size)
-    {
-      /* Set the information related to each displayed line to null:
-         i.e. the line number is 0, there is no bp, it is not where
-         the program is stopped.  */
-
-      struct tui_win_element *element =
-	(struct tui_win_element *) win_info->generic.content[curr_line];
-      element->which_element.source.line_or_addr.loa = LOA_LINE;
-      element->which_element.source.line_or_addr.u.line_no = 0;
-      element->which_element.source.is_exec_point = FALSE;
-      element->which_element.source.has_break = FALSE;
-
-      /* Set the contents of the line to blank.  */
-      element->which_element.source.line[0] = (char) 0;
-
-      /* If the current line is in the middle of the screen, then we
-         want to display the 'no source available' message in it.
-         Note: the 'weird' arithmetic with the line width and height
-         comes from the function tui_erase_source_content().  We need
-         to keep the screen and the window's actual contents in
-         synch.  */
-
-      if (curr_line == (n_lines / 2 + 1))
-	{
-	  int i;
-	  int xpos;
-	  int warning_length = strlen (warning_string);
-	  char *src_line;
+  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;
 
-	  src_line = element->which_element.source.line;
+  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 (warning_length >= ((line_width - 1) / 2))
-	    xpos = 1;
-	  else
-	    xpos = (line_width - 1) / 2 - warning_length;
+  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);
 
-	  for (i = 0; i < xpos; i++)
-	    src_line[i] = ' ';
+  title = s_filename;
 
-	  sprintf (src_line + i, "%s", warning_string);
+  m_fullname = make_unique_xstrdup (symtab_to_fullname (s));
 
-	  for (i = xpos + warning_length; i < line_width; i++)
-	    src_line[i] = ' ';
+  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;
 
-	  src_line[i] = '\n';
-
-	}			/* end if */
-
-      curr_line++;
-
-    }				/* end while */
-}
+  int digits = 0;
+  if (compact_source)
+    {
+      /* 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;
+    }
 
+  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 (struct gdbarch *gdbarch, struct symtab *s,
-			struct tui_line_or_address line, 
-			int noerror)
-{
-  TUI_SRC_WIN->detail.source_info.horizontal_offset = 0;
-  tui_update_source_window_as_is (TUI_SRC_WIN, gdbarch, s, line, noerror);
+  return true;
 }
 
 
 /* Answer whether the source is currently displayed in the source
    window.  */
-int
-tui_source_is_displayed (char *fname)
+bool
+tui_source_window::showing_source_p (const char *fullname) const
 {
-  return (TUI_SRC_WIN->generic.content_in_use 
-	  && (strcmp (((struct tui_win_element *) (tui_locator_win_info_ptr ())->
-		       content[0])->which_element.locator.file_name, fname) == 0));
+  return (!content.empty ()
+	  && (filename_cmp (tui_locator_win_info_ptr ()->full_name.c_str (),
+			    fullname) == 0));
 }
 
 
 /* Scroll the source forward or backward vertically.  */
 void
-tui_vertical_source_scroll (enum tui_scroll_direction scroll_direction,
-			    int num_to_scroll)
+tui_source_window::do_scroll_vertical (int num_to_scroll)
 {
-  if (TUI_SRC_WIN->generic.content != NULL)
+  if (!content.empty ())
     {
-      struct tui_line_or_address l;
       struct symtab *s;
-      tui_win_content content = (tui_win_content) TUI_SRC_WIN->generic.content;
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
+      struct gdbarch *arch = gdbarch;
 
-      if (cursal.symtab == (struct symtab *) NULL)
-	s = find_pc_symtab (get_frame_pc (get_selected_frame (NULL)));
-      else
-	s = cursal.symtab;
-
-      l.loa = LOA_LINE;
-      if (scroll_direction == FORWARD_SCROLL)
+      if (cursal.symtab == NULL)
 	{
-	  l.u.line_no = content[0]->which_element.source.line_or_addr.u.line_no
-	    + num_to_scroll;
-	  if (l.u.line_no > s->nlines)
-	    /* line = s->nlines - win_info->generic.content_size + 1; */
-	    /* elz: fix for dts 23398.  */
-	    l.u.line_no = content[0]->which_element.source.line_or_addr.u.line_no;
+	  struct frame_info *fi = get_selected_frame (NULL);
+	  s = find_pc_line_symtab (get_frame_pc (fi));
+	  arch = get_frame_arch (fi);
 	}
       else
-	{
-	  l.u.line_no = content[0]->which_element.source.line_or_addr.u.line_no
-	    - num_to_scroll;
-	  if (l.u.line_no <= 0)
-	    l.u.line_no = 1;
-	}
+	s = cursal.symtab;
+
+      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;
+
+      cursal.line = line_no;
+      find_line_pc (cursal.symtab, cursal.line, &cursal.pc);
+      for (struct tui_source_window_base *win_info : tui_source_windows ())
+	win_info->update_source_window_as_is (arch, cursal);
+    }
+}
+
+bool
+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 (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::maybe_update (struct frame_info *fi, symtab_and_line sal)
+{
+  int start_line = (sal.line - ((height - 2) / 2)) + 1;
+  if (start_line <= 0)
+    start_line = 1;
 
-      print_source_lines (s, l.u.line_no, l.u.line_no + 1, 0);
+  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);
     }
 }