* tree.c (recompute_tree_invarant_for_addr_expr): The address of a

[pf3gnuchains/gcc-fork.git] / gcc / genpreds.c

diff --git a/gcc/genpreds.c b/gcc/genpreds.c
index 833d47f..1eebc33 100644 (file)
--- a/gcc/genpreds.c
+++ b/gcc/genpreds.c
@@ -106,7 +106,7 @@ write_tm_preds_h (void)
              (match_test "basereg_operand_1 (op, mode)")))
 
    The only wart is that there's no way to insist on a { } string in
-   an RTL template, so we have to handle "" strings. */
+   an RTL template, so we have to handle "" strings.  */
 
    
 static void
@@ -259,38 +259,47 @@ add_mode_tests (struct pred_data *p)
   for (;;)
     {
       rtx subexp = *pos;
-      if (GET_CODE (subexp) == IOR)
-       {
-         if (NO_MODE_TEST (XEXP (subexp, 0))
-             && NO_MODE_TEST (XEXP (subexp, 1)))
-           break;
-         else if (NO_MODE_TEST (XEXP (subexp, 0)))
-           pos = &XEXP (subexp, 0);
-         else if (NO_MODE_TEST (XEXP (subexp, 1)))
-           pos = &XEXP (subexp, 1);
-         else
-           abort ();
-       }
-      else if (GET_CODE (subexp) == IF_THEN_ELSE)
+
+      switch (GET_CODE (subexp))
        {
-         if (NO_MODE_TEST (XEXP (subexp, 0))
-             && NO_MODE_TEST (XEXP (subexp, 1))
-             && NO_MODE_TEST (XEXP (subexp, 2)))
-           break;
-         else if (NO_MODE_TEST (XEXP (subexp, 0))
-                  && NO_MODE_TEST (XEXP (subexp, 1)))
-           /* Must put it on the dependent clause, not the controlling
-              expression, or we change the meaning of the test. */
-           pos = &XEXP (subexp, 1);
-         else if (NO_MODE_TEST (XEXP (subexp, 2)))
-           pos = &XEXP (subexp, 2);
-         else
-           abort ();
+       case IOR:
+         {
+           int test0 = NO_MODE_TEST (XEXP (subexp, 0));
+           int test1 = NO_MODE_TEST (XEXP (subexp, 1));
+           
+           gcc_assert (test0 || test1);
+           
+           if (test0 && test1)
+             goto break_loop;
+           pos = test0 ? &XEXP (subexp, 0) : &XEXP (subexp, 1);
+         }
+         break;
+         
+       case IF_THEN_ELSE:
+         {
+           int test0 = NO_MODE_TEST (XEXP (subexp, 0));
+           int test1 = NO_MODE_TEST (XEXP (subexp, 1));
+           int test2 = NO_MODE_TEST (XEXP (subexp, 2));
+           
+           gcc_assert ((test0 && test1) || test2);
+           
+           if (test0 && test1 && test2)
+             goto break_loop;
+           if (test0 && test1)
+             /* Must put it on the dependent clause, not the
+                controlling expression, or we change the meaning of
+                the test.  */
+             pos = &XEXP (subexp, 1);
+           else
+             pos = &XEXP (subexp, 2);
+         }
+         break;
+         
+       default:
+         goto break_loop;
        }
-      else
-       break;
     }
-
+ break_loop:
   XEXP (and_exp, 0) = *pos;
   *pos = and_exp;
 }
@@ -417,6 +426,7 @@ write_insn_preds_c (void)
 #include \"coretypes.h\"\n\
 #include \"tm.h\"\n\
 #include \"rtl.h\"\n\
+#include \"tree.h\"\n\
 #include \"tm_p.h\"\n\
 #include \"function.h\"\n\
 #include \"insn-config.h\"\n\