mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Remove double indirection in array-map! with <2 args

Browse source 
* libguile/array-map.c: (ramap): factor GVSET/GVREF out of rank-1 loop
  for ra0 and the first element of ras.
This commit is contained in:
Daniel Llorens 2013-04-02 15:53:22 +02:00 • committed by Ludovic Courtès
parent 9a68d7b388
commit 51a1763f65
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libguile/array-map.c
View file

@ -644,25 +644,31 @@ static int
ramap (SCM ra0, SCM proc, SCM ras) ramap (SCM ra0, SCM proc, SCM ras)
{ {
ssize_t i = SCM_I_ARRAY_DIMS (ra0)->lbnd; ssize_t i = SCM_I_ARRAY_DIMS (ra0)->lbnd;
size_t n = SCM_I_ARRAY_DIMS (ra0)->ubnd - i + 1;
size_t i0 = SCM_I_ARRAY_BASE (ra0); scm_t_array_handle h0;
ssize_t inc0 = SCM_I_ARRAY_DIMS (ra0)->inc; size_t i0, i0end;
size_t n = SCM_I_ARRAY_DIMS (ra0)->ubnd - SCM_I_ARRAY_DIMS (ra0)->lbnd + 1; ssize_t inc0;
size_t i0end = i0 + n*inc0; scm_generalized_vector_get_handle (SCM_I_ARRAY_V (ra0), &h0);
ra0 = SCM_I_ARRAY_V (ra0); i0 = h0.base + h0.dims[0].lbnd + SCM_I_ARRAY_BASE (ra0)*h0.dims[0].inc;
inc0 = SCM_I_ARRAY_DIMS (ra0)->inc * h0.dims[0].inc;
i0end = i0 + n*inc0;
if (scm_is_null (ras)) if (scm_is_null (ras))
for (; i0 < i0end; i0 += inc0) for (; i0 < i0end; i0 += inc0)
GVSET (ra0, i0, scm_call_0 (proc)); h0.impl->vset (&h0, i0, scm_call_0 (proc));
else else
{ {
SCM ra1 = SCM_CAR (ras); SCM ra1 = SCM_CAR (ras);
size_t i1 = SCM_I_ARRAY_BASE (ra1); scm_t_array_handle h1;
ssize_t inc1 = SCM_I_ARRAY_DIMS (ra1)->inc; size_t i1;
ra1 = SCM_I_ARRAY_V (ra1); ssize_t inc1;
scm_generalized_vector_get_handle (SCM_I_ARRAY_V (ra1), &h1);
i1 = h1.base + h1.dims[0].lbnd + SCM_I_ARRAY_BASE (ra1)*h1.dims[0].inc;
inc1 = SCM_I_ARRAY_DIMS (ra1)->inc * h1.dims[0].inc;
ras = SCM_CDR (ras); ras = SCM_CDR (ras);
if (scm_is_null(ras)) if (scm_is_null (ras))
for (; i0 < i0end; i0 += inc0, i1 += inc1) for (; i0 < i0end; i0 += inc0, i1 += inc1)
GVSET (ra0, i0, scm_call_1 (proc, GVREF (ra1, i1))); h0.impl->vset (&h0, i0, scm_call_1 (proc, h1.impl->vref (&h1, i1)));
else else
{ {
ras = scm_vector (ras); ras = scm_vector (ras);
@ -672,10 +678,12 @@ ramap (SCM ra0, SCM proc, SCM ras)
unsigned long k; unsigned long k;
for (k = scm_c_vector_length (ras); k--;) for (k = scm_c_vector_length (ras); k--;)
args = scm_cons (GVREF (scm_c_vector_ref (ras, k), i), args); args = scm_cons (GVREF (scm_c_vector_ref (ras, k), i), args);
GVSET (ra0, i0, scm_apply_1 (proc, GVREF (ra1, i1), args)); h0.impl->vset (&h0, i0, scm_apply_1 (proc, h1.impl->vref (&h1, i1), args));
} }
} }
scm_array_handle_release (&h1);
} }
scm_array_handle_release (&h0);
return 1; return 1;
} }