1 files changed, 23 insertions, 287 deletions

diff --git a/gcc/genattr.c b/gcc/genattr.c
index d50cab5..3b3ab2b 100755
--- a/gcc/genattr.c
+++ b/gcc/genattr.c
@@ -25,69 +25,20 @@ Boston, MA 02111-1307, USA.  */
 #include "rtl.h"
 #include "obstack.h"
 
-static struct obstack obstack;
-struct obstack *rtl_obstack = &obstack;
-
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
 
-static void fatal PVPROTO ((const char *, ...))
-  ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
-void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN;
+static struct obstack obstack;
+struct obstack *rtl_obstack = &obstack;
 
 /* Define this so we can link with print-rtl.o to get debug_rtx function.  */
 char **insn_name_ptr = 0;
 
-/* A range of values.  */
-
-struct range
-{
-  int min;
-  int max;
-};
-
-/* Record information about each function unit mentioned in a
-   DEFINE_FUNCTION_UNIT.  */
-
-struct function_unit
-{
-  char *name;			/* Function unit name.  */
-  struct function_unit *next;	/* Next function unit.  */
-  int multiplicity;		/* Number of units of this type.  */
-  int simultaneity;		/* Maximum number of simultaneous insns
-				   on this function unit or 0 if unlimited.  */
-  struct range ready_cost;	/* Range of ready cost values.  */
-  struct range issue_delay;	/* Range of issue delay values.  */
-};
-
-static void extend_range PROTO((struct range *, int, int));
-static void init_range PROTO((struct range *));
-static void write_upcase PROTO((char *));
-static void gen_attr PROTO((rtx));
-static void write_units PROTO((int, struct range *, struct range *,
-			       struct range *, struct range *,
-			       struct range *));
-static void
-extend_range (range, min, max)
-     struct range *range;
-     int min;
-     int max;
-{
-  if (range->min > min) range->min = min;
-  if (range->max < max) range->max = max;
-}
-
-static void
-init_range (range)
-     struct range *range;
-{
-  range->min = 100000;
-  range->max = -1;
-}
+static void write_upcase (char *);
+static void gen_attr (rtx);
 
 static void
-write_upcase (str)
-    char *str;
+write_upcase (char *str)
 {
   for (; *str; str++)
     if (*str >= 'a' && *str <= 'z')
@@ -97,8 +48,7 @@ write_upcase (str)
 }
 
 static void
-gen_attr (attr)
-     rtx attr;
+gen_attr (rtx attr)
 {
   char *p;
 
@@ -137,107 +87,21 @@ gen_attr (attr)
   if (! strcmp (XSTR (attr, 0), "length"))
     {
       printf ("extern void init_lengths ();\n");
-      printf ("extern void shorten_branches PROTO((rtx));\n");
-      printf ("extern int insn_default_length PROTO((rtx));\n");
-      printf ("extern int insn_variable_length_p PROTO((rtx));\n");
-      printf ("extern int insn_current_length PROTO((rtx));\n\n");
+      printf ("extern void shorten_branches (rtx);\n");
+      printf ("extern int insn_default_length (rtx);\n");
+      printf ("extern int insn_variable_length_p (rtx);\n");
+      printf ("extern int insn_current_length (rtx);\n\n");
       printf ("extern int *insn_addresses;\n");
       printf ("extern int insn_current_address;\n\n");
     }
 }
 
 static void
-write_units (num_units, multiplicity, simultaneity,
-	     ready_cost, issue_delay, blockage)
-     int num_units;
-     struct range *multiplicity;
-     struct range *simultaneity;
-     struct range *ready_cost;
-     struct range *issue_delay;
-     struct range *blockage;
+fatal(const char *format, ...)
 {
-  int i, q_size;
-
-  printf ("#define INSN_SCHEDULING\n\n");
-  printf ("extern int result_ready_cost PROTO((rtx));\n");
-  printf ("extern int function_units_used PROTO((rtx));\n\n");
-  printf ("extern struct function_unit_desc\n");
-  printf ("{\n");
-  printf ("  char *name;\n");
-  printf ("  int bitmask;\n");
-  printf ("  int multiplicity;\n");
-  printf ("  int simultaneity;\n");
-  printf ("  int default_cost;\n");
-  printf ("  int max_issue_delay;\n");
-  printf ("  int (*ready_cost_function) ();\n");
-  printf ("  int (*conflict_cost_function) ();\n");
-  printf ("  int max_blockage;\n");
-  printf ("  unsigned int (*blockage_range_function) ();\n");
-  printf ("  int (*blockage_function) ();\n");
-  printf ("} function_units[];\n\n");
-  printf ("#define FUNCTION_UNITS_SIZE %d\n", num_units);
-  printf ("#define MIN_MULTIPLICITY %d\n", multiplicity->min);
-  printf ("#define MAX_MULTIPLICITY %d\n", multiplicity->max);
-  printf ("#define MIN_SIMULTANEITY %d\n", simultaneity->min);
-  printf ("#define MAX_SIMULTANEITY %d\n", simultaneity->max);
-  printf ("#define MIN_READY_COST %d\n", ready_cost->min);
-  printf ("#define MAX_READY_COST %d\n", ready_cost->max);
-  printf ("#define MIN_ISSUE_DELAY %d\n", issue_delay->min);
-  printf ("#define MAX_ISSUE_DELAY %d\n", issue_delay->max);
-  printf ("#define MIN_BLOCKAGE %d\n", blockage->min);
-  printf ("#define MAX_BLOCKAGE %d\n", blockage->max);
-  for (i = 0; (1 << i) < blockage->max; i++)
-    ;
-  printf ("#define BLOCKAGE_BITS %d\n", i + 1);
-
-  /* INSN_QUEUE_SIZE is a power of two larger than MAX_BLOCKAGE and
-     MAX_READY_COST.  This is the longest time an isnsn may be queued.  */
-  i = MAX (blockage->max, ready_cost->max);
-  for (q_size = 1; q_size <= i; q_size <<= 1)
-    ;
-  printf ("#define INSN_QUEUE_SIZE %d\n", q_size);
-}
-
-PTR
-xmalloc (size)
-  size_t size;
-{
-  register PTR val = (PTR) malloc (size);
-
-  if (val == 0)
-    fatal ("virtual memory exhausted");
-  return val;
-}
-
-PTR
-xrealloc (old, size)
-  PTR old;
-  size_t size;
-{
-  register PTR ptr;
-  if (old)
-    ptr = (PTR) realloc (old, size);
-  else
-    ptr = (PTR) malloc (size);
-  if (!ptr)
-    fatal ("virtual memory exhausted");
-  return ptr;
-}
-
-static void
-fatal VPROTO ((const char *format, ...))
-{
-#ifndef ANSI_PROTOTYPES
-  const char *format;
-#endif
   va_list ap;
 
-  VA_START (ap, format);
-
-#ifndef ANSI_PROTOTYPES
-  format = va_arg (ap, const char *);
-#endif
-
+  va_start (ap, format);
   fprintf (stderr, "genattr: ");
   vfprintf (stderr, format, ap);
   va_end (ap);
@@ -245,37 +109,23 @@ fatal VPROTO ((const char *format, ...))
   exit (EXIT_FAILURE);
 }
 
-/* More 'friendly' abort that prints the line and file.
-   config.h can #define abort fancy_abort if you like that sort of thing.  */
-
-void
-fancy_abort ()
+void *
+xmalloc(size_t size)
 {
-  fatal ("Internal gcc abort.");
+  void *val = malloc(size);
+
+  if (val == NULL)
+    fatal ("virtual memory exhausted");
+
+  return val;
 }
-
+
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main(int argc, char **argv)
 {
   rtx desc;
   FILE *infile;
-  register int c;
-  int have_delay = 0;
-  int have_annul_true = 0;
-  int have_annul_false = 0;
-  int num_units = 0;
-  struct range all_simultaneity, all_multiplicity;
-  struct range all_ready_cost, all_issue_delay, all_blockage;
-  struct function_unit *units = 0, *unit;
-  int i;
-
-  init_range (&all_multiplicity);
-  init_range (&all_simultaneity);
-  init_range (&all_ready_cost);
-  init_range (&all_issue_delay);
-  init_range (&all_blockage);
+  int c;
 
   obstack_init (rtl_obstack);
 
@@ -312,120 +162,6 @@ from the machine description file `md'.  */\n\n");
       desc = read_rtx (infile);
       if (GET_CODE (desc) == DEFINE_ATTR)
 	gen_attr (desc);
-
-      else if (GET_CODE (desc) == DEFINE_DELAY)
-        {
-	  if (! have_delay)
-	    {
-	      printf ("#define DELAY_SLOTS\n");
-	      printf ("extern int num_delay_slots PROTO((rtx));\n");
-	      printf ("extern int eligible_for_delay PROTO((rtx, int, rtx, int));\n\n");
-	      printf ("extern int const_num_delay_slots PROTO((rtx));\n\n");
-	      have_delay = 1;
-	    }
-
-	  for (i = 0; i < XVECLEN (desc, 1); i += 3)
-	    {
-	      if (XVECEXP (desc, 1, i + 1) && ! have_annul_true)
-		{
-		  printf ("#define ANNUL_IFTRUE_SLOTS\n");
-		  printf ("extern int eligible_for_annul_true ();\n");
-		  have_annul_true = 1;
-		}
-
-	      if (XVECEXP (desc, 1, i + 2) && ! have_annul_false)
-		{
-		  printf ("#define ANNUL_IFFALSE_SLOTS\n");
-		  printf ("extern int eligible_for_annul_false ();\n");
-		  have_annul_false = 1;
-		}
-	    }
-        }
-
-      else if (GET_CODE (desc) == DEFINE_FUNCTION_UNIT)
-	{
-	  char *name = XSTR (desc, 0);
-	  int multiplicity = XINT (desc, 1);
-	  int simultaneity = XINT (desc, 2);
-	  int ready_cost = MAX (XINT (desc, 4), 1);
-	  int issue_delay = MAX (XINT (desc, 5), 1);
-	  int issueexp_p = (XVEC (desc, 6) != 0);
-
-	  for (unit = units; unit; unit = unit->next)
-	    if (strcmp (unit->name, name) == 0)
-	      break;
-
-	  if (unit == 0)
-	    {
-	      int len = strlen (name) + 1;
-	      unit = (struct function_unit *)
-		alloca (sizeof (struct function_unit));
-	      unit->name = (char *) alloca (len);
-	      copy_memory (name, unit->name, len);
-	      unit->multiplicity = multiplicity;
-	      unit->simultaneity = simultaneity;
-	      unit->ready_cost.min = unit->ready_cost.max = ready_cost;
-	      unit->issue_delay.min = unit->issue_delay.max = issue_delay;
-	      unit->next = units;
-	      units = unit;
-	      num_units++;
-
-	      extend_range (&all_multiplicity, multiplicity, multiplicity);
-	      extend_range (&all_simultaneity, simultaneity, simultaneity);
-	    }
-	  else if (unit->multiplicity != multiplicity
-		   || unit->simultaneity != simultaneity)
-	    fatal ("Differing specifications given for `%s' function unit.",
-		   unit->name);
-
-	  extend_range (&unit->ready_cost, ready_cost, ready_cost);
-	  extend_range (&unit->issue_delay,
-			issueexp_p ? 1 : issue_delay, issue_delay);
-	  extend_range (&all_ready_cost,
-			unit->ready_cost.min, unit->ready_cost.max);
-	  extend_range (&all_issue_delay,
-			unit->issue_delay.min, unit->issue_delay.max);
-	}
-    }
-
-  if (num_units > 0)
-    {
-      /* Compute the range of blockage cost values.  See genattrtab.c
-	 for the derivation.  BLOCKAGE (E,C) when SIMULTANEITY is zero is
-
-	     MAX (ISSUE-DELAY (E,C),
-		  READY-COST (E) - (READY-COST (C) - 1))
-
-	 and otherwise
-
-	     MAX (ISSUE-DELAY (E,C),
-		  READY-COST (E) - (READY-COST (C) - 1),
-		  READY-COST (E) - FILL-TIME)  */
-
-      for (unit = units; unit; unit = unit->next)
-	{
-	  struct range blockage;
-
-	  blockage = unit->issue_delay;
-	  blockage.max = MAX (unit->ready_cost.max
-			      - (unit->ready_cost.min - 1),
-			      blockage.max);
-	  blockage.min = MAX (1, blockage.min);
-
-	  if (unit->simultaneity != 0)
-	    {
-	      int fill_time = ((unit->simultaneity - 1)
-			       * unit->issue_delay.min);
-	      blockage.min = MAX (unit->ready_cost.min - fill_time,
-				  blockage.min);
-	      blockage.max = MAX (unit->ready_cost.max - fill_time,
-				  blockage.max);
-	    }
-	  extend_range (&all_blockage, blockage.min, blockage.max);
-	}
-
-      write_units (num_units, &all_multiplicity, &all_simultaneity,
-		   &all_ready_cost, &all_issue_delay, &all_blockage);
     }
 
   /* Output flag masks for use by reorg.