diff options
author | Andy Wingo <wingo@pobox.com> | 2011-01-27 12:44:53 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-01-27 13:08:01 +0100 |
commit | f9654187b1ff0e20dfcb66da963eae62f4d03be1 (patch) | |
tree | e3ec8181255b693e5997d255599d27a537c9e096 /libguile/objcodes.h | |
parent | 9805ffdaf770f7129db31213f1d9319eaa98a84e (diff) | |
download | guile-f9654187b1ff0e20dfcb66da963eae62f4d03be1.tar.gz |
objcode type is an enumeration, not flags
* libguile/objcodes.h (SCM_OBJCODE_TYPE_MMAP)
(SCM_OBJCODE_TYPE_BYTEVECTOR, SCM_OBJCODE_TYPE_SLICE)
(SCM_OBJCODE_TYPE_STATIC): Enumerate objcode types instead of
expressing them as flags.
(SCM_OBJCODE_TYPE): Type is held in bits 8-15.
(SCM_OBJCODE_FLAGS): Flags are now shifted by 16 bits, not 8.
(SCM_MAKE_OBJCODE_TAG): New helper.
* libguile/continuations.c (STATIC_OBJCODE_TAG):
* libguile/control.c (STATIC_OBJCODE_TAG):
* libguile/foreign.c (STATIC_OBJCODE_TAG):
* libguile/gsubr.c (STATIC_OBJCODE_TAG):
* libguile/smob.c (STATIC_OBJCODE_TAG):
* libguile/objcodes.c (make_objcode_by_mmap, scm_c_make_objcode_slice)
(scm_bytecode_to_objcode): : Use SCM_MAKE_OBJCODE_TAG.
Diffstat (limited to 'libguile/objcodes.h')
-rw-r--r-- | libguile/objcodes.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libguile/objcodes.h b/libguile/objcodes.h index 2bff9aae2..36f3ea902 100644 --- a/libguile/objcodes.h +++ b/libguile/objcodes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2009, 2010, 2011 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 @@ -35,10 +35,10 @@ struct scm_objcode #define SCM_C_OBJCODE_BASE(obj) \ ((scm_t_uint8 *)(obj) + sizeof (struct scm_objcode)) -#define SCM_F_OBJCODE_IS_MMAP (1<<0) -#define SCM_F_OBJCODE_IS_BYTEVECTOR (1<<1) -#define SCM_F_OBJCODE_IS_SLICE (1<<2) -#define SCM_F_OBJCODE_IS_STATIC (1<<3) +#define SCM_OBJCODE_TYPE_MMAP (0) +#define SCM_OBJCODE_TYPE_BYTEVECTOR (1) +#define SCM_OBJCODE_TYPE_SLICE (2) +#define SCM_OBJCODE_TYPE_STATIC (3) #define SCM_OBJCODE_P(x) (SCM_NIMP (x) && SCM_TYP7 (x) == scm_tc7_objcode) #define SCM_OBJCODE_DATA(x) ((struct scm_objcode *) SCM_CELL_WORD_1 (x)) @@ -49,10 +49,13 @@ struct scm_objcode #define SCM_OBJCODE_TOTAL_LEN(x) (SCM_OBJCODE_LEN (x) + SCM_OBJCODE_META_LEN (x)) #define SCM_OBJCODE_BASE(x) (SCM_C_OBJCODE_BASE (SCM_OBJCODE_DATA (x))) -#define SCM_OBJCODE_FLAGS(x) (SCM_CELL_WORD_0 (x) >> 8) -#define SCM_OBJCODE_IS_MMAP(x) (SCM_OBJCODE_FLAGS (x) & SCM_F_OBJCODE_IS_MMAP) -#define SCM_OBJCODE_IS_BYTEVECTOR(x) (SCM_OBJCODE_FLAGS (x) & SCM_F_OBJCODE_IS_BYTEVECTOR) -#define SCM_OBJCODE_IS_SLICE(x) (SCM_OBJCODE_FLAGS (x) & SCM_F_OBJCODE_IS_SLICE) +#define SCM_MAKE_OBJCODE_TAG(type, flags) (scm_tc7_objcode | (type << 8) | (flags << 16)) +#define SCM_OBJCODE_TYPE(x) ((SCM_CELL_WORD_0 (x) >> 8) & 0xff) +#define SCM_OBJCODE_FLAGS(x) (SCM_CELL_WORD_0 (x) >> 16) +#define SCM_OBJCODE_IS_MMAP(x) (SCM_OBJCODE_TYPE (x) == SCM_OBJCODE_TYPE_MMAP) +#define SCM_OBJCODE_IS_BYTEVECTOR(x) (SCM_OBJCODE_TYPE (x) == SCM_OBJCODE_TYPE_BYTEVECTOR) +#define SCM_OBJCODE_IS_SLICE(x) (SCM_OBJCODE_TYPE (x) == SCM_OBJCODE_TYPE_SLICE) +#define SCM_OBJCODE_IS_STATIC(x) (SCM_OBJCODE_TYPE (x) == SCM_OBJCODE_TYPE_STATIC) SCM scm_c_make_objcode_slice (SCM parent, const scm_t_uint8 *ptr); SCM_API SCM scm_load_objcode (SCM file); |