Fix building on non-INSN_SCHEDULING targets, and fix a small bug in rgn_print_insn.

From-SVN: r38042

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7ed6d66d61b384480ff632a036231425384c228b..7fad8ade3155a9b471f0909f2bf53d942cf37661 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-05  Bernd Schmidt  <bernds@redhat.co.uk>
+
+       * sched-vis.c: Guard with #ifdef INSN_SCHEDULING.
+       * sched-rgn.c: Likewise.
+       (rgn_print_insn): Fix output.
+
 2000-12-05  Bruce Korb  <bkorb@gnu.org>
 
        * fixinc/Makefile.*: make these more consistent

diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 76fb1989de55118bca2bab2c55f0cf51de6be180..46a79058867a8bf488e414374af0f133e35357ba 100644 (file)
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -62,6 +62,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "recog.h"
 #include "sched-int.h"
 
+#ifdef INSN_SCHEDULING
 /* Some accessor macros for h_i_d members only used within this file.  */
 #define INSN_REF_COUNT(INSN)   (h_i_d[INSN_UID (INSN)].ref_count)
 #define FED_BY_SPEC_LOAD(insn) (h_i_d[INSN_UID (insn)].fed_by_spec_load)
@@ -2255,9 +2256,10 @@ rgn_print_insn (insn, aligned)
     sprintf (tmp, "b%3d: i%4d", INSN_BB (insn), INSN_UID (insn));
   else
     {
-      sprintf (tmp, "%d", INSN_UID (insn));
       if (current_nr_blocks > 1 && INSN_BB (insn) != target_bb)
-       sprintf (tmp, "/b%d ", INSN_BB (insn));
+       sprintf (tmp, "%d/b%d", INSN_UID (insn), INSN_BB (insn));
+      else
+       sprintf (tmp, "%d", INSN_UID (insn));
     }
   return tmp;
 }
@@ -3114,3 +3116,4 @@ schedule_insns (dump_file)
 
   free (deaths_in_region);
 }
+#endif

diff --git a/gcc/sched-vis.c b/gcc/sched-vis.c
index 9bbc4357d7ce15119f7618e04e3b7371241b289a..7e4fdab2d717bdfc9c5d8563ef040c18e95f5a17 100644 (file)
--- a/gcc/sched-vis.c
+++ b/gcc/sched-vis.c
@@ -30,6 +30,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "insn-attr.h"
 #include "sched-int.h"
 
+#ifdef INSN_SCHEDULING
 /* target_units bitmask has 1 for each unit in the cpu.  It should be
    possible to compute this variable from the machine description.
    But currently it is computed by examining the insn list.  Since
@@ -927,3 +928,4 @@ visualize_free ()
 {
   free (visual_tbl);
 }
+#endif