2008-01-15 Thomas Koenig <tkoenig@gcc.gnu.org>

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

diff --git a/libgfortran/generated/count_8_l4.c b/libgfortran/generated/count_2_l.c
similarity index 80%
rename from libgfortran/generated/count_8_l4.c
rename to libgfortran/generated/count_2_l.c
index e6a386e..eb03c2d 100644 (file)
--- a/libgfortran/generated/count_8_l4.c
+++ b/libgfortran/generated/count_2_l.c
@@ -33,40 +33,43 @@ Boston, MA 02110-1301, USA.  */
 #include <assert.h>
 
 
-#if defined (HAVE_GFC_LOGICAL_4) && defined (HAVE_GFC_INTEGER_8)
+#if defined (HAVE_GFC_INTEGER_2)
 
 
-extern void count_8_l4 (gfc_array_i8 * const restrict, 
-       gfc_array_l4 * const restrict, const index_type * const restrict);
-export_proto(count_8_l4);
+extern void count_2_l (gfc_array_i2 * const restrict, 
+       gfc_array_l1 * const restrict, const index_type * const restrict);
+export_proto(count_2_l);
 
 void
-count_8_l4 (gfc_array_i8 * const restrict retarray, 
-       gfc_array_l4 * const restrict array, 
+count_2_l (gfc_array_i2 * const restrict retarray, 
+       gfc_array_l1 * const restrict array, 
        const index_type * const restrict pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride[GFC_MAX_DIMENSIONS];
-  const GFC_LOGICAL_4 * restrict base;
-  GFC_INTEGER_8 * restrict dest;
+  const GFC_LOGICAL_1 * restrict base;
+  GFC_INTEGER_2 * restrict dest;
   index_type rank;
   index_type n;
   index_type len;
   index_type delta;
   index_type dim;
+  int src_kind;
 
   /* Make dim zero based to avoid confusion.  */
   dim = (*pdim) - 1;
   rank = GFC_DESCRIPTOR_RANK (array) - 1;
 
+  src_kind = GFC_DESCRIPTOR_SIZE (array);
+
   len = array->dim[dim].ubound + 1 - array->dim[dim].lbound;
-  delta = array->dim[dim].stride;
+  delta = array->dim[dim].stride * src_kind;
 
   for (n = 0; n < dim; n++)
     {
-      sstride[n] = array->dim[n].stride;
+      sstride[n] = array->dim[n].stride * src_kind;
       extent[n] = array->dim[n].ubound + 1 - array->dim[n].lbound;
 
       if (extent[n] < 0)
@@ -74,7 +77,7 @@ count_8_l4 (gfc_array_i8 * const restrict retarray,
     }
   for (n = dim; n < rank; n++)
     {
-      sstride[n] = array->dim[n + 1].stride;
+      sstride[n] = array->dim[n + 1].stride * src_kind;
       extent[n] =
         array->dim[n + 1].ubound + 1 - array->dim[n + 1].lbound;
 
@@ -99,7 +102,7 @@ count_8_l4 (gfc_array_i8 * const restrict retarray,
       retarray->offset = 0;
       retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
 
-      alloc_size = sizeof (GFC_INTEGER_8) * retarray->dim[rank-1].stride
+      alloc_size = sizeof (GFC_INTEGER_2) * retarray->dim[rank-1].stride
                   * extent[rank-1];
 
       if (alloc_size == 0)
@@ -116,9 +119,8 @@ count_8_l4 (gfc_array_i8 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
        runtime_error ("rank of return array incorrect in"
-                      " COUNT intrinsic: is %ld, should be %ld",
-                      (long int) (GFC_DESCRIPTOR_RANK (retarray)),
-                      (long int) rank);
+                      " COUNT intrinsic: is %d, should be %d",
+                      GFC_DESCRIPTOR_RANK (retarray), rank);
 
       if (compile_options.bounds_check)
        {
@@ -130,8 +132,8 @@ count_8_l4 (gfc_array_i8 * const restrict retarray,
                - retarray->dim[n].lbound;
              if (extent[n] != ret_extent)
                runtime_error ("Incorrect extent in return value of"
-                              " COUNT intrinsic in dimension %ld:"
-                              " is %ld, should be %ld", (long int) n + 1,
+                              " COUNT intrinsic in dimension %d:"
+                              " is %ld, should be %ld", n + 1,
                               (long int) ret_extent, (long int) extent[n]);
            }
        }
@@ -146,12 +148,25 @@ count_8_l4 (gfc_array_i8 * const restrict retarray,
     }
 
   base = array->data;
+
+  if (src_kind == 1 || src_kind == 2 || src_kind == 4 || src_kind == 8
+#ifdef HAVE_GFC_LOGICAL_16
+      || src_kind == 16
+#endif
+    )
+    {
+      if (base)
+       base = GFOR_POINTER_TO_L1 (base, src_kind);
+    }
+  else
+    internal_error (NULL, "Funny sized logical array in COUNT intrinsic");
+
   dest = retarray->data;
 
   while (base)
     {
-      const GFC_LOGICAL_4 * restrict src;
-      GFC_INTEGER_8 result;
+      const GFC_LOGICAL_1 * restrict src;
+      GFC_INTEGER_2 result;
       src = base;
       {