* genattrtab.c: Don't handle MATCH_INSN.

	* genrecog.c: Likewise.
	* gensupport.c: Likewise.
	* rtl.def (match_insn): Remove.
	* doc/md.texi (match_insn, match_insn2): Remove.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2df4662..7cd7290 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-02  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * genattrtab.c: Don't handle MATCH_INSN.
+       * genrecog.c: Likewise.
+       * gensupport.c: Likewise.
+       * rtl.def (match_insn): Remove.
+       * doc/md.texi (match_insn, match_insn2): Remove.
+
 2004-03-02  Mark Mitchell  <mark@codesourcery.com>
 
        * doc/c-tree.texi (DECL_ASSEMBLER_NAME): Mention that using this

diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi
index 11848a5..b8809c5 100644 (file)
--- a/gcc/doc/md.texi
+++ b/gcc/doc/md.texi
@@ -489,25 +489,6 @@ An insn that matches this pattern might look like:
 Like @code{match_op_dup}, but for @code{match_parallel} instead of
 @code{match_operator}.
 
-@findex match_insn
-@item (match_insn @var{predicate})
-Match a complete insn.  Unlike the other @code{match_*} recognizers,
-@code{match_insn} does not take an operand number.
-
-The machine mode @var{m} of @code{match_insn} works like that of
-@code{match_operand}: it is passed as the second argument to the
-predicate function, and that function is solely responsible for
-deciding whether the expression to be matched ``has'' that mode.
-
-@findex match_insn2
-@item (match_insn2 @var{n} @var{predicate})
-Match a complete insn.
-
-The machine mode @var{m} of @code{match_insn2} works like that of
-@code{match_operand}: it is passed as the second argument to the
-predicate function, and that function is solely responsible for
-deciding whether the expression to be matched ``has'' that mode.
-
 @end table
 
 @node Output Template

diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index e1a3e72..3bfeca3 100644 (file)
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -1026,7 +1026,6 @@ check_attr_test (rtx exp, int is_const, int lineno)
       XEXP (exp, 0) = check_attr_test (XEXP (exp, 0), is_const, lineno);
       break;
 
-    case MATCH_INSN:
     case MATCH_OPERAND:
       if (is_const)
        fatal ("RTL operator \"%s\" not valid in constant attribute test",
@@ -4795,10 +4794,6 @@ write_test_expr (rtx exp, int flags)
                XSTR (exp, 1), XINT (exp, 0), GET_MODE_NAME (GET_MODE (exp)));
       break;
 
-    case MATCH_INSN:
-      printf ("%s (insn)", XSTR (exp, 0));
-      break;
-
     /* Constant integer.  */
     case CONST_INT:
       printf (HOST_WIDE_INT_PRINT_DEC, XWINT (exp, 0));

diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 7bdc526..2f5028c 100644 (file)
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -361,7 +361,6 @@ find_operand (rtx pattern, int n, rtx stop)
 
   code = GET_CODE (pattern);
   if ((code == MATCH_SCRATCH
-       || code == MATCH_INSN
        || code == MATCH_OPERAND
        || code == MATCH_OPERATOR
        || code == MATCH_PARALLEL)
@@ -482,7 +481,6 @@ validate_pattern (rtx pattern, rtx insn, rtx set, int set_code)
           error_count++;
        }
       break;
-    case MATCH_INSN:
     case MATCH_OPERAND:
     case MATCH_OPERATOR:
       {
@@ -832,7 +830,6 @@ add_to_sequence (rtx pattern, struct decision_head *last, const char *position,
     case MATCH_OPERAND:
     case MATCH_SCRATCH:
     case MATCH_OPERATOR:
-    case MATCH_INSN:
       {
        const char *pred_name;
        RTX_CODE was_code = code;

diff --git a/gcc/gensupport.c b/gcc/gensupport.c
index 44e07eb..b8cf5e6 100644 (file)
--- a/gcc/gensupport.c
+++ b/gcc/gensupport.c
@@ -517,7 +517,6 @@ collect_insn_data (rtx pattern, int *palt, int *pmax)
     case MATCH_OPERATOR:
     case MATCH_SCRATCH:
     case MATCH_PARALLEL:
-    case MATCH_INSN:
       i = XINT (pattern, 0);
       if (i > *pmax)
        *pmax = i;
@@ -600,7 +599,6 @@ alter_predicate_for_insn (rtx pattern, int alt, int max_op, int lineno)
     case MATCH_OPERATOR:
     case MATCH_SCRATCH:
     case MATCH_PARALLEL:
-    case MATCH_INSN:
       XINT (pattern, 0) += max_op;
       break;
 

diff --git a/gcc/rtl.def b/gcc/rtl.def
index f9320db..4e77373 100644 (file)
--- a/gcc/rtl.def
+++ b/gcc/rtl.def
@@ -168,11 +168,6 @@ DEF_RTL_EXPR(MATCH_OP_DUP, "match_op_dup", "iE", 'm')
 DEF_RTL_EXPR(MATCH_PAR_DUP, "match_par_dup", "iE", 'm')
 
 /* Appears only in machine descriptions.
-   Operand 0 is the operand number, as in match_operand.
-   Operand 1 is the predicate to apply to the insn.  */
-DEF_RTL_EXPR(MATCH_INSN, "match_insn", "is", 'm')
-
-/* Appears only in machine descriptions.
    Defines the pattern for one kind of instruction.
    Operand:
    0: names this instruction.