PR fortran/26025

[pf3gnuchains/gcc-fork.git] / libgfortran / generated / minloc0_8_i4.c

diff --git a/libgfortran/generated/minloc0_8_i4.c b/libgfortran/generated/minloc0_8_i4.c
index 340c54d..5bcfec0 100644 (file)
--- a/libgfortran/generated/minloc0_8_i4.c
+++ b/libgfortran/generated/minloc0_8_i4.c
@@ -25,8 +25,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public
 License along with libgfortran; see the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "config.h"
 #include <stdlib.h>
@@ -36,18 +36,22 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
+#if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_8)
 
-extern void minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array);
+
+extern void minloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+       gfc_array_i4 * const restrict array);
 export_proto(minloc0_8_i4);
 
 void
-minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
+minloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+       gfc_array_i4 * const restrict array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_INTEGER_8 *dest;
   index_type rank;
   index_type n;
@@ -62,7 +66,7 @@ minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
       retarray->dim[0].ubound = rank-1;
       retarray->dim[0].stride = 1;
       retarray->dtype = (retarray->dtype & ~GFC_DTYPE_RANK_MASK) | 1;
-      retarray->base = 0;
+      retarray->offset = 0;
       retarray->data = internal_malloc_size (sizeof (GFC_INTEGER_8) * rank);
     }
   else
@@ -72,12 +76,7 @@ minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
 
       if (retarray->dim[0].ubound + 1 - retarray->dim[0].lbound != rank)
         runtime_error ("dimension of return array incorrect");
-
-      if (retarray->dim[0].stride == 0)
-       retarray->dim[0].stride = 1;
     }
-  if (array->dim[0].stride == 0)
-    array->dim[0].stride = 1;
 
   dstride = retarray->dim[0].stride;
   dest = retarray->data;
@@ -99,7 +98,7 @@ minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
 
   /* Initialize the return value.  */
   for (n = 0; n < rank; n++)
-    dest[n * dstride] = 1;
+    dest[n * dstride] = 0;
   {
 
   GFC_INTEGER_4 minval;
@@ -111,7 +110,7 @@ minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
       {
         /* Implementation start.  */
 
-  if (*base < minval)
+  if (*base < minval || !dest[0])
     {
       minval = *base;
       for (n = 0; n < rank; n++)
@@ -129,7 +128,7 @@ minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
              the next dimension.  */
           count[n] = 0;
           /* We could precalculate these products, but this is a less
-             frequently used path so proabably not worth it.  */
+             frequently used path so probably not worth it.  */
           base -= sstride[n] * extent[n];
           n++;
           if (n == rank)
@@ -149,12 +148,14 @@ minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void mminloc0_8_i4 (gfc_array_i8 *, gfc_array_i4 *, gfc_array_l4 *);
+extern void mminloc0_8_i4 (gfc_array_i8 * const restrict, 
+       gfc_array_i4 * const restrict, gfc_array_l4 * const restrict);
 export_proto(mminloc0_8_i4);
 
 void
-mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
-                                 gfc_array_l4 * mask)
+mminloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+       gfc_array_i4 * const restrict array,
+       gfc_array_l4 * const restrict mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -162,7 +163,7 @@ mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
   index_type mstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   GFC_INTEGER_8 *dest;
-  GFC_INTEGER_4 *base;
+  const GFC_INTEGER_4 *base;
   GFC_LOGICAL_4 *mbase;
   int rank;
   index_type n;
@@ -177,7 +178,7 @@ mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
       retarray->dim[0].ubound = rank-1;
       retarray->dim[0].stride = 1;
       retarray->dtype = (retarray->dtype & ~GFC_DTYPE_RANK_MASK) | 1;
-      retarray->base = 0;
+      retarray->offset = 0;
       retarray->data = internal_malloc_size (sizeof (GFC_INTEGER_8) * rank);
     }
   else
@@ -187,14 +188,8 @@ mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
 
       if (retarray->dim[0].ubound + 1 - retarray->dim[0].lbound != rank)
         runtime_error ("dimension of return array incorrect");
-
-      if (retarray->dim[0].stride == 0)
-       retarray->dim[0].stride = 1;
     }
 
-  if (array->dim[0].stride == 0)
-    array->dim[0].stride = 1;
-
   dstride = retarray->dim[0].stride;
   dest = retarray->data;
   for (n = 0; n < rank; n++)
@@ -227,7 +222,7 @@ mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
 
   /* Initialize the return value.  */
   for (n = 0; n < rank; n++)
-    dest[n * dstride] = 1;
+    dest[n * dstride] = 0;
   {
 
   GFC_INTEGER_4 minval;
@@ -239,7 +234,7 @@ mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
       {
         /* Implementation start.  */
 
-  if (*mbase && *base < minval)
+  if (*mbase && (*base < minval || !dest[0]))
     {
       minval = *base;
       for (n = 0; n < rank; n++)
@@ -258,7 +253,7 @@ mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
              the next dimension.  */
           count[n] = 0;
           /* We could precalculate these products, but this is a less
-             frequently used path so proabably not worth it.  */
+             frequently used path so probably not worth it.  */
           base -= sstride[n] * extent[n];
           mbase -= mstride[n] * extent[n];
           n++;
@@ -278,3 +273,54 @@ mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
     }
   }
 }
+
+
+extern void sminloc0_8_i4 (gfc_array_i8 * const restrict, 
+       gfc_array_i4 * const restrict, GFC_LOGICAL_4 *);
+export_proto(sminloc0_8_i4);
+
+void
+sminloc0_8_i4 (gfc_array_i8 * const restrict retarray, 
+       gfc_array_i4 * const restrict array,
+       GFC_LOGICAL_4 * mask)
+{
+  index_type rank;
+  index_type dstride;
+  index_type n;
+  GFC_INTEGER_8 *dest;
+
+  if (*mask)
+    {
+      minloc0_8_i4 (retarray, array);
+      return;
+    }
+
+  rank = GFC_DESCRIPTOR_RANK (array);
+
+  if (rank <= 0)
+    runtime_error ("Rank of array needs to be > 0");
+
+  if (retarray->data == NULL)
+    {
+      retarray->dim[0].lbound = 0;
+      retarray->dim[0].ubound = rank-1;
+      retarray->dim[0].stride = 1;
+      retarray->dtype = (retarray->dtype & ~GFC_DTYPE_RANK_MASK) | 1;
+      retarray->offset = 0;
+      retarray->data = internal_malloc_size (sizeof (GFC_INTEGER_8) * rank);
+    }
+  else
+    {
+      if (GFC_DESCRIPTOR_RANK (retarray) != 1)
+       runtime_error ("rank of return array does not equal 1");
+
+      if (retarray->dim[0].ubound + 1 - retarray->dim[0].lbound != rank)
+        runtime_error ("dimension of return array incorrect");
+    }
+
+  dstride = retarray->dim[0].stride;
+  dest = retarray->data;
+  for (n = 0; n<rank; n++)
+    dest[n * dstride] = 0 ;
+}
+#endif