diff options
| author | Andy Wingo <wingo@pobox.com> | 2017-09-07 16:55:30 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2017-09-14 09:44:33 +0200 |
| commit | 7e91ff651b3c9f7c27f2be146ea611bab65809a8 (patch) | |
| tree | 09e2c37c935bf20f3883721d55708529b7e9eebd /libguile/modules.c | |
| parent | 48989599016c218da68899aee2af8264df98e34c (diff) | |
| download | guile-7e91ff651b3c9f7c27f2be146ea611bab65809a8.tar.gz | |
Remove indirection in structs
* libguile/gc.c (scm_storage_prehistory): Register struct displacement
here.
* libguile/goops.c (scm_sys_modify_instance): Fix the format of a
comment.
* libguile/modules.c (scm_post_boot_init_modules): Update for new format
of struct vtable references.
* libguile/struct.c (scm_i_alloc_struct): Update to include slots
directly, instead of being indirected by an embedded pointer.
(scm_c_make_structv, scm_allocate_struct, scm_i_make_vtable_vtable):
Adapt to pass vtable bits as argument to scm_i_alloc_struct, not
vtable data bits.
(scm_init_struct): Remove two-word displacement from libgc.
* libguile/struct.h: Update comment.
(SCM_STRUCT_SLOTS, SCM_STRUCT_DATA): Update definitions.
(SCM_STRUCT_VTABLE_DATA, SCM_STRUCT_VTABLE_SLOTS): Remove.
(SCM_STRUCT_VTABLE, SCM_STRUCT_LAYOUT, SCM_STRUCT_PRINTER)
(SCM_STRUCT_FINALIZER, SCM_STRUCT_VTABLE_FLAGS)
(SCM_STRUCT_VTABLE_FLAG_IS_SET): Simplify definitions.
* module/system/base/types.scm (cell->object, address->inferior-struct):
Adapt to struct representation change.
Diffstat (limited to 'libguile/modules.c')
| -rw-r--r-- | libguile/modules.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/modules.c b/libguile/modules.c index d87ec7a64..b469a1a64 100644 --- a/libguile/modules.c +++ b/libguile/modules.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998,2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012 Free Software Foundation, Inc. +/* Copyright (C) 1998,2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2017 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -875,7 +875,7 @@ static void scm_post_boot_init_modules () { SCM module_type = SCM_VARIABLE_REF (scm_c_lookup ("module-type")); - scm_module_tag = (SCM_CELL_WORD_1 (module_type) + scm_tc3_struct); + scm_module_tag = SCM_UNPACK (module_type) + scm_tc3_struct; resolve_module_var = scm_c_lookup ("resolve-module"); define_module_star_var = scm_c_lookup ("define-module*"); |