diff options
author | Dmitry Stogov <dmitry@zend.com> | 2018-07-26 12:58:07 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2018-07-26 12:58:07 +0300 |
commit | ab8094c666048b747481df0b9da94e08cadc4160 (patch) | |
tree | 3ac94d92f4b07fe2d1d98db81203c85572bea82c /Zend/zend_constants.h | |
parent | 7a41e4c0d0ddb2cfb91e31b210d7bceb158d2ab4 (diff) | |
download | php-git-ab8094c666048b747481df0b9da94e08cadc4160.tar.gz |
Pack zend_constant.flags and zend_constant.module_number into reserved space inside zend_constant.value.
Diffstat (limited to 'Zend/zend_constants.h')
-rw-r--r-- | Zend/zend_constants.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h index a1ee3b6fe3..201a2f2693 100644 --- a/Zend/zend_constants.h +++ b/Zend/zend_constants.h @@ -27,7 +27,7 @@ #define CONST_CT_SUBST (1<<2) /* Allow compile-time substitution */ #define CONST_NO_FILE_CACHE (1<<3) /* Can't be saved in file cache */ -#define PHP_USER_CONSTANT INT_MAX /* a constant defined in user space */ +#define PHP_USER_CONSTANT 0x7fffff /* a constant defined in user space */ /* Flag for zend_get_constant_ex(). Must not class with ZEND_FETCH_CLASS_* flags. */ #define ZEND_GET_CONSTANT_NO_DEPRECATION_CHECK 0x1000 @@ -35,10 +35,19 @@ typedef struct _zend_constant { zval value; zend_string *name; - int flags; - int module_number; } zend_constant; +#define ZEND_CONSTANT_FLAGS(c) \ + (Z_CONSTANT_FLAGS((c)->value) & 0xff) + +#define ZEND_CONSTANT_MODULE_NUMBER(c) \ + (Z_CONSTANT_FLAGS((c)->value) >> 8) + +#define ZEND_CONSTANT_SET_FLAGS(c, _flags, _module_number) do { \ + Z_CONSTANT_FLAGS((c)->value) = \ + ((_flags) & 0xff) | ((_module_number) << 8); \ + } while (0) + #define REGISTER_NULL_CONSTANT(name, flags) zend_register_null_constant((name), sizeof(name)-1, (flags), module_number) #define REGISTER_BOOL_CONSTANT(name, bval, flags) zend_register_bool_constant((name), sizeof(name)-1, (bval), (flags), module_number) #define REGISTER_LONG_CONSTANT(name, lval, flags) zend_register_long_constant((name), sizeof(name)-1, (lval), (flags), module_number) |