1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00

* stacks.c, stacks.h, struct.c, tags.h, unif.c (scm_bits_t):

Renamed from SCMWORD.
This commit is contained in:
Mikael Djurfeldt 2000-03-12 17:52:18 +00:00
parent 0bc908e7c4
commit 4d45e7b69a
5 changed files with 9 additions and 9 deletions

View file

@ -188,7 +188,7 @@ stack_depth (scm_debug_frame *dframe,long offset,SCM *id,int *maxp)
static void static void
read_frame (scm_debug_frame *dframe,long offset,scm_info_frame *iframe) read_frame (scm_debug_frame *dframe,long offset,scm_info_frame *iframe)
{ {
SCMWORD flags = SCM_BITS (SCM_INUM0); /* UGh. */ scm_bits_t flags = SCM_BITS (SCM_INUM0); /* UGh. */
int size; int size;
scm_debug_info *info; scm_debug_info *info;
if (SCM_EVALFRAMEP (*dframe)) if (SCM_EVALFRAMEP (*dframe))

View file

@ -57,7 +57,7 @@
typedef struct scm_info_frame { typedef struct scm_info_frame {
//SCM flags; //SCM flags;
SCMWORD flags; scm_bits_t flags;
SCM source; SCM source;
SCM proc; SCM proc;
SCM args; SCM args;

View file

@ -326,7 +326,7 @@ scm_alloc_struct (int n_words, int n_extra, char *who)
SCM *p = block + n_extra; SCM *p = block + n_extra;
/* Adjust it even further so it's aligned on an eight-byte boundary. */ /* Adjust it even further so it's aligned on an eight-byte boundary. */
p = (SCM *) (((SCMWORD) SCM_BITS (p) + 7) & ~7); p = (SCM *) (((scm_bits_t) SCM_BITS (p) + 7) & ~7);
/* Initialize a few fields as described above. */ /* Initialize a few fields as described above. */
p[scm_struct_i_free] = (SCM) scm_struct_free_standard; p[scm_struct_i_free] = (SCM) scm_struct_free_standard;
@ -522,7 +522,7 @@ SCM_DEFINE (scm_struct_ref, "struct-ref", 2, 0, 0,
SCM * data; SCM * data;
SCM layout; SCM layout;
int p; int p;
SCMWORD n_fields; scm_bits_t n_fields;
unsigned char * fields_desc; unsigned char * fields_desc;
unsigned char field_type = 0; unsigned char field_type = 0;

View file

@ -57,19 +57,19 @@
/* In the beginning was the Word: /* In the beginning was the Word:
*/ */
typedef long SCMWORD; typedef long scm_bits_t;
/* /*
But as external interface, we use void*, which will be checked more strictly for But as external interface, we use void*, which will be checked more strictly for
dubious conversions. dubious conversions.
*/ */
#define SCM_VOIDP_TEST #define SCM_VOIDP_TEST
#ifndef SCM_VOIDP_TEST #ifndef SCM_VOIDP_TEST
typedef SCMWORD SCM; typedef scm_bits_t SCM;
#define SCM_BITS(x) (x) #define SCM_BITS(x) (x)
#define SCM_SCM(x) (x) #define SCM_SCM(x) (x)
#else #else
typedef void * SCM; typedef void * SCM;
#define SCM_BITS(x) ((SCMWORD) (x)) #define SCM_BITS(x) ((scm_bits_t) (x))
#define SCM_SCM(x) ((SCM) (x)) #define SCM_SCM(x) ((SCM) (x))
#endif #endif
@ -303,7 +303,7 @@ typedef void * SCM;
#define SCM_CELLP(x) (!SCM_NCELLP (x)) #define SCM_CELLP(x) (!SCM_NCELLP (x))
#define SCM_NCELLP(x) ((sizeof (scm_cell) - 1) & (SCMWORD) SCM_BITS (x)) #define SCM_NCELLP(x) ((sizeof (scm_cell) - 1) & SCM_BITS (x))
/* See numbers.h for macros relating to immediate integers. /* See numbers.h for macros relating to immediate integers.
*/ */

View file

@ -2466,7 +2466,7 @@ tail:
scm_putc ('*', port); scm_putc ('*', port);
for (i = 0; i < (SCM_LENGTH (exp)) / SCM_LONG_BIT; i++) for (i = 0; i < (SCM_LENGTH (exp)) / SCM_LONG_BIT; i++)
{ {
SCMWORD w = SCM_BITS (SCM_VELTS (exp)[i]); scm_bits_t w = SCM_BITS (SCM_VELTS (exp)[i]);
for (j = SCM_LONG_BIT; j; j--) for (j = SCM_LONG_BIT; j; j--)
{ {
scm_putc (w & 1 ? '1' : '0', port); scm_putc (w & 1 ? '1' : '0', port);