From 92ecf4b1724ef2db958cf9b513822e6c62c95536 Mon Sep 17 00:00:00 2001 From: Daniel Llorens Date: Tue, 2 Apr 2013 15:53:22 +0200 Subject: [PATCH 6/6] Remove double indirection in array-map! with <2 args * libguile/array-map.c: (ramap): factor GVSET/GVREF out of rank-1 loop for ra0 and the first element of ras. --- libguile/array-map.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/libguile/array-map.c b/libguile/array-map.c index 079e3b1..7d5b19f 100644 --- a/libguile/array-map.c +++ b/libguile/array-map.c @@ -391,25 +391,31 @@ static int ramap (SCM ra0, SCM proc, SCM ras) { ssize_t i = SCM_I_ARRAY_DIMS (ra0)->lbnd; - - size_t i0 = SCM_I_ARRAY_BASE (ra0); - ssize_t inc0 = SCM_I_ARRAY_DIMS (ra0)->inc; - size_t n = SCM_I_ARRAY_DIMS (ra0)->ubnd - SCM_I_ARRAY_DIMS (ra0)->lbnd + 1; - size_t i0end = i0 + n*inc0; - ra0 = SCM_I_ARRAY_V (ra0); + size_t n = SCM_I_ARRAY_DIMS (ra0)->ubnd - i + 1; + + scm_t_array_handle h0; + size_t i0, i0end; + ssize_t inc0; + scm_generalized_vector_get_handle (SCM_I_ARRAY_V (ra0), &h0); + 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)) for (; i0 < i0end; i0 += inc0) - GVSET (ra0, i0, scm_call_0 (proc)); + h0.impl->vset (&h0, i0, scm_call_0 (proc)); else { SCM ra1 = SCM_CAR (ras); - size_t i1 = SCM_I_ARRAY_BASE (ra1); - ssize_t inc1 = SCM_I_ARRAY_DIMS (ra1)->inc; - ra1 = SCM_I_ARRAY_V (ra1); + scm_t_array_handle h1; + size_t i1; + 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); - if (scm_is_null(ras)) + if (scm_is_null (ras)) 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 { ras = scm_vector (ras); @@ -419,7 +425,7 @@ ramap (SCM ra0, SCM proc, SCM ras) unsigned long k; for (k = scm_c_vector_length (ras); k--;) 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)); } } } -- 1.7.9.5