Imported from /home/lorry/working-area/delta_gcc-tarball/gcc-5.1.0.tar.bz2.gcc-5.1.0

1 files changed, 40 insertions, 30 deletions

diff --git a/gcc/genattr.c b/gcc/genattr.c
index 44550c0b63..97ed613e42 100644
--- a/gcc/genattr.c
+++ b/gcc/genattr.c
@@ -1,5 +1,5 @@
 /* Generate attribute information (insn-attr.h) from machine description.
-   Copyright (C) 1991-2014 Free Software Foundation, Inc.
+   Copyright (C) 1991-2015 Free Software Foundation, Inc.
    Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
 
 This file is part of GCC.
@@ -48,16 +48,18 @@ gen_attr (rtx attr)
   /* If numeric attribute, don't need to write an enum.  */
   if (GET_CODE (attr) == DEFINE_ENUM_ATTR)
     printf ("extern enum %s get_attr_%s (%s);\n\n",
-	    XSTR (attr, 1), XSTR (attr, 0), (is_const ? "void" : "rtx"));
+	    XSTR (attr, 1), XSTR (attr, 0),
+	    (is_const ? "void" : "rtx_insn *"));
   else
     {
       p = XSTR (attr, 1);
       if (*p == '\0')
 	printf ("extern int get_attr_%s (%s);\n", XSTR (attr, 0),
-		(is_const ? "void" : "rtx"));
+		(is_const ? "void" : "rtx_insn *"));
       else
 	printf ("extern enum attr_%s get_attr_%s (%s);\n\n",
-		XSTR (attr, 0), XSTR (attr, 0), (is_const ? "void" : "rtx"));
+		XSTR (attr, 0), XSTR (attr, 0),
+		(is_const ? "void" : "rtx_insn *"));
     }
 
   /* If `length' attribute, write additional function definitions and define
@@ -65,11 +67,11 @@ gen_attr (rtx attr)
   if (! strcmp (XSTR (attr, 0), "length"))
     {
       puts ("\
-extern void shorten_branches (rtx);\n\
-extern int insn_default_length (rtx);\n\
-extern int insn_min_length (rtx);\n\
-extern int insn_variable_length_p (rtx);\n\
-extern int insn_current_length (rtx);\n\n\
+extern void shorten_branches (rtx_insn *);\n\
+extern int insn_default_length (rtx_insn *);\n\
+extern int insn_min_length (rtx_insn *);\n\
+extern int insn_variable_length_p (rtx_insn *);\n\
+extern int insn_current_length (rtx_insn *);\n\n\
 #include \"insn-addr.h\"\n");
     }
 }
@@ -176,9 +178,9 @@ main (int argc, char **argv)
         {
 	  if (! have_delay)
 	    {
-	      printf ("extern int num_delay_slots (rtx);\n");
-	      printf ("extern int eligible_for_delay (rtx, int, rtx, int);\n\n");
-	      printf ("extern int const_num_delay_slots (rtx);\n\n");
+	      printf ("extern int num_delay_slots (rtx_insn *);\n");
+	      printf ("extern int eligible_for_delay (rtx_insn *, int, rtx_insn *, int);\n\n");
+	      printf ("extern int const_num_delay_slots (rtx_insn *);\n\n");
 	      have_delay = 1;
 	    }
 
@@ -187,14 +189,14 @@ main (int argc, char **argv)
 	      if (XVECEXP (desc, 1, i + 1) && ! have_annul_true)
 		{
 		  printf ("#define ANNUL_IFTRUE_SLOTS\n");
-		  printf ("extern int eligible_for_annul_true (rtx, int, rtx, int);\n");
+		  printf ("extern int eligible_for_annul_true (rtx_insn *, int, rtx_insn *, int);\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 (rtx, int, rtx, int);\n");
+		  printf ("extern int eligible_for_annul_false (rtx_insn *, int, rtx_insn *, int);\n");
 		  have_annul_false = 1;
 		}
 	    }
@@ -230,21 +232,21 @@ main (int argc, char **argv)
 	  printf ("   and insn_default_latency.  */\n");
 	  printf ("extern void init_sched_attrs (void);\n\n");
 	  printf ("/* Internal insn code number used by automata.  */\n");
-	  printf ("extern int (*internal_dfa_insn_code) (rtx);\n\n");
+	  printf ("extern int (*internal_dfa_insn_code) (rtx_insn *);\n\n");
 	  printf ("/* Insn latency time defined in define_insn_reservation. */\n");
-	  printf ("extern int (*insn_default_latency) (rtx);\n\n");
+	  printf ("extern int (*insn_default_latency) (rtx_insn *);\n\n");
 	}
       else
 	{
 	  printf ("#define init_sched_attrs() do { } while (0)\n\n");
 	  printf ("/* Internal insn code number used by automata.  */\n");
-	  printf ("extern int internal_dfa_insn_code (rtx);\n\n");
+	  printf ("extern int internal_dfa_insn_code (rtx_insn *);\n\n");
 	  printf ("/* Insn latency time defined in define_insn_reservation. */\n");
-	  printf ("extern int insn_default_latency (rtx);\n\n");
+	  printf ("extern int insn_default_latency (rtx_insn *);\n\n");
 	}
       printf ("/* Return nonzero if there is a bypass for given insn\n");
       printf ("   which is a data producer.  */\n");
-      printf ("extern int bypass_p (rtx);\n\n");
+      printf ("extern int bypass_p (rtx_insn *);\n\n");
       printf ("/* Insn latency time on data consumed by the 2nd insn.\n");
       printf ("   Use the function if bypass_p returns nonzero for\n");
       printf ("   the 1st insn. */\n");
@@ -288,7 +290,7 @@ main (int argc, char **argv)
       printf ("   implementation may require much memory.  */\n");
       printf ("extern int state_alts (state_t, rtx);\n");
       printf ("#endif\n\n");
-      printf ("extern int min_issue_delay (state_t, rtx);\n");
+      printf ("extern int min_issue_delay (state_t, rtx_insn *);\n");
       printf ("/* The following function returns nonzero if no one insn\n");
       printf ("   can be issued in current DFA state. */\n");
       printf ("extern int state_dead_lock_p (state_t);\n");
@@ -303,7 +305,7 @@ main (int argc, char **argv)
       printf ("/* The following function outputs reservations for given\n");
       printf ("   insn as they are described in the corresponding\n");
       printf ("   define_insn_reservation.  */\n");
-      printf ("extern void print_reservation (FILE *, rtx);\n");
+      printf ("extern void print_reservation (FILE *, rtx_insn *);\n");
       printf ("\n#if CPU_UNITS_QUERY\n");
       printf ("/* The following function returns code of functional unit\n");
       printf ("   with given name (see define_cpu_unit). */\n");
@@ -315,13 +317,13 @@ main (int argc, char **argv)
       printf ("#endif\n\n");
       printf ("/* The following function returns true if insn\n");
       printf ("   has a dfa reservation.  */\n");
-      printf ("extern bool insn_has_dfa_reservation_p (rtx);\n\n");
+      printf ("extern bool insn_has_dfa_reservation_p (rtx_insn *);\n\n");
       printf ("/* Clean insn code cache.  It should be called if there\n");
       printf ("   is a chance that condition value in a\n");
       printf ("   define_insn_reservation will be changed after\n");
       printf ("   last call of dfa_start.  */\n");
       printf ("extern void dfa_clean_insn_cache (void);\n\n");
-      printf ("extern void dfa_clear_single_insn_cache (rtx);\n\n");
+      printf ("extern void dfa_clear_single_insn_cache (rtx_insn *);\n\n");
       printf ("/* Initiate and finish work with DFA.  They should be\n");
       printf ("   called as the first and the last interface\n");
       printf ("   functions.  */\n");
@@ -336,7 +338,9 @@ main (int argc, char **argv)
     }
 
   /* Special-purpose attributes should be tested with if, not #ifdef.  */
-  const char * const special_attrs[] = { "length", "enabled", 0 };
+  const char * const special_attrs[] = { "length", "enabled",
+					 "preferred_for_size",
+					 "preferred_for_speed", 0 };
   for (const char * const *p = special_attrs; *p; p++)
     {
       printf ("#ifndef HAVE_ATTR_%s\n"
@@ -346,16 +350,22 @@ main (int argc, char **argv)
   /* We make an exception here to provide stub definitions for
      insn_*_length* / get_attr_enabled functions.  */
   puts ("#if !HAVE_ATTR_length\n"
-	"extern int hook_int_rtx_unreachable (rtx);\n"
-	"#define insn_default_length hook_int_rtx_unreachable\n"
-	"#define insn_min_length hook_int_rtx_unreachable\n"
-	"#define insn_variable_length_p hook_int_rtx_unreachable\n"
-	"#define insn_current_length hook_int_rtx_unreachable\n"
+	"extern int hook_int_rtx_insn_unreachable (rtx_insn *);\n"
+	"#define insn_default_length hook_int_rtx_insn_unreachable\n"
+	"#define insn_min_length hook_int_rtx_insn_unreachable\n"
+	"#define insn_variable_length_p hook_int_rtx_insn_unreachable\n"
+	"#define insn_current_length hook_int_rtx_insn_unreachable\n"
 	"#include \"insn-addr.h\"\n"
 	"#endif\n"
-	"#if !HAVE_ATTR_enabled\n"
 	"extern int hook_int_rtx_1 (rtx);\n"
+	"#if !HAVE_ATTR_enabled\n"
 	"#define get_attr_enabled hook_int_rtx_1\n"
+	"#endif\n"
+	"#if !HAVE_ATTR_preferred_for_size\n"
+	"#define get_attr_preferred_for_size hook_int_rtx_1\n"
+	"#endif\n"
+	"#if !HAVE_ATTR_preferred_for_speed\n"
+	"#define get_attr_preferred_for_speed hook_int_rtx_1\n"
 	"#endif\n");
 
   /* Output flag masks for use by reorg.