bt-load.c (migrate_btr_def): Conditionalize calls to insn_default_latency and result_...

	* bt-load.c (migrate_btr_def) [INSN_SCHEDULING]: Conditionalize
	calls to insn_default_latency and result_ready_cost.  Initialize
	def_latency to 1.

From-SVN: r68172

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c78a88340de160884158142128071f5dd6ec1ce4..756318c1d3e1012ed4a15f3912799ddb3f6cb48d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-19  Hans-Peter Nilsson  <hp@axis.com>
+
+       * bt-load.c (migrate_btr_def) [INSN_SCHEDULING]: Conditionalize
+       calls to insn_default_latency and result_ready_cost.  Initialize
+       def_latency to 1.
+
 2003-06-18  Richard Henderson  <rth@redhat.com>
 
         * config/ia64/unwind-ia64.c (_Unwind_GetCFA): New.

diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index dd2dcb2b16bf44dde29b2387be0afd42556fee2a..790fdfd88560e06a89f41055bf04e0878d63b93d 100644 (file)
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -1176,7 +1176,7 @@ migrate_btr_def (btr_def def, int min_cost)
   int give_up = 0;
   int def_moved = 0;
   btr_user user;
-  int def_latency;
+  int def_latency = 1;
 
   if (rtl_dump_file)
     fprintf (rtl_dump_file,
@@ -1205,10 +1205,13 @@ migrate_btr_def (btr_def def, int min_cost)
   live_range = BITMAP_XMALLOC ();
   bitmap_copy (live_range, def->live_range);
 
+#ifdef INSN_SCHEDULING
   if ((*targetm.sched.use_dfa_pipeline_interface) ())
     def_latency = insn_default_latency (def->insn);
   else
     def_latency = result_ready_cost (def->insn);
+#endif
+
   def_latency *= issue_rate;
 
   for (user = def->uses; user != NULL; user = user->next)