diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-11-02 00:55:17 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-11-02 00:55:17 +0100 |
commit | ed7e0765c48bbf6d028d9eefd15a3dedb53c92ec (patch) | |
tree | 111aaa890392f97b1ff8887b8aeb99a6fb8341e8 /libguile/vectors.h | |
parent | 88cbb421895656c6d255610e32c2ae1addb2ea07 (diff) | |
download | guile-ed7e0765c48bbf6d028d9eefd15a3dedb53c92ec.tar.gz |
Allocate vectors in a contiguous memory area.
* libguile/vectors.c (scm_c_make_vector): Allocate the whole vector and
header with `scm_gc_malloc ()'.
(scm_vector_copy): Use `scm_c_make_vector ()'.
(scm_i_vector_free, MAKE_WEAK_VECTOR): Remove.
(allocate_weak_vector): Rename to...
(make_weak_vector): ... this. Change to return the whole weak vector,
allocated with `scm_gc_malloc_pointerless ()'.
(scm_i_make_weak_vector, scm_i_make_weak_vector_from_list): Use
`make_weak_vector ()'.
* libguile/vectors.h (SCM_I_VECTOR_HEADER_SIZE): New macro.
(SCM_I_VECTOR_ELTS): Write in terms of `SCM_I_VECTOR_WELTS ()'.
(SCM_I_VECTOR_WELTS): Update to the new representation.
(SCM_I_WVECT_EXTRA, SCM_I_SET_WVECT_EXTRA): Likewise.
(SCM_I_WVECT_GC_CHAIN, SCM_I_SET_WVECT_GC_CHAIN): Remove.
* libguile/weaks.h (SCM_I_WVECT_DELTA, SCM_I_SET_WVECT_DELTA): Remove.
Diffstat (limited to 'libguile/vectors.h')
-rw-r--r-- | libguile/vectors.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libguile/vectors.h b/libguile/vectors.h index 0e2cb6e8f..a74c8a980 100644 --- a/libguile/vectors.h +++ b/libguile/vectors.h @@ -3,7 +3,7 @@ #ifndef SCM_VECTORS_H #define SCM_VECTORS_H -/* Copyright (C) 1995,1996,1998,2000,2001,2002,2004,2005, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,2000,2001,2002,2004,2005, 2006, 2008, 2009 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -61,29 +61,30 @@ SCM_API SCM *scm_vector_writable_elements (SCM vec, #define SCM_SIMPLE_VECTOR_REF(x,idx) ((SCM_I_VECTOR_ELTS(x))[idx]) #define SCM_SIMPLE_VECTOR_SET(x,idx,val) ((SCM_I_VECTOR_WELTS(x))[idx]=(val)) + /* Internals */ +/* Vectors have a 2-word header: 1 for the type tag, and 1 for the weak + vector extra data (see below.) */ +#define SCM_I_VECTOR_HEADER_SIZE 2U + #define SCM_I_IS_VECTOR(x) (!SCM_IMP(x) && (SCM_TYP7S(x)==scm_tc7_vector)) -#define SCM_I_VECTOR_ELTS(x) ((const SCM *) SCM_CELL_WORD_1 (x)) -#define SCM_I_VECTOR_WELTS(x) ((SCM *) SCM_CELL_WORD_1 (x)) +#define SCM_I_VECTOR_ELTS(x) ((const SCM *) SCM_I_VECTOR_WELTS (x)) +#define SCM_I_VECTOR_WELTS(x) (SCM_CELL_OBJECT_LOC (x, SCM_I_VECTOR_HEADER_SIZE)) #define SCM_I_VECTOR_LENGTH(x) (((size_t) SCM_CELL_WORD_0 (x)) >> 8) -SCM_INTERNAL void scm_i_vector_free (SCM vec); SCM_INTERNAL SCM scm_i_vector_equal_p (SCM x, SCM y); /* Weak vectors share implementation details with ordinary vectors, - but no one else should. - */ + but no one else should. */ #define SCM_I_WVECTP(x) (!SCM_IMP (x) && \ SCM_TYP7 (x) == scm_tc7_wvect) #define SCM_I_WVECT_LENGTH SCM_I_VECTOR_LENGTH #define SCM_I_WVECT_VELTS SCM_I_VECTOR_ELTS #define SCM_I_WVECT_GC_WVELTS SCM_I_VECTOR_WELTS -#define SCM_I_WVECT_EXTRA(x) (SCM_CELL_WORD_2 (x)) -#define SCM_I_SET_WVECT_EXTRA(x, t) (SCM_SET_CELL_WORD_2 ((x),(t))) -#define SCM_I_WVECT_GC_CHAIN(x) (SCM_CELL_OBJECT_3 (x)) -#define SCM_I_SET_WVECT_GC_CHAIN(x, o) (SCM_SET_CELL_OBJECT_3 ((x), (o))) +#define SCM_I_WVECT_EXTRA(x) (SCM_CELL_WORD_1 (x)) +#define SCM_I_SET_WVECT_EXTRA(x, t) (SCM_SET_CELL_WORD_1 ((x),(t))) SCM_INTERNAL SCM scm_i_make_weak_vector (scm_t_bits type, SCM size, SCM fill); SCM_INTERNAL SCM scm_i_make_weak_vector_from_list (scm_t_bits type, SCM lst); |