mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-07-04 08:40:21 +02:00
Code Activity

Convert smobs to use scm_allocate_*

Browse source 
* libguile/smob.c (scm_new_smob, scm_new_double_smob): Use
scm_allocate_pointerless, scm_allocate_tagged, or scm_allocate_sloppy,
as appropriate.
This commit is contained in:
Andy Wingo 2025-06-20 13:03:06 +02:00
parent c800496d27
commit d8c1ea4049
1 changed files with 64 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

72
libguile/smob.c
View file

@ -277,17 +277,51 @@ scm_i_finalize_smob (struct scm_thread *thread, SCM smob)
free_smob (smob); free_smob (smob);
} }
struct scm_smob
{
scm_t_bits tag_and_flags;
scm_t_bits data_1;
};
struct scm_double_smob
{
scm_t_bits tag_and_flags;
scm_t_bits data_1;
scm_t_bits data_2;
scm_t_bits data_3;
};
/* Return a SMOB with typecode TC. */ /* Return a SMOB with typecode TC. */
SCM SCM
scm_new_smob (scm_t_bits tc, scm_t_bits data) scm_new_smob (scm_t_bits tc, scm_t_bits data)
{ {
scm_t_bits smobnum = SCM_TC2SMOBNUM (tc); scm_t_bits smobnum = SCM_TC2SMOBNUM (tc);
SCM ret = scm_cell (tc, data); const scm_smob_descriptor* desc = &scm_smobs[smobnum];
scm_thread *thr = SCM_I_CURRENT_THREAD;
struct scm_smob *ret;
size_t sz = sizeof (*ret);
if (SCM_UNLIKELY (scm_smobs[smobnum].free)) if (desc->field_count)
scm_i_add_smob_finalizer (SCM_I_CURRENT_THREAD, ret); {
if (desc->field_count != 1)
abort ();
uint32_t all_fields_unmanaged = -1;
all_fields_unmanaged >>= 32 - desc->field_count;
if (desc->unmanaged_fields == all_fields_unmanaged)
ret = scm_allocate_pointerless (thr, sz);
else
ret = scm_allocate_tagged (thr, sz);
}
else
ret = scm_allocate_sloppy (thr, sz);
return ret; ret->tag_and_flags = tc;
ret->data_1 = data;
if (SCM_UNLIKELY (desc->free))
scm_i_add_smob_finalizer (SCM_I_CURRENT_THREAD, SCM_PACK_POINTER (ret));
return SCM_PACK_POINTER (ret);
} }
/* Return a SMOB with typecode TC. */ /* Return a SMOB with typecode TC. */
@ -296,12 +330,34 @@ scm_new_double_smob (scm_t_bits tc, scm_t_bits data1,
scm_t_bits data2, scm_t_bits data3) scm_t_bits data2, scm_t_bits data3)
{ {
scm_t_bits smobnum = SCM_TC2SMOBNUM (tc); scm_t_bits smobnum = SCM_TC2SMOBNUM (tc);
SCM ret = scm_double_cell (tc, data1, data2, data3); const scm_smob_descriptor* desc = &scm_smobs[smobnum];
scm_thread *thr = SCM_I_CURRENT_THREAD;
struct scm_double_smob *ret;
size_t sz = sizeof (*ret);
if (SCM_UNLIKELY (scm_smobs[smobnum].free)) if (desc->field_count)
scm_i_add_smob_finalizer (SCM_I_CURRENT_THREAD, ret); {
if (!(desc->field_count == 2 || desc->field_count == 3))
abort ();
uint32_t all_fields_unmanaged = -1;
all_fields_unmanaged >>= 32 - desc->field_count;
if (desc->unmanaged_fields == all_fields_unmanaged)
ret = scm_allocate_pointerless (thr, sz);
else
ret = scm_allocate_tagged (thr, sz);
}
else
ret = scm_allocate_sloppy (thr, sz);
return ret; ret->tag_and_flags = tc;
ret->data_1 = data1;
ret->data_2 = data2;
ret->data_3 = data3;
if (SCM_UNLIKELY (desc->free))
scm_i_add_smob_finalizer (SCM_I_CURRENT_THREAD, SCM_PACK_POINTER (ret));
return SCM_PACK_POINTER (ret);
} }