[gcc] GCC 4.5.0=>4.5.1

gcc/libgfortran/generated/minval_i2.c

 /* Implementation of the MINVAL intrinsic
    Copyright 2002, 2007, 2009 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
 
 Libgfortran is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either
 version 3 of the License, or (at your option) any later version.
@@ skipping 39 matching lines @@
   index_type n;
   index_type len;
   index_type delta;
   index_type dim;
   int continue_loop;
 
   /* Make dim zero based to avoid confusion.  */
   dim = (*pdim) - 1;
   rank = GFC_DESCRIPTOR_RANK (array) - 1;
 
-  len = array->dim[dim].ubound + 1 - array->dim[dim].lbound;
+  len = GFC_DESCRIPTOR_EXTENT(array,dim);
   if (len < 0)
     len = 0;
-  delta = array->dim[dim].stride;
+  delta = GFC_DESCRIPTOR_STRIDE(array,dim);
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = array->dim[n].stride;
-      extent[n] = array->dim[n].ubound + 1 - array->dim[n].lbound;
+      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
+      extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] < 0)
         extent[n] = 0;
     }
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = array->dim[n + 1].stride;
-      extent[n] =
-        array->dim[n + 1].ubound + 1 - array->dim[n + 1].lbound;
+      sstride[n] = GFC_DESCRIPTOR_STRIDE(array, n + 1);
+      extent[n] = GFC_DESCRIPTOR_EXTENT(array, n + 1);
 
       if (extent[n] < 0)
         extent[n] = 0;
     }
 
   if (retarray->data == NULL)
     {
-      size_t alloc_size;
+      size_t alloc_size, str;
 
       for (n = 0; n < rank; n++)
-        {
-          retarray->dim[n].lbound = 0;
-          retarray->dim[n].ubound = extent[n]-1;
-          if (n == 0)
-            retarray->dim[n].stride = 1;
-          else
-            retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
-        }
+        {
+          if (n == 0)
+            str = 1;
+          else
+            str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1];
+
+          GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str);
+
+        }
 
       retarray->offset = 0;
       retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
 
-      alloc_size = sizeof (GFC_INTEGER_2) * retarray->dim[rank-1].stride
+      alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1)
                    * extent[rank-1];
 
       if (alloc_size == 0)
         {
           /* Make sure we have a zero-sized array.  */
-          retarray->dim[0].lbound = 0;
-          retarray->dim[0].ubound = -1;
+          GFC_DIMENSION_SET(retarray->dim[0], 0, -1, 1);
           return;
+
         }
       else
         retarray->data = internal_malloc_size (alloc_size);
     }
   else
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
         runtime_error ("rank of return array incorrect in"
                        " MINVAL intrinsic: is %ld, should be %ld",
                        (long int) (GFC_DESCRIPTOR_RANK (retarray)),
                        (long int) rank);
 
       if (unlikely (compile_options.bounds_check))
-        {
-          for (n=0; n < rank; n++)
-            {
-              index_type ret_extent;
-
-              ret_extent = retarray->dim[n].ubound + 1
-                - retarray->dim[n].lbound;
-              if (extent[n] != ret_extent)
-                runtime_error ("Incorrect extent in return value of"
-                               " MINVAL intrinsic in dimension %ld:"
-                               " is %ld, should be %ld", (long int) n + 1,
-                               (long int) ret_extent, (long int) extent[n]);
-            }
-        }
+        bounds_ifunction_return ((array_t *) retarray, extent,
+                                 "return value", "MINVAL");
     }
 
   for (n = 0; n < rank; n++)
     {
       count[n] = 0;
-      dstride[n] = retarray->dim[n].stride;
+      dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n);
       if (extent[n] <= 0)
-        len = 0;
+        len = 0;
     }
 
   base = array->data;
   dest = retarray->data;
 
   continue_loop = 1;
   while (continue_loop)
     {
       const GFC_INTEGER_2 * restrict src;
       GFC_INTEGER_2 result;
       src = base;
       {
 
-  result = GFC_INTEGER_2_HUGE;
-        if (len <= 0)
+#if defined (GFC_INTEGER_2_INFINITY)
+        result = GFC_INTEGER_2_INFINITY;
+#else
+        result = GFC_INTEGER_2_HUGE;
+#endif
+        if (len <= 0)
           *dest = GFC_INTEGER_2_HUGE;
         else
           {
             for (n = 0; n < len; n++, src += delta)
               {
 
-  if (*src < result)
-    result = *src;
-          }
+#if defined (GFC_INTEGER_2_QUIET_NAN)
+                if (*src <= result)
+                  break;
+              }
+            if (unlikely (n >= len))
+              result = GFC_INTEGER_2_QUIET_NAN;
+            else for (; n < len; n++, src += delta)
+              {
+#endif
+                if (*src < result)
+                  result = *src;
+              }
             *dest = result;
           }
       }
       /* Advance to the next element.  */
       count[0]++;
       base += sstride[0];
       dest += dstride[0];
       n = 0;
       while (count[n] == extent[n])
-        {
-          /* When we get to the end of a dimension, reset it and increment
-             the next dimension.  */
-          count[n] = 0;
-          /* We could precalculate these products, but this is a less
-             frequently used path so probably not worth it.  */
-          base -= sstride[n] * extent[n];
-          dest -= dstride[n] * extent[n];
-          n++;
-          if (n == rank)
-            {
-              /* Break out of the look.  */
+        {
+          /* When we get to the end of a dimension, reset it and increment
+             the next dimension.  */
+          count[n] = 0;
+          /* We could precalculate these products, but this is a less
+             frequently used path so probably not worth it.  */
+          base -= sstride[n] * extent[n];
+          dest -= dstride[n] * extent[n];
+          n++;
+          if (n == rank)
+            {
+              /* Break out of the look.  */
               continue_loop = 0;
               break;
-            }
-          else
-            {
-              count[n]++;
-              base += sstride[n];
-              dest += dstride[n];
-            }
-        }
+            }
+          else
+            {
+              count[n]++;
+              base += sstride[n];
+              dest += dstride[n];
+            }
+        }
     }
 }
 
 
 extern void mminval_i2 (gfc_array_i2 * const restrict, 
         gfc_array_i2 * const restrict, const index_type * const restrict,
         gfc_array_l1 * const restrict);
 export_proto(mminval_i2);
 
 void
@@ skipping 14 matching lines @@
   int dim;
   index_type n;
   index_type len;
   index_type delta;
   index_type mdelta;
   int mask_kind;
 
   dim = (*pdim) - 1;
   rank = GFC_DESCRIPTOR_RANK (array) - 1;
 
-  len = array->dim[dim].ubound + 1 - array->dim[dim].lbound;
+  len = GFC_DESCRIPTOR_EXTENT(array,dim);
   if (len <= 0)
     return;
 
   mbase = mask->data;
 
   mask_kind = GFC_DESCRIPTOR_SIZE (mask);
 
   if (mask_kind == 1 || mask_kind == 2 || mask_kind == 4 || mask_kind == 8
 #ifdef HAVE_GFC_LOGICAL_16
       || mask_kind == 16
 #endif
       )
     mbase = GFOR_POINTER_TO_L1 (mbase, mask_kind);
   else
     runtime_error ("Funny sized logical array");
 
-  delta = array->dim[dim].stride;
-  mdelta = mask->dim[dim].stride * mask_kind;
+  delta = GFC_DESCRIPTOR_STRIDE(array,dim);
+  mdelta = GFC_DESCRIPTOR_STRIDE_BYTES(mask,dim);
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = array->dim[n].stride;
-      mstride[n] = mask->dim[n].stride * mask_kind;
-      extent[n] = array->dim[n].ubound + 1 - array->dim[n].lbound;
+      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n);
+      mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n);
+      extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] < 0)
         extent[n] = 0;
 
     }
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = array->dim[n + 1].stride;
-      mstride[n] = mask->dim[n + 1].stride * mask_kind;
-      extent[n] =
-        array->dim[n + 1].ubound + 1 - array->dim[n + 1].lbound;
+      sstride[n] = GFC_DESCRIPTOR_STRIDE(array,n + 1);
+      mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask, n + 1);
+      extent[n] = GFC_DESCRIPTOR_EXTENT(array, n + 1);
 
       if (extent[n] < 0)
         extent[n] = 0;
     }
 
   if (retarray->data == NULL)
     {
-      size_t alloc_size;
+      size_t alloc_size, str;
 
       for (n = 0; n < rank; n++)
-        {
-          retarray->dim[n].lbound = 0;
-          retarray->dim[n].ubound = extent[n]-1;
-          if (n == 0)
-            retarray->dim[n].stride = 1;
-          else
-            retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
-        }
+        {
+          if (n == 0)
+            str = 1;
+          else
+            str= GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1];
 
-      alloc_size = sizeof (GFC_INTEGER_2) * retarray->dim[rank-1].stride
+          GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str);
+
+        }
+
+      alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1)
                    * extent[rank-1];
 
       retarray->offset = 0;
       retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
 
       if (alloc_size == 0)
         {
           /* Make sure we have a zero-sized array.  */
-          retarray->dim[0].lbound = 0;
-          retarray->dim[0].ubound = -1;
+          GFC_DIMENSION_SET(retarray->dim[0], 0, -1, 1);
           return;
         }
       else
         retarray->data = internal_malloc_size (alloc_size);
 
     }
   else
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
         runtime_error ("rank of return array incorrect in MINVAL intrinsic");
 
       if (unlikely (compile_options.bounds_check))
         {
-          for (n=0; n < rank; n++)
-            {
-              index_type ret_extent;
-
-              ret_extent = retarray->dim[n].ubound + 1
-                - retarray->dim[n].lbound;
-              if (extent[n] != ret_extent)
-                runtime_error ("Incorrect extent in return value of"
-                               " MINVAL intrinsic in dimension %ld:"
-                               " is %ld, should be %ld", (long int) n + 1,
-                               (long int) ret_extent, (long int) extent[n]);
-            }
-          for (n=0; n<= rank; n++)
-            {
-              index_type mask_extent, array_extent;
-
-              array_extent = array->dim[n].ubound + 1 - array->dim[n].lbound;
-              mask_extent = mask->dim[n].ubound + 1 - mask->dim[n].lbound;
-              if (array_extent != mask_extent)
-                runtime_error ("Incorrect extent in MASK argument of"
-                               " MINVAL intrinsic in dimension %ld:"
-                               " is %ld, should be %ld", (long int) n + 1,
-                               (long int) mask_extent, (long int) array_extent);
-            }
+          bounds_ifunction_return ((array_t *) retarray, extent,
+                                   "return value", "MINVAL");
+          bounds_equal_extents ((array_t *) mask, (array_t *) array,
+                                "MASK argument", "MINVAL");
         }
     }
 
   for (n = 0; n < rank; n++)
     {
       count[n] = 0;
-      dstride[n] = retarray->dim[n].stride;
+      dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n);
       if (extent[n] <= 0)
-        return;
+        return;
     }
 
   dest = retarray->data;
   base = array->data;
 
   while (base)
     {
       const GFC_INTEGER_2 * restrict src;
       const GFC_LOGICAL_1 * restrict msrc;
       GFC_INTEGER_2 result;
       src = base;
       msrc = mbase;
       {
 
-  result = GFC_INTEGER_2_HUGE;
-        if (len <= 0)
+#if defined (GFC_INTEGER_2_INFINITY)
+        result = GFC_INTEGER_2_INFINITY;
+#else
+        result = GFC_INTEGER_2_HUGE;
+#endif
+#if defined (GFC_INTEGER_2_QUIET_NAN)
+        int non_empty_p = 0;
+#endif
+        if (len <= 0)
           *dest = GFC_INTEGER_2_HUGE;
         else
           {
             for (n = 0; n < len; n++, src += delta, msrc += mdelta)
               {
 
-  if (*msrc && *src < result)
-    result = *src;
-              }
+#if defined (GFC_INTEGER_2_INFINITY) || defined (GFC_INTEGER_2_QUIET_NAN)
+                if (*msrc)
+                  {
+#if defined (GFC_INTEGER_2_QUIET_NAN)
+                    non_empty_p = 1;
+                    if (*src <= result)
+#endif
+                      break;
+                  }
+              }
+            if (unlikely (n >= len))
+              {
+#if defined (GFC_INTEGER_2_QUIET_NAN)
+                result = non_empty_p ? GFC_INTEGER_2_QUIET_NAN : GFC_INTEGER_2_HUGE;
+#else
+                result = GFC_INTEGER_2_HUGE;
+#endif
+              }
+            else for (; n < len; n++, src += delta, msrc += mdelta)
+              {
+#endif
+                if (*msrc && *src < result)
+                  result = *src;
+              }
             *dest = result;
           }
       }
       /* Advance to the next element.  */
       count[0]++;
       base += sstride[0];
       mbase += mstride[0];
       dest += dstride[0];
       n = 0;
       while (count[n] == extent[n])
-        {
-          /* When we get to the end of a dimension, reset it and increment
-             the next dimension.  */
-          count[n] = 0;
-          /* We could precalculate these products, but this is a less
-             frequently used path so probably not worth it.  */
-          base -= sstride[n] * extent[n];
-          mbase -= mstride[n] * extent[n];
-          dest -= dstride[n] * extent[n];
-          n++;
-          if (n == rank)
-            {
-              /* Break out of the look.  */
-              base = NULL;
-              break;
-            }
-          else
-            {
-              count[n]++;
-              base += sstride[n];
-              mbase += mstride[n];
-              dest += dstride[n];
-            }
-        }
+        {
+          /* When we get to the end of a dimension, reset it and increment
+             the next dimension.  */
+          count[n] = 0;
+          /* We could precalculate these products, but this is a less
+             frequently used path so probably not worth it.  */
+          base -= sstride[n] * extent[n];
+          mbase -= mstride[n] * extent[n];
+          dest -= dstride[n] * extent[n];
+          n++;
+          if (n == rank)
+            {
+              /* Break out of the look.  */
+              base = NULL;
+              break;
+            }
+          else
+            {
+              count[n]++;
+              base += sstride[n];
+              mbase += mstride[n];
+              dest += dstride[n];
+            }
+        }
     }
 }
 
 
 extern void sminval_i2 (gfc_array_i2 * const restrict, 
         gfc_array_i2 * const restrict, const index_type * const restrict,
         GFC_LOGICAL_4 *);
 export_proto(sminval_i2);
 
 void
 sminval_i2 (gfc_array_i2 * const restrict retarray, 
         gfc_array_i2 * const restrict array, 
         const index_type * const restrict pdim, 
         GFC_LOGICAL_4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
-  index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
   GFC_INTEGER_2 * restrict dest;
   index_type rank;
   index_type n;
   index_type dim;
 
 
   if (*mask)
     {
       minval_i2 (retarray, array, pdim);
       return;
     }
   /* Make dim zero based to avoid confusion.  */
   dim = (*pdim) - 1;
   rank = GFC_DESCRIPTOR_RANK (array) - 1;
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = array->dim[n].stride;
-      extent[n] = array->dim[n].ubound + 1 - array->dim[n].lbound;
+      extent[n] = GFC_DESCRIPTOR_EXTENT(array,n);
 
       if (extent[n] <= 0)
         extent[n] = 0;
     }
 
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = array->dim[n + 1].stride;
       extent[n] =
-        array->dim[n + 1].ubound + 1 - array->dim[n + 1].lbound;
+        GFC_DESCRIPTOR_EXTENT(array,n + 1);
 
       if (extent[n] <= 0)
-        extent[n] = 0;
+        extent[n] = 0;
     }
 
   if (retarray->data == NULL)
     {
-      size_t alloc_size;
+      size_t alloc_size, str;
 
       for (n = 0; n < rank; n++)
-        {
-          retarray->dim[n].lbound = 0;
-          retarray->dim[n].ubound = extent[n]-1;
-          if (n == 0)
-            retarray->dim[n].stride = 1;
-          else
-            retarray->dim[n].stride = retarray->dim[n-1].stride * extent[n-1];
-        }
+        {
+          if (n == 0)
+            str = 1;
+          else
+            str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1];
+
+          GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str);
+
+        }
 
       retarray->offset = 0;
       retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
 
-      alloc_size = sizeof (GFC_INTEGER_2) * retarray->dim[rank-1].stride
+      alloc_size = sizeof (GFC_INTEGER_2) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1)
                    * extent[rank-1];
 
       if (alloc_size == 0)
         {
           /* Make sure we have a zero-sized array.  */
-          retarray->dim[0].lbound = 0;
-          retarray->dim[0].ubound = -1;
+          GFC_DIMENSION_SET(retarray->dim[0], 0, -1, 1);
           return;
         }
       else
         retarray->data = internal_malloc_size (alloc_size);
     }
   else
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
         runtime_error ("rank of return array incorrect in"
                        " MINVAL intrinsic: is %ld, should be %ld",
                        (long int) (GFC_DESCRIPTOR_RANK (retarray)),
                        (long int) rank);
 
       if (unlikely (compile_options.bounds_check))
         {
           for (n=0; n < rank; n++)
             {
               index_type ret_extent;
 
-              ret_extent = retarray->dim[n].ubound + 1
-                - retarray->dim[n].lbound;
+              ret_extent = GFC_DESCRIPTOR_EXTENT(retarray,n);
               if (extent[n] != ret_extent)
                 runtime_error ("Incorrect extent in return value of"
                                " MINVAL intrinsic in dimension %ld:"
                                " is %ld, should be %ld", (long int) n + 1,
                                (long int) ret_extent, (long int) extent[n]);
             }
         }
     }
 
   for (n = 0; n < rank; n++)
     {
       count[n] = 0;
-      dstride[n] = retarray->dim[n].stride;
+      dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n);
     }
 
   dest = retarray->data;
 
   while(1)
     {
       *dest = GFC_INTEGER_2_HUGE;
       count[0]++;
       dest += dstride[0];
       n = 0;
       while (count[n] == extent[n])
-        {
+        {
           /* When we get to the end of a dimension, reset it and increment
-             the next dimension.  */
-          count[n] = 0;
-          /* We could precalculate these products, but this is a less
-             frequently used path so probably not worth it.  */
-          dest -= dstride[n] * extent[n];
-          n++;
-          if (n == rank)
+             the next dimension.  */
+          count[n] = 0;
+          /* We could precalculate these products, but this is a less
+             frequently used path so probably not worth it.  */
+          dest -= dstride[n] * extent[n];
+          n++;
+          if (n == rank)
             return;
-          else
-            {
-              count[n]++;
-              dest += dstride[n];
-            }
+          else
+            {
+              count[n]++;
+              dest += dstride[n];
+            }
         }
     }
 }
 
 #endif