diff options
| author | Andy Wingo <wingo@pobox.com> | 2010-01-18 11:42:35 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2010-01-26 22:56:41 +0100 |
| commit | 52fd9639fdeee068434342e1bdb8693b05ecac5c (patch) | |
| tree | 9d8ab132c65a07ce2c2b102ae66682df5085d977 /libguile/gsubr.c | |
| parent | 75c242a256c273ab0690397df4277d44f01946e6 (diff) | |
| download | guile-52fd9639fdeee068434342e1bdb8693b05ecac5c.tar.gz | |
foreign.h presents a more pointer-centric interface
* libguile/foreign.c:
* libguile/foreign.h: Rework interface to be more pointer-centric.
Details are:
(SCM_FOREIGN_TYPE_STRUCT, SCM_FOREIGN_TYPE_POINTER): Removed; now the
pointer in a foreign is first-class. If it points to a native type
like uint32, then it still has a tag; but if it points to something
else, like a struct or a pointer or something, then its type is VOID
(i.e., void*).
(SCM_FOREIGN_POINTER): Rename from SCM_FOREIGN_OBJECT.
(SCM_FOREIGN_VALUE_REF, SCM_FOREIGN_VALUE_SET): Rename from
SCM_FOREIGN_OBJECT_REF and SCM_FOREIGN_OBJECT_SET, to indicate that
they only work with value types.
(SCM_FOREIGN_HAS_FINALIZER): Reserve a bit to indicate if the foreign
pointer in question has a finalizer registered.
(SCM_FOREIGN_LEN): For void* pointers, optionally store the length in
bytes of the associated memory region.
(SCM_FOREIGN_VALUE_P): Rename from SCM_FOREIGN_SIMPLE_P.
(SCM_VALIDATE_FOREIGN_VALUE): Rename from SCM_VALIDATE_FOREIGN_SIMPLE.
(scm_take_foreign_pointer): Rename from scm_c_take_foreign. Remove
scm_c_from_foreign.
(scm_foreign_type): New accessor.
(scm_foreign_ref, scm_foreign_set_x): Take some optional args, used
when dereferencing void pointers.
* libguile/dynl.h:
* libguile/dynl.c (scm_dynamic_pointer): New function, used by
scm_dynamic_func. Adapt code to foreign.h changes.
* libguile/goops.c (scm_enable_primitive_generic_x)
(scm_set_primitive_generic_x): Use the SCM_SET_SUBR_GENERIC macro.
* libguile/gsubr.c (create_gsubr): Adapt to API change.
* libguile/gsubr.h (SCM_SUBRF, SCM_SUBR_GENERIC): Store the pointer
directly, not indirected.
* libguile/snarf.h (SCM_DEFINE, SCM_IMMUTABLE_FOREIGN): Store subr
pointers directly. Adapt to SCM_FOREIGN_TYPE_VOID change.
* libguile/vm-i-system.c (subr-call): Access the void* directly.
Diffstat (limited to 'libguile/gsubr.c')
| -rw-r--r-- | libguile/gsubr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/gsubr.c b/libguile/gsubr.c index f0c622290..de4bff69f 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -794,13 +794,13 @@ create_gsubr (int define, const char *name, sname = scm_from_locale_symbol (name); table = scm_c_make_vector (generic_loc ? 3 : 2, SCM_UNDEFINED); SCM_SIMPLE_VECTOR_SET (table, 0, - scm_c_from_foreign (SCM_FOREIGN_TYPE_POINTER, - &fcn, 0, NULL)); + scm_take_foreign_pointer (SCM_FOREIGN_TYPE_VOID, + fcn, 0, NULL)); SCM_SIMPLE_VECTOR_SET (table, 1, sname); if (generic_loc) SCM_SIMPLE_VECTOR_SET (table, 2, - scm_c_from_foreign (SCM_FOREIGN_TYPE_POINTER, - &generic_loc, 0, NULL)); + scm_take_foreign_pointer (SCM_FOREIGN_TYPE_VOID, + generic_loc, 0, NULL)); /* make program */ ret = scm_make_program (scm_subr_objcode_trampoline (nreq, nopt, rest), |