sched-vis.c (visual_tbl_line_length): New variable.

* sched-vis.c (visual_tbl_line_length): New variable.
(get_visual_tbl_length): Set it.
(visualize_stall_cycles): Don't let stalls overrun
visual_tbl_line_length.

From-SVN: r38053

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d2a3e48ef2d6757f3c41a37338a4ce3ce4173f6c..ef557b2ad8b7fae7e254e3c351245a536334f83d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-05  Alexandre Oliva  <aoliva@redhat.com>
+
+       * sched-vis.c (visual_tbl_line_length): New variable.
+       (get_visual_tbl_length): Set it.
+       (visualize_stall_cycles): Don't let stalls overrun
+       visual_tbl_line_length.
+
 2000-12-05  Geoffrey Keating  <geoffk@redhat.com>
 
        * global.c (global_conflicts): Allow for a REG_UNUSED note

diff --git a/gcc/sched-vis.c b/gcc/sched-vis.c
index 7e4fdab2d717bdfc9c5d8563ef040c18e95f5a17..99489c9d18df3249456e46e61922e7acfa42898b 100644 (file)
--- a/gcc/sched-vis.c
+++ b/gcc/sched-vis.c
@@ -82,6 +82,7 @@ insn_print_units (insn)
 #define MAX_VISUAL_LINES 100
 #define INSN_LEN 30
 int n_visual_lines;
+static unsigned visual_tbl_line_length;
 char *visual_tbl;
 int n_vis_no_unit;
 rtx vis_no_unit[10];
@@ -133,6 +134,8 @@ get_visual_tbl_length ()
   n += n1;
   n += strlen ("\n") + 2;
 
+  visual_tbl_line_length = n;
+
   /* Compute length of visualization string.  */
   return (MAX_VISUAL_LINES * n);
 }
@@ -897,6 +900,9 @@ visualize_stall_cycles (stalls)
      int stalls;
 {
   int i;
+  const char *prefix = ";;       ";
+  const char *suffix = "\n";
+  char *p;
 
   /* If no more room, split table into two.  */
   if (n_visual_lines >= MAX_VISUAL_LINES)
@@ -907,10 +913,21 @@ visualize_stall_cycles (stalls)
 
   n_visual_lines++;
 
-  sprintf (visual_tbl + strlen (visual_tbl), ";;       ");
-  for (i = 0; i < stalls; i++)
-    sprintf (visual_tbl + strlen (visual_tbl), ".");
-  sprintf (visual_tbl + strlen (visual_tbl), "\n");
+  p = visual_tbl + strlen (visual_tbl);
+  strcpy (p, prefix);
+  p += strlen (prefix);
+
+  if ((unsigned)stalls >
+      visual_tbl_line_length - strlen (prefix) - strlen (suffix))
+    {
+      suffix = "[...]\n";
+      stalls = visual_tbl_line_length - strlen (prefix) - strlen (suffix);
+    }
+
+  memset (p, '.', stalls);
+  p += stalls;
+
+  strcpy (p, suffix);
 }
 
 /* Allocate data used for visualization during scheduling.  */