* genrecog.c (validate_pattern): Verify that ZERO_EXTRACT and

        STRICT_LOW_PART as SET_DEST have in-out constraints.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ea745cd..bffca09 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-09  Richard Henderson  <rth@redhat.com>
+
+       * genrecog.c (validate_pattern): Verify that ZERO_EXTRACT and 
+       STRICT_LOW_PART as SET_DEST have in-out constraints.
+
 2000-12-09  Joseph S. Myers  <jsm28@cam.ac.uk>
 
        * c-common.c (check_function_format): Don't suggest adding format

diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index d143798..1121d8f 100644 (file)
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -231,7 +231,7 @@ static struct decision_test *new_decision_test
 static rtx find_operand
   PARAMS ((rtx, int));
 static void validate_pattern
-  PARAMS ((rtx, rtx, rtx));
+  PARAMS ((rtx, rtx, rtx, int));
 static struct decision *add_to_sequence
   PARAMS ((rtx, struct decision_head *, const char *, enum routine_type, int));
 
@@ -397,13 +397,15 @@ find_operand (pattern, n)
 }
 
 /* Check for various errors in patterns.  SET is nonnull for a destination,
-   and is the complete set pattern.  */
+   and is the complete set pattern.  SET_CODE is '=' for normal sets, and
+   '+' within a context that requires in-out constraints.  */
 
 static void
-validate_pattern (pattern, insn, set)
+validate_pattern (pattern, insn, set, set_code)
      rtx pattern;
      rtx insn;
      rtx set;
+     int set_code;
 {
   const char *fmt;
   RTX_CODE code;
@@ -482,16 +484,26 @@ validate_pattern (pattern, insn, set)
          }
 
        /* A MATCH_OPERAND that is a SET should have an output reload.  */
-       if (set
-           && code == MATCH_OPERAND
-           && XSTR (pattern, 2)[0] != '\0'
-           && XSTR (pattern, 2)[0] != '='
-           && XSTR (pattern, 2)[0] != '+')
+       if (set && code == MATCH_OPERAND)
          {
-           message_with_line (pattern_lineno,
-                              "operand %d missing output reload", 
-                              XINT (pattern, 0));
-           error_count++;
+           if (set_code == '+'
+               && XSTR (pattern, 2)[0] != '\0'
+               && XSTR (pattern, 2)[0] != '+')
+             {
+               message_with_line (pattern_lineno,
+                                  "operand %d missing in-out reload",
+                                  XINT (pattern, 0));
+               error_count++;
+             }
+           else if (XSTR (pattern, 2)[0] != '\0'
+                    && XSTR (pattern, 2)[0] != '='
+                    && XSTR (pattern, 2)[0] != '+')
+             {
+               message_with_line (pattern_lineno,
+                                  "operand %d missing output reload", 
+                                  XINT (pattern, 0));
+               error_count++;
+             }
          }
 
        /* Allowing non-lvalues in destinations -- particularly CONST_INT --
@@ -593,14 +605,25 @@ validate_pattern (pattern, insn, set)
          }
 
        if (dest != SET_DEST (pattern))
-         validate_pattern (dest, insn, pattern);
-       validate_pattern (SET_DEST (pattern), insn, pattern);
-        validate_pattern (SET_SRC (pattern), insn, NULL_RTX);
+         validate_pattern (dest, insn, pattern, '=');
+       validate_pattern (SET_DEST (pattern), insn, pattern, '=');
+        validate_pattern (SET_SRC (pattern), insn, NULL_RTX, 0);
         return;
       }
 
     case CLOBBER:
-      validate_pattern (SET_DEST (pattern), insn, pattern);
+      validate_pattern (SET_DEST (pattern), insn, pattern, '=');
+      return;
+
+    case ZERO_EXTRACT:
+      validate_pattern (XEXP (pattern, 0), insn, set, set ? '+' : 0);
+      validate_pattern (XEXP (pattern, 1), insn, NULL_RTX, 0);
+      validate_pattern (XEXP (pattern, 2), insn, NULL_RTX, 0);
+      return;
+
+    case STRICT_LOW_PART:
+      validate_pattern (XEXP (pattern, 0), insn, set, set ? '+' : 0);
+      validate_pattern (XEXP (pattern, 1), insn, NULL, 0);
       return;
 
     case LABEL_REF:
@@ -624,12 +647,12 @@ validate_pattern (pattern, insn, set)
       switch (fmt[i])
        {
        case 'e': case 'u':
-         validate_pattern (XEXP (pattern, i), insn, NULL_RTX);
+         validate_pattern (XEXP (pattern, i), insn, NULL_RTX, 0);
          break;
 
        case 'E':
          for (j = 0; j < XVECLEN (pattern, i); j++)
-           validate_pattern (XVECEXP (pattern, i, j), insn, NULL_RTX);
+           validate_pattern (XVECEXP (pattern, i, j), insn, NULL_RTX, 0);
          break;
 
        case 'i': case 'w': case '0': case 's':
@@ -2337,7 +2360,7 @@ make_insn_sequence (insn, type)
       PUT_MODE (x, VOIDmode);
     }
 
-  validate_pattern (x, insn, NULL_RTX);
+  validate_pattern (x, insn, NULL_RTX, 0);
 
   memset(&head, 0, sizeof(head));
   last = add_to_sequence (x, &head, "", type, 1);