haifa-sched.c (ISSUE_RATE): Renamed from MACHINE_issue_rate.

        * haifa-sched.c (ISSUE_RATE): Renamed from MACHINE_issue_rate.
        (get_issue_rate): Delete.
        * pa.h (ISSUE_RATE): Define.

From-SVN: r14851

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cb3b086572fc521d869d04213e2d547e4771a43e..743ba8d7eb8501201cea545832c16ece4fa884f3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Tue Aug 19 09:34:57 1997  Jeffrey A Law  (law@cygnus.com)
 
+       * haifa-sched.c (ISSUE_RATE): Renamed from MACHINE_issue_rate.
+       (get_issue_rate): Delete.
+       * pa.h (ISSUE_RATE): Define.
+
        * configure.in: Turn on haifa by default for the PA.
        * configure: Rebuilt.
        * pa.c (override_options): Accept -mschedule=7200 option.

diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index 1f5e900907f573db663390ec2cf6523cc0f9ac7b..ec7323564df81d0fd9ce6d176fa78de5fece32a5 100644 (file)
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -42,12 +42,16 @@ enum processor_type
   PROCESSOR_7200
 };
 
-#define pa_cpu_attr ((enum attr_cpu)pa_cpu)
-
 /* For -mschedule= option.  */
 extern char *pa_cpu_string;
 extern enum processor_type pa_cpu;
 
+#define pa_cpu_attr ((enum attr_cpu)pa_cpu)
+
+/* The 700 can only issue a single insn at a time.
+   The 7XXX processors can issue two insns at a time.  */
+#define ISSUE_RATE (pa_cpu == PROCESSOR_700 ? 1 : 2)
+
 /* Print subsidiary information on the compiler version in use.  */
 
 #define TARGET_VERSION fputs (" (hppa)", stderr);

diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 222a6d6fe009e16dca2174d6efb4ac600eb2db2d..bc7e826529e28bd60d67f87cf3ceb183b9d4952d 100644 (file)
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -190,8 +190,8 @@ static int target_units = 0;
 
 static int issue_rate;
 
-#ifndef MACHINE_issue_rate
-#define get_issue_rate() (1)
+#ifndef ISSUE_RATE
+#define ISSUE_RATE 1
 #endif
 
 /* sched_debug_count is used for debugging the scheduler by limiting
@@ -8460,7 +8460,7 @@ schedule_insns (dump_file)
     }
 
   /* initialize issue_rate */
-  issue_rate = get_issue_rate ();
+  issue_rate = ISSUE_RATE;
 
   /* do the splitting first for all blocks */
   for (b = 0; b < n_basic_blocks; b++)