diff options
author | Greg J. Badros <gjb@cs.washington.edu> | 2000-03-09 18:58:58 +0000 |
---|---|---|
committer | Greg J. Badros <gjb@cs.washington.edu> | 2000-03-09 18:58:58 +0000 |
commit | c209c88e54d08a557a297836200e16e20355df02 (patch) | |
tree | dce0d672bc0a63be5f658c65269c9a4144da1c67 /libguile/stacks.h | |
parent | df8bb2dc3988d24c0f64bd2cc5fa01a31825d11a (diff) | |
download | guile-c209c88e54d08a557a297836200e16e20355df02.tar.gz |
*.[ch]: make a distinction between SCM as a generic
name for a Scheme object (now a void*), and SCM as 32 bit word for
storing tags and immediates (now a long int). Introduced
SCM_ASWORD and SCM_ASSCM for conversion. Fixed various dubious
code in the process: arbiter.c (use macros), unif.c (scm_array_p),
Diffstat (limited to 'libguile/stacks.h')
-rw-r--r-- | libguile/stacks.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libguile/stacks.h b/libguile/stacks.h index d571584fe..c20671084 100644 --- a/libguile/stacks.h +++ b/libguile/stacks.h @@ -56,7 +56,8 @@ */ typedef struct scm_info_frame { - SCM flags; + //SCM flags; + SCMWORD flags; SCM source; SCM proc; SCM args; @@ -107,11 +108,11 @@ extern SCM scm_stack_type; #define SCM_FRAMEF_EVAL_ARGS (1L << 5) #define SCM_FRAMEF_OVERFLOW (1L << 6) -#define SCM_FRAME_VOID_P(frame) (SCM_FRAME_FLAGS (frame) & SCM_FRAMEF_VOID) -#define SCM_FRAME_REAL_P(frame) (SCM_FRAME_FLAGS (frame) & SCM_FRAMEF_REAL) -#define SCM_FRAME_PROC_P(frame) (SCM_FRAME_FLAGS (frame) & SCM_FRAMEF_PROC) -#define SCM_FRAME_EVAL_ARGS_P(frame) (SCM_FRAME_FLAGS (frame) & SCM_FRAMEF_EVAL_ARGS) -#define SCM_FRAME_OVERFLOW_P(frame) (SCM_FRAME_FLAGS (frame) & SCM_FRAMEF_OVERFLOW) +#define SCM_FRAME_VOID_P(frame) (SCM_ASWORD (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_VOID) +#define SCM_FRAME_REAL_P(frame) (SCM_ASWORD (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_REAL) +#define SCM_FRAME_PROC_P(frame) (SCM_ASWORD (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_PROC) +#define SCM_FRAME_EVAL_ARGS_P(frame) (SCM_ASWORD (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_EVAL_ARGS) +#define SCM_FRAME_OVERFLOW_P(frame) (SCM_ASWORD (SCM_FRAME_FLAGS (frame)) & SCM_FRAMEF_OVERFLOW) |