2008-10-09 Thomas Koenig <tkoenig@gcc.gnu.org>

[pf3gnuchains/gcc-fork.git] / gcc / tree-chrec.h

diff --git a/gcc/tree-chrec.h b/gcc/tree-chrec.h
index e84ecd7..d35dcd3 100644 (file)
--- a/gcc/tree-chrec.h
+++ b/gcc/tree-chrec.h
@@ -57,8 +57,8 @@ tree_is_chrec (const_tree expr)
 extern tree chrec_fold_plus (tree, tree, tree);
 extern tree chrec_fold_minus (tree, tree, tree);
 extern tree chrec_fold_multiply (tree, tree, tree);
-extern tree chrec_convert (tree, tree, tree);
-extern tree chrec_convert_rhs (tree, tree, tree);
+extern tree chrec_convert (tree, tree, gimple);
+extern tree chrec_convert_rhs (tree, tree, gimple);
 extern tree chrec_convert_aggressive (tree, tree);
 
 /* Operations.  */
@@ -70,6 +70,7 @@ extern tree evolution_part_in_loop_num (tree, unsigned);
 extern tree hide_evolution_in_other_loops_than_loop (tree, unsigned);
 extern tree reset_evolution_in_loop (unsigned, tree, tree);
 extern tree chrec_merge (tree, tree);
+extern void for_each_scev_op (tree *, bool (*) (tree *, void *), void *);
 
 /* Observers.  */
 extern bool eq_evolutions_p (const_tree, const_tree);
@@ -132,6 +133,11 @@ build_polynomial_chrec (unsigned loop_num,
   if (no_evolution_in_loop_p (left, loop_num, &val) && !val)
     return chrec_dont_know;
 
+  /* Pointer types should occur only on the left hand side, i.e. in
+     the base of the chrec, and not in the step.  */
+  gcc_assert (!POINTER_TYPE_P (TREE_TYPE (right)));
+
+  /* Types of left and right sides of a chrec should be compatible.  */
   if (POINTER_TYPE_P (TREE_TYPE (left)))
     gcc_assert (sizetype == TREE_TYPE (right));
   else
@@ -163,10 +169,10 @@ evolution_function_is_constant_p (const_tree chrec)
     }
 }
 
-/* Determine whether the given tree is an affine evolution function or not.  */
+/* Determine whether CHREC is an affine evolution function in LOOPNUM.  */
 
 static inline bool 
-evolution_function_is_affine_p (const_tree chrec)
+evolution_function_is_affine_in_loop (const_tree chrec, int loopnum)
 {
   if (chrec == NULL_TREE)
     return false;
@@ -174,10 +180,8 @@ evolution_function_is_affine_p (const_tree chrec)
   switch (TREE_CODE (chrec))
     {
     case POLYNOMIAL_CHREC:
-      if (evolution_function_is_invariant_p (CHREC_LEFT (chrec), 
-                                            CHREC_VARIABLE (chrec))
-         && evolution_function_is_invariant_p (CHREC_RIGHT (chrec),
-                                               CHREC_VARIABLE (chrec)))
+      if (evolution_function_is_invariant_p (CHREC_LEFT (chrec), loopnum)
+         && evolution_function_is_invariant_p (CHREC_RIGHT (chrec), loopnum))
        return true;
       else
        return false;
@@ -187,14 +191,28 @@ evolution_function_is_affine_p (const_tree chrec)
     }
 }
 
-/* Determine whether the given tree is an affine or constant evolution
-   function.  */
+/* Determine whether CHREC is an affine evolution function or not.  */
 
 static inline bool 
-evolution_function_is_affine_or_constant_p (const_tree chrec)
+evolution_function_is_affine_p (const_tree chrec)
 {
-  return evolution_function_is_affine_p (chrec) 
-    || evolution_function_is_constant_p (chrec);
+  if (chrec == NULL_TREE)
+    return false;
+  
+  switch (TREE_CODE (chrec))
+    {
+    case POLYNOMIAL_CHREC:
+      if (evolution_function_is_invariant_p (CHREC_LEFT (chrec),
+                                            CHREC_VARIABLE (chrec))
+         && evolution_function_is_invariant_p (CHREC_RIGHT (chrec),
+                                               CHREC_VARIABLE (chrec)))
+       return true;
+      else
+       return false;
+      
+    default:
+      return false;
+    }
 }
 
 /* Determines whether EXPR does not contains chrec expressions.  */
@@ -216,5 +234,24 @@ chrec_type (const_tree chrec)
   return TREE_TYPE (chrec);
 }
 
+static inline tree
+chrec_fold_op (enum tree_code code, tree type, tree op0, tree op1)
+{
+  switch (code)
+    {
+    case PLUS_EXPR:
+      return chrec_fold_plus (type, op0, op1);
+
+    case MINUS_EXPR:
+      return chrec_fold_minus (type, op0, op1);
+
+    case MULT_EXPR:
+      return chrec_fold_multiply (type, op0, op1);
+
+    default:
+      gcc_unreachable ();
+    }
+
+}
 
 #endif  /* GCC_TREE_CHREC_H  */