*** empty log message ***

diff --git a/NEWS b/NEWS
index c322e3f..d5f4887 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -584,6 +584,20 @@ starting the week.
 
 * Changes to the C interface
 
+** New macros SCM_SMOB_DATA_2, SM_SMOB_DATA_3, etc.
+
+These macros should be used instead of SCM_CELL_WORD_2/3 to access the
+second and third words of double smobs.  Likewise for
+SCM_SET_SMOB_DATA_2 and SCM_SET_SMOB_DATA_3.
+
+Also, there is SCM_SMOB_FLAGS and SCM_SET_SMOB_FLAGS that should be
+used to get and set the 16 exra bits in the zeroth word of a smob.
+
+And finally, there is SCM_SMOB_OBJECT and SCM_SMOB_SET_OBJECT for
+accesing the first immediate word of a smob as a SCM value, and there
+is SCM_SMOB_OBJECT_LOC for getting a pointer to the first immediate
+smob words.  Like wise for SCM_SMOB_OBJECT_2, etc.
+
 ** New way to deal with non-local exits and reentries.
 
 There is a new set of functions that essentially do what

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 4511260..5063eb8 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,35 @@
+2004-05-06  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
+
+       * gc.h (scm_t_cell): Fields are now of type SCM instead of
+       scm_t_bits.  Updated all users.
+       (SCM_GC_CARD_SIZE_MASK): Use SCM_GC_SIZEOF_CARD instead of
+       duplicating the code.
+       (SCM_CELL_OBJECT_LOC): New.
+       (SCM_CARLOC, SCM_CDRLOC): Use it instead of SCM_CELL_WORD_LOC.
+       (SCM_CELL_WORD_LOC): Moved to "deprecated.h".
+
+       * smob.h (SCM_SMOB_DATA_2, SCM_SMOB_DATA_3, SCM_SMOB_FLAGS,
+       SCM_SET_SMOB_DATA_2, SCM_SET_SMOB_DATA_3, SCM_SET_SMOB_FLAGS,
+       SCM_SMOB_OBJECT, SCM_SMOB_OBJECT_2, SCM_SMOB_OBJECT_3,
+       SCM_SET_SMOB_OBJECT, SCM_SET_SMOB_OBJECT_2, SCM_SET_SMOB_OBJECT_3,
+       SCM_SMOB_OBJECT_LOC, SCM_SMOB_OBJECT_2_LOC,
+       SCM_SMOB_OBJECT_3_LOC): New.
+       * smob.c (scm_i_set_smob_flags): New function.
+
+       * dynl.c, dynwind.c, eval.h, fluids.h, futures.h, hashtab.h,
+       hooks.h, keywords.h, macros.h, macros.c, mallocs.c, mallocs.h,
+       random.h, regex-posix.h, root.h, srcprop.h, srcprop.c, threads.h:
+       Use SCM_SMOB_* instead of SCM_CELL_* as appropriate.  Use
+       SCM_SMOB_FLAGS and SCM_SET_SMOB_FLAGS instead of accessing the
+       zeroth word directly.  Use SCM_SMOB_PREDICATE as appropriate.
+
+       * numbers.h (SCM_I_BIG_MPZ): Use SCM_CELL_OBJECT_LOC instead of
+       taking the address of SCM_CELL_WORD_1, the latter being no longer
+       an lvalue.
+
+       * variable.h (SCM_VARIABLE_LOC): Use SCM_CELL_OBJECT_LOC instead
+       of casting SCM_CELL_WORD_LOC.
+
 2004-05-02  Kevin Ryde  <user42@zip.com.au>
 
        * eval.c (scm_macroexp): Add prototype, since it's not in eval.h under