mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 22:10:21 +02:00
Code Activity

* struct.c (scm_make_struct_layout, init_struct, scm_struct_ref,

Browse source 
scm_struct_set_x), struct.h, gc.c (scm_gc_mark): Completed Tom
Lord's implementation of structs, allowing for tail arrays as
described in the manual. Also fixed some bugs. (Both the interface
and the implementation should be improved.)
This commit is contained in:
Mikael Djurfeldt 1996-09-22 22:33:09 +00:00
parent ec98b5046c
commit ad75306c4f
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libguile/gc.c
View file

@ -495,8 +495,8 @@ gc_mark_nimp:
SCM * vtable_data;
int len;
char * fields_desc;
SCM * mem;
int x;
register SCM * mem;
register int x;
vtable_data = (SCM *)vcell;
layout = vtable_data[scm_struct_i_layout];
@ -504,9 +504,20 @@ gc_mark_nimp:
fields_desc = SCM_CHARS (layout);
mem = (SCM *)SCM_GCCDR (ptr); /* like struct_data but removes mark */
for (x = 0; x < len; x += 2)
if (fields_desc[x] == 'p')
scm_gc_mark (mem[x / 2]);
if (len)
{
for (x = 0; x < len - 2; x += 2, ++mem)
if (fields_desc[x] == 'p')
scm_gc_mark (*mem);
if (fields_desc[x] == 'p')
{
if (SCM_LAYOUT_TAILP (fields_desc[x + 1]))
for (x = *mem; x; --x)
scm_gc_mark (*++mem);
else
scm_gc_mark (*mem);
}
}
if (!SCM_CDR (vcell))
{
SCM_SETGCMARK (vcell);
@ -941,8 +952,8 @@ scm_gc_sweep ()
SCM * mem;
SCM amt;
mem = (SCM *)SCM_CDR (scmptr);
amt = mem[-2];
free (mem - 2);
amt = mem[- scm_struct_n_extra_words];
free (mem - scm_struct_n_extra_words);
m += amt * sizeof (SCM);
}
}