diff options
author | Andy Wingo <wingo@pobox.com> | 2011-10-24 17:58:22 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-10-24 18:54:04 +0200 |
commit | 21041372ed4a3c837f6d16149648508d49b4b2e2 (patch) | |
tree | 77121f605195cc7effb3874c6df583bf9df5dc55 /libguile/weak-vector.c | |
parent | dc7da0be90d6033d512f9772894179970af678e7 (diff) | |
download | guile-21041372ed4a3c837f6d16149648508d49b4b2e2.tar.gz |
add SCM_{PACK,UNPACK}_POINTER
* libguile/tags.h (SCM_UNPACK_POINTER, SCM_PACK_POINTER): New macros.
The old SCM2PTR and PTR2SCM were defined in such a way that
round-tripping through a pointer could lose precision, even in the
case in which you weren't interested in actually dereferencing the
pointer, it was simply that you needed to plumb a SCM through APIs
that take pointers. These new macros are more like SCM_PACK and
SCM_UNPACK, but for pointer types. The bit representation of the
pointer should be the same as the scm_t_bits representation.
* libguile/gc.h (PTR2SCM, SCM2PTR): Remove support for (old) UNICOS
pointers. We are going to try tagging the SCM object itself in the
future, and I don't think that keeping this support is worth its
cost. It probably doesn't work anyway.
* libguile/backtrace.c:
* libguile/bytevectors.c:
* libguile/continuations.c:
* libguile/fluids.c:
* libguile/foreign.c:
* libguile/gc.h:
* libguile/guardians.c:
* libguile/hashtab.c:
* libguile/load.c:
* libguile/numbers.c:
* libguile/ports.c:
* libguile/smob.c:
* libguile/strings.c:
* libguile/symbols.c:
* libguile/vm.c:
* libguile/weak-set.c:
* libguile/weak-table.c:
* libguile/weak-vector.c: Update many sites to use the new macros.
Diffstat (limited to 'libguile/weak-vector.c')
-rw-r--r-- | libguile/weak-vector.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c index a42166bf5..c76ec580a 100644 --- a/libguile/weak-vector.c +++ b/libguile/weak-vector.c @@ -48,7 +48,7 @@ make_weak_vector (size_t len, SCM fill) if (SCM_UNBNDP (fill)) fill = SCM_UNSPECIFIED; - wv = PTR2SCM (scm_gc_malloc_pointerless ((len + 1) * sizeof (SCM), + wv = SCM_PACK_POINTER (scm_gc_malloc_pointerless ((len + 1) * sizeof (SCM), "weak vector")); SCM_SET_CELL_WORD_0 (wv, (len << 8) | scm_tc7_wvect); @@ -147,7 +147,7 @@ scm_c_weak_vector_ref (SCM wv, size_t k) ret = GC_call_with_alloc_lock (weak_vector_ref, &d); if (ret) - return PTR2SCM (ret); + return SCM_PACK_POINTER (ret); else return SCM_BOOL_F; } |