Merge peephole2 from new_ia32_branch:

        * Makefile.in (STAGESTUFF): Add *.peephole2.
        (mostlyclean): Likewise.
        (recog.o): Depend on resource.h.

        * final.c (peephole): Conditionalize decl on HAVE_peephole.
        (final_scan_insn): Likewise for the invocation of peephole.
        * genconfig.c (main): Look for peephole and peephole2 patterns.
        Emit HAVE_peephole* accordingly.
        * genpeep.c (main): Conditionalize entire output on HAVE_peephole.
        * flags.h (flag_peephole2): Declare.
        * toplev.c: New pass peephole2.  New flag -fpeephole2.

        * genattrtab.c (main): Count DEFINE_PEEPHOLE2.
        * gencodes.c (main): Likewise.
        * genextract.c (main): Likewise.
        * genoutput.c (main): Likewise.
        * genemit.c (max_operand_1): Look for the max scratch operand.
        (gen_rtx_scratch): New.
        (gen_exp): Use it, and pass on new arg subroutine_type.
        (gen_expand): Take max scratch into account.
        (gen_split): Emit peephole2 functions.
        (output_peephole2_scratch): New.
        (main): Include hard-reg-set.h and resource.h.  Handle peephole2.
        * genrecog.c (routine_type): Add PEEPHOLE2.
        (IS_SPLIT): New.
        (make_insn_sequence): Match outer parallel for peep2.  Discard
        top level scratches and dups.
        (add_to_sequence): New args insn_type and top.  Update all callers.
        Handle toplevel peep2 matching insns.
        (write_subroutine): Handle peep2.
        (write_tree_1): Likewise.
        (write_tree): Likewise.
        (main): Likewise.
        (change_state): New arg afterward.  Update all callers.
        Handle matching separate insns.
        * recog.c (recog_next_insn): New.
        (peephole2_optimize): New.
        * rtl.def (DEFINE_PEEPHOLE2): New.
        * resource.c (find_free_register): New argument last_insn.  Use it
        to find a register available through the entire span.
        * resource.h (find_free_register): Update prototype.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29015 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 17 insertions, 1 deletions

diff --git a/gcc/genconfig.c b/gcc/genconfig.c
index 8f4568d37ad..4001774eba3 100644
--- a/gcc/genconfig.c
+++ b/gcc/genconfig.c
@@ -43,6 +43,8 @@ static int register_constraint_flag;
 static int have_cc0_flag;
 static int have_cmove_flag;
 static int have_lo_sum_flag;
+static int have_peephole_flag;
+static int have_peephole2_flag;
 
 /* Maximum number of insns seen in a split.  */
 static int max_insns_per_split = 1;
@@ -313,8 +315,16 @@ from the machine description file `md'.  */\n\n");
 	gen_expand (desc);
       if (GET_CODE (desc) == DEFINE_SPLIT)
 	gen_split (desc);
+      if (GET_CODE (desc) == DEFINE_PEEPHOLE2)
+	{
+	  have_peephole2_flag = 1;
+	  gen_split (desc);
+	}
       if (GET_CODE (desc) == DEFINE_PEEPHOLE)
-	gen_peephole (desc);
+	{
+	  have_peephole_flag = 1;
+	  gen_peephole (desc);
+	}
     }
 
   printf ("\n#define MAX_RECOG_OPERANDS %d\n", max_recog_operands + 1);
@@ -338,6 +348,12 @@ from the machine description file `md'.  */\n\n");
   if (have_lo_sum_flag)
     printf ("#define HAVE_lo_sum\n");
 
+  if (have_peephole_flag)
+    printf ("#define HAVE_peephole\n");
+
+  if (have_peephole2_flag)
+    printf ("#define HAVE_peephole2\n");
+
   fflush (stdout);
   exit (ferror (stdout) != 0 ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE);
   /* NOTREACHED */