From a38b0a98ed6093ee9ebe4ac60b4b6f9efbdcfdd5 Mon Sep 17 00:00:00 2001 From: Daniel Llorens Date: Mon, 1 Apr 2013 18:43:58 +0200 Subject: [PATCH 2/2] Remove double indirection in element access in array-copy! * libguile/array-map.c: (racp): factor scm_generalized_vector_ref, scm_generalized_vector_set_x out of the rank-1 loop. --- libguile/array-map.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libguile/array-map.c b/libguile/array-map.c index 8c60f34..767e97d 100644 --- a/libguile/array-map.c +++ b/libguile/array-map.c @@ -350,21 +350,24 @@ scm_array_fill_int (SCM ra, SCM fill, SCM ignore SCM_UNUSED) #undef FUNC_NAME - -static int +static int racp (SCM src, SCM dst) { long n = (SCM_I_ARRAY_DIMS (src)->ubnd - SCM_I_ARRAY_DIMS (src)->lbnd + 1); - long inc_d, inc_s = SCM_I_ARRAY_DIMS (src)->inc; - unsigned long i_d, i_s = SCM_I_ARRAY_BASE (src); - dst = SCM_CAR (dst); - inc_d = SCM_I_ARRAY_DIMS (dst)->inc; - i_d = SCM_I_ARRAY_BASE (dst); - src = SCM_I_ARRAY_V (src); - dst = SCM_I_ARRAY_V (dst); + scm_t_array_handle h_s, h_d; + size_t i_s, i_d; + ssize_t inc_s, inc_d; + dst = SCM_CAR(dst); + scm_generalized_vector_get_handle (SCM_I_ARRAY_V (src), &h_s); + scm_generalized_vector_get_handle (SCM_I_ARRAY_V (dst), &h_d); + i_s = h_s.base + h_s.dims[0].lbnd + SCM_I_ARRAY_BASE (src)*h_s.dims[0].inc; + i_d = h_d.base + h_d.dims[0].lbnd + SCM_I_ARRAY_BASE (dst)*h_d.dims[0].inc; + inc_s = SCM_I_ARRAY_DIMS (src)->inc * h_s.dims[0].inc; + inc_d = SCM_I_ARRAY_DIMS (dst)->inc * h_d.dims[0].inc; for (; n-- > 0; i_s += inc_s, i_d += inc_d) - GVSET (dst, i_d, GVREF (src, i_s)); + h_d.impl->vset (&h_d, i_d, h_s.impl->vref (&h_s, i_s)); + return 1; } -- 1.8.2