diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-04-17 16:25:11 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-04-17 16:25:11 +0000 |
commit | c8045e8dbd43ac5f346346a1a8ce6f619e2629bc (patch) | |
tree | 0e58ad2458fe58c721d6c07d5c890cfba8a66da3 /libguile/struct.h | |
parent | b0c545678a42b61318a2eefed504c19aee0a7bd9 (diff) | |
download | guile-c8045e8dbd43ac5f346346a1a8ce6f619e2629bc.tar.gz |
* struct.c, struct.h: Struct data regions (and thus also vtable data regions)
are now C arrays of scm_bits_t elements.
* gc.c: Made the mixup of glocs and structs explicit.
Diffstat (limited to 'libguile/struct.h')
-rw-r--r-- | libguile/struct.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libguile/struct.h b/libguile/struct.h index 1e81acd29..a2c3edbfb 100644 --- a/libguile/struct.h +++ b/libguile/struct.h @@ -70,16 +70,17 @@ #define scm_vtable_index_printer 3 /* A printer for this struct type. */ #define scm_vtable_offset_user 4 /* Where do user fields start? */ -typedef scm_sizet (*scm_struct_free_t) (SCM *vtable, SCM *data); +typedef scm_sizet (*scm_struct_free_t) (scm_bits_t * vtable, scm_bits_t * data); #define SCM_STRUCTF_MASK (0xFFF << 20) #define SCM_STRUCTF_ENTITY (1L << 30) /* Indicates presence of proc slots */ #define SCM_STRUCTF_LIGHT (1L << 31) /* Light representation (no hidden words) */ +/* Dirk:FIXME:: the SCM_STRUCTP predicate is also fulfilled for glocs */ #define SCM_STRUCTP(X) (SCM_NIMP(X) && (SCM_TYP3(X) == scm_tc3_cons_gloc)) #define SCM_STRUCT_DATA(X) ((scm_bits_t *) SCM_CELL_WORD_1 (X)) -#define SCM_STRUCT_VTABLE_DATA(X) ((scm_bits_t *) (SCM_CELL_WORD_0 (X) - 1)) +#define SCM_STRUCT_VTABLE_DATA(X) ((scm_bits_t *) (SCM_CELL_WORD_0 (X) - scm_tc3_cons_gloc)) #define SCM_STRUCT_LAYOUT(X) (SCM_PACK (SCM_STRUCT_VTABLE_DATA (X) [scm_vtable_index_layout])) #define SCM_SET_STRUCT_LAYOUT(X, v) (SCM_STRUCT_VTABLE_DATA (X) [scm_vtable_index_layout] = SCM_UNPACK (v)) @@ -98,13 +99,11 @@ extern SCM scm_struct_table; -extern SCM *scm_alloc_struct (int n_words, - int n_extra, - char *who); -extern scm_sizet scm_struct_free_0 (SCM *vtable, SCM *data); -extern scm_sizet scm_struct_free_light (SCM *vtable, SCM *data); -extern scm_sizet scm_struct_free_standard (SCM *vtable, SCM *data); -extern scm_sizet scm_struct_free_entity (SCM *vtable, SCM *data); +extern scm_bits_t * scm_alloc_struct (int n_words, int n_extra, char * who); +extern scm_sizet scm_struct_free_0 (scm_bits_t * vtable, scm_bits_t * data); +extern scm_sizet scm_struct_free_light (scm_bits_t * vtable, scm_bits_t * data); +extern scm_sizet scm_struct_free_standard (scm_bits_t * vtable, scm_bits_t * data); +extern scm_sizet scm_struct_free_entity (scm_bits_t * vtable, scm_bits_t * data); extern void scm_struct_init (SCM handle, int tail_elts, SCM inits); extern SCM scm_make_struct_layout (SCM fields); extern SCM scm_struct_p (SCM x); |