Add wide-int branch.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@201707 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 11 insertions, 11 deletions

diff --git a/gcc/loop-doloop.c b/gcc/loop-doloop.c
index b47901b69b7..17e4cb1c7fa 100644
--- a/gcc/loop-doloop.c
+++ b/gcc/loop-doloop.c
@@ -409,7 +409,7 @@ doloop_modify (struct loop *loop, struct niter_desc *desc,
   basic_block loop_end = desc->out_edge->src;
   enum machine_mode mode;
   rtx true_prob_val;
-  double_int iterations;
+  max_wide_int iterations;
 
   jump_insn = BB_END (loop_end);
 
@@ -461,9 +461,9 @@ doloop_modify (struct loop *loop, struct niter_desc *desc,
       /* Determine if the iteration counter will be non-negative.
 	 Note that the maximum value loaded is iterations_max - 1.  */
       if (max_loop_iterations (loop, &iterations)
-	  && (iterations.ule (double_int_one.llshift
-			       (GET_MODE_PRECISION (mode) - 1,
-				GET_MODE_PRECISION (mode)))))
+	  && (iterations.leu_p (wide_int::set_bit_in_zero 
+				(GET_MODE_PRECISION (mode) - 1,
+				 GET_MODE_PRECISION (mode)))))
 	nonneg = 1;
       break;
 
@@ -549,14 +549,14 @@ doloop_modify (struct loop *loop, struct niter_desc *desc,
   {
     rtx init;
     unsigned level = get_loop_level (loop) + 1;
-    double_int iter;
+    wide_int iter;
     rtx iter_rtx;
 
     if (!max_loop_iterations (loop, &iter)
-	|| !iter.fits_shwi ())
+	|| !iter.fits_shwi_p ())
       iter_rtx = const0_rtx;
     else
-      iter_rtx = GEN_INT (iter.to_shwi());
+      iter_rtx = GEN_INT (iter.to_shwi ());
     init = gen_doloop_begin (counter_reg,
 			     desc->const_iter ? desc->niter_expr : const0_rtx,
 			     iter_rtx,
@@ -618,7 +618,7 @@ doloop_optimize (struct loop *loop)
   struct niter_desc *desc;
   unsigned word_mode_size;
   unsigned HOST_WIDE_INT word_mode_max;
-  double_int iter;
+  max_wide_int iter;
   int entered_at_top;
 
   if (dump_file)
@@ -671,10 +671,10 @@ doloop_optimize (struct loop *loop)
   count = copy_rtx (desc->niter_expr);
   iterations = desc->const_iter ? desc->niter_expr : const0_rtx;
   if (!max_loop_iterations (loop, &iter)
-      || !iter.fits_shwi ())
+      || !iter.fits_shwi_p ())
     iterations_max = const0_rtx;
   else
-    iterations_max = GEN_INT (iter.to_shwi());
+    iterations_max = GEN_INT (iter.to_shwi ());
   level = get_loop_level (loop) + 1;
 
   /* Generate looping insn.  If the pattern FAILs then give up trying
@@ -697,7 +697,7 @@ doloop_optimize (struct loop *loop)
 	 computed, we must be sure that the number of iterations fits into
 	 the new mode.  */
       && (word_mode_size >= GET_MODE_PRECISION (mode)
-	  || iter.ule (double_int::from_shwi (word_mode_max))))
+	  || iter.leu_p (word_mode_max)))
     {
       if (word_mode_size > GET_MODE_PRECISION (mode))
 	{