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>
#include "libgfortran.h"
-extern void minloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *);
+#if defined (HAVE_GFC_INTEGER_8) && defined (HAVE_GFC_INTEGER_4)
+
+
+extern void minloc1_4_i8 (gfc_array_i4 * const restrict,
+ gfc_array_i8 * const restrict, const index_type * const restrict);
export_proto(minloc1_4_i8);
void
-minloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
+minloc1_4_i8 (gfc_array_i4 * const restrict retarray,
+ gfc_array_i8 * 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];
- GFC_INTEGER_8 *base;
- GFC_INTEGER_4 *dest;
+ const GFC_INTEGER_8 * restrict base;
+ GFC_INTEGER_4 * restrict dest;
index_type rank;
index_type n;
index_type len;
dim = (*pdim) - 1;
rank = GFC_DESCRIPTOR_RANK (array) - 1;
- /* TODO: It should be a front end job to correctly set the strides. */
-
- if (array->dim[0].stride == 0)
- array->dim[0].stride = 1;
-
len = array->dim[dim].ubound + 1 - array->dim[dim].lbound;
delta = array->dim[dim].stride;
= internal_malloc_size (sizeof (GFC_INTEGER_4)
* retarray->dim[rank-1].stride
* extent[rank-1]);
- retarray->base = 0;
+ retarray->offset = 0;
retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
}
else
{
- if (retarray->dim[0].stride == 0)
- retarray->dim[0].stride = 1;
-
if (rank != GFC_DESCRIPTOR_RANK (retarray))
runtime_error ("rank of return array incorrect");
}
while (base)
{
- GFC_INTEGER_8 *src;
+ const GFC_INTEGER_8 * restrict src;
GFC_INTEGER_4 result;
src = base;
{
GFC_INTEGER_8 minval;
minval = GFC_INTEGER_8_HUGE;
- result = 1;
+ result = 0;
if (len <= 0)
*dest = 0;
else
for (n = 0; n < len; n++, src += delta)
{
- if (*src < minval)
+ if (*src < minval || !result)
{
minval = *src;
result = (GFC_INTEGER_4)n + 1;
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];
dest -= dstride[n] * extent[n];
n++;
}
-extern void mminloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *,
- gfc_array_l4 *);
+extern void mminloc1_4_i8 (gfc_array_i4 * const restrict,
+ gfc_array_i8 * const restrict, const index_type * const restrict,
+ gfc_array_l4 * const restrict);
export_proto(mminloc1_4_i8);
void
-mminloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 * array,
- index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_i8 (gfc_array_i4 * const restrict retarray,
+ gfc_array_i8 * const restrict array,
+ const index_type * const restrict pdim,
+ gfc_array_l4 * const restrict 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];
index_type mstride[GFC_MAX_DIMENSIONS];
- GFC_INTEGER_4 *dest;
- GFC_INTEGER_8 *base;
- GFC_LOGICAL_4 *mbase;
+ GFC_INTEGER_4 * restrict dest;
+ const GFC_INTEGER_8 * restrict base;
+ const GFC_LOGICAL_4 * restrict mbase;
int rank;
int dim;
index_type n;
dim = (*pdim) - 1;
rank = GFC_DESCRIPTOR_RANK (array) - 1;
- /* TODO: It should be a front end job to correctly set the strides. */
-
- if (array->dim[0].stride == 0)
- array->dim[0].stride = 1;
-
- if (mask->dim[0].stride == 0)
- mask->dim[0].stride = 1;
-
len = array->dim[dim].ubound + 1 - array->dim[dim].lbound;
if (len <= 0)
return;
= internal_malloc_size (sizeof (GFC_INTEGER_4)
* retarray->dim[rank-1].stride
* extent[rank-1]);
- retarray->base = 0;
+ retarray->offset = 0;
retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
}
else
{
- if (retarray->dim[0].stride == 0)
- retarray->dim[0].stride = 1;
-
if (rank != GFC_DESCRIPTOR_RANK (retarray))
runtime_error ("rank of return array incorrect");
}
while (base)
{
- GFC_INTEGER_8 *src;
- GFC_LOGICAL_4 *msrc;
+ const GFC_INTEGER_8 * restrict src;
+ const GFC_LOGICAL_4 * restrict msrc;
GFC_INTEGER_4 result;
src = base;
msrc = mbase;
GFC_INTEGER_8 minval;
minval = GFC_INTEGER_8_HUGE;
- result = 1;
+ result = 0;
if (len <= 0)
*dest = 0;
else
for (n = 0; n < len; n++, src += delta, msrc += mdelta)
{
- if (*msrc && *src < minval)
+ if (*msrc && (*src < minval || !result))
{
minval = *src;
result = (GFC_INTEGER_4)n + 1;
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];
dest -= dstride[n] * extent[n];
}
}
+
+extern void sminloc1_4_i8 (gfc_array_i4 * const restrict,
+ gfc_array_i8 * const restrict, const index_type * const restrict,
+ GFC_LOGICAL_4 *);
+export_proto(sminloc1_4_i8);
+
+void
+sminloc1_4_i8 (gfc_array_i4 * const restrict retarray,
+ gfc_array_i8 * const restrict array,
+ const index_type * const restrict pdim,
+ GFC_LOGICAL_4 * mask)
+{
+ index_type rank;
+ index_type n;
+ index_type dstride;
+ GFC_INTEGER_4 *dest;
+
+ if (*mask)
+ {
+ minloc1_4_i8 (retarray, array, pdim);
+ 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_4) * 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
OSDN Git Service
