mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-21 20:20:24 +02:00
Code Activity

Fix a couple of SCM_PACK / SCM_UNPACK uncleanlynesses.

Browse source
This commit is contained in:
Dirk Herrmann 2000-03-20 14:00:27 +00:00
parent 1ef20c801b
commit 7a710745b4
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/ChangeLog
View file

@ -1,3 +1,11 @@
2000-03-20 Dirk Herrmann <D.Herrmann@tu-bs.de>
* tags.h (SCM2PTR, PTR2SCM): Use SCM_PACK / SCM_UNPACK correctly.
* numbers.h (SCM_INUMP, SCM_MAKINUM, SCM_INUM0, SCM_COMPLEX_REAL,
SCM_COMPLEX_IMAG, SCM_NUMP, SCM_BDIGITS): Use SCM_PACK /
SCM_UNPACK / SCM2PTR correctly.
2000-03-20 Mikael Djurfeldt <mdj@mdj.nada.kth.se> 2000-03-20 Mikael Djurfeldt <mdj@mdj.nada.kth.se>
* gc.c (adjust_gc_trigger): Improved documentation. * gc.c (adjust_gc_trigger): Improved documentation.

20
libguile/numbers.h
View file

@ -64,16 +64,16 @@
* SCM_INUMP (SCM_CAR (x)) can give wrong answers. * SCM_INUMP (SCM_CAR (x)) can give wrong answers.
*/ */
#define SCM_INUMP(x) (2 & (int)(x)) #define SCM_INUMP(x) (2 & SCM_UNPACK (x))
#define SCM_NINUMP(x) (!SCM_INUMP(x)) #define SCM_NINUMP(x) (!SCM_INUMP (x))
#ifdef __TURBOC__ #ifdef __TURBOC__
/* shifts of more than one are done by a library call, single shifts are /* shifts of more than one are done by a library call, single shifts are
* performed in registers * performed in registers
*/ */
# define SCM_MAKINUM(x) ((SCM) (((SCM_UNPACK(x)<<1)<<1)+2L)) # define SCM_MAKINUM(x) (SCM_PACK (((SCM_UNPACK (x) << 1) << 1) + 2L))
#else #else
# define SCM_MAKINUM(x) ((SCM)((SCM_UNPACK(x)<<2)+2L)) # define SCM_MAKINUM(x) (SCM_PACK ((SCM_UNPACK (x) << 2) + 2L))
#endif /* def __TURBOC__ */ #endif /* def __TURBOC__ */
@ -98,7 +98,7 @@
/* A name for 0. /* A name for 0.
*/ */
#define SCM_INUM0 ((SCM) 2) #define SCM_INUM0 (SCM_PACK (2))
/* SCM_MAXEXP is the maximum double precision expontent /* SCM_MAXEXP is the maximum double precision expontent
@ -185,8 +185,8 @@
#define SCM_CPLXP(x) SCM_COMPLEXP(x) /* Deprecated */ #define SCM_CPLXP(x) SCM_COMPLEXP(x) /* Deprecated */
#define SCM_REAL_VALUE(x) (((scm_double_t *) SCM2PTR (x))->real) #define SCM_REAL_VALUE(x) (((scm_double_t *) SCM2PTR (x))->real)
#define SCM_COMPLEX_REAL(x) (((scm_complex_t *) SCM_CDR (x))->real) #define SCM_COMPLEX_REAL(x) (((scm_complex_t *) SCM2PTR (SCM_CDR (x)))->real)
#define SCM_COMPLEX_IMAG(x) (((scm_complex_t *) SCM_CDR (x))->imag) #define SCM_COMPLEX_IMAG(x) (((scm_complex_t *) SCM2PTR (SCM_CDR (x)))->imag)
#define SCM_REAL(x) \ #define SCM_REAL(x) \
(SCM_SLOPPY_REALP (x) \ (SCM_SLOPPY_REALP (x) \
? SCM_REAL_VALUE (x) \ ? SCM_REAL_VALUE (x) \
@ -239,7 +239,7 @@
# define SCM_NO_BIGDIG # define SCM_NO_BIGDIG
#endif /* ndef SCM_BIGDIG */ #endif /* ndef SCM_BIGDIG */
#define SCM_NUMBERP(x) (SCM_INUMP(x) || (SCM_NIMP(x) && SCM_NUMP(x))) #define SCM_NUMBERP(x) (SCM_INUMP(x) || SCM_NUMP(x))
#ifdef SCM_BIGDIG #ifdef SCM_BIGDIG
#define SCM_NUM2DBL(x) (SCM_INUMP (x) \ #define SCM_NUM2DBL(x) (SCM_INUMP (x) \
? (double) SCM_INUM (x) \ ? (double) SCM_INUM (x) \
@ -252,12 +252,12 @@
: SCM_REALPART (x)) : SCM_REALPART (x))
#endif #endif
#define SCM_NUMP(x) \ #define SCM_NUMP(x) \
(SCM_NIMP(x) && (0xfcff & (int) SCM_CAR(x)) == scm_tc7_smob) (SCM_NIMP(x) && (0xfcff & SCM_UNPACK (SCM_CAR(x))) == scm_tc7_smob)
#define SCM_BIGP(x) SCM_SMOB_PREDICATE (scm_tc16_big, x) #define SCM_BIGP(x) SCM_SMOB_PREDICATE (scm_tc16_big, x)
#define SCM_BIGSIGNFLAG 0x10000L #define SCM_BIGSIGNFLAG 0x10000L
#define SCM_BIGSIZEFIELD 17 #define SCM_BIGSIZEFIELD 17
#define SCM_BIGSIGN(x) (SCM_UNPACK_CAR (x) & SCM_BIGSIGNFLAG) #define SCM_BIGSIGN(x) (SCM_UNPACK_CAR (x) & SCM_BIGSIGNFLAG)
#define SCM_BDIGITS(x) ((SCM_BIGDIG *) (SCM_CDR (x))) #define SCM_BDIGITS(x) ((SCM_BIGDIG *) SCM2PTR (SCM_CDR (x)))
#define SCM_NUMDIGS(x) ((scm_sizet) (SCM_UNPACK_CAR (x) >> SCM_BIGSIZEFIELD)) #define SCM_NUMDIGS(x) ((scm_sizet) (SCM_UNPACK_CAR (x) >> SCM_BIGSIZEFIELD))
#define SCM_SETNUMDIGS(x, v, sign) \ #define SCM_SETNUMDIGS(x, v, sign) \
SCM_SETCAR (x, \ SCM_SETCAR (x, \

8
libguile/tags.h
View file

@ -85,12 +85,12 @@ typedef void * SCM;
* to scm_vector elts, functions, &c are not munged. * to scm_vector elts, functions, &c are not munged.
*/ */
#ifdef _UNICOS #ifdef _UNICOS
# define SCM2PTR(x) ((int) (x) >> 3) # define SCM2PTR(x) ((void *) (SCM_UNPACK (x) >> 3))
# define PTR2SCM(x) (((SCM) (x)) << 3) # define PTR2SCM(x) (SCM_PACK (((scm_bits_t) (x)) << 3))
# define SCM_POINTERS_MUNGED # define SCM_POINTERS_MUNGED
#else #else
# define SCM2PTR(x) (x) # define SCM2PTR(x) ((void *) (SCM_UNPACK (x)))
# define PTR2SCM(x) ((SCM) (x)) # define PTR2SCM(x) (SCM_PACK ((scm_bits_t) (x)))
#endif /* def _UNICOS */ #endif /* def _UNICOS */