mirror of
https://github.com/Perl/perl5.git
synced 2026-01-26 08:38:23 +00:00
feature.*: allow cop_feature to expand
The initial implementation of feature bits for faster access to feature flags used a single U32 member in COP to store the bits, but we're now up to 24 features, so rather than leaving this to the last minute I've re-worked regen/feature.pl to allow multiple U32 fields.
This commit is contained in:
Tony Cook
parent
7a6c52e10f
commit
87e1d1722c
14
cop.h
14
cop.h
@ -434,6 +434,15 @@ the octets.
|
||||
|
||||
#include "mydtrace.h"
|
||||
|
||||
/* keep in sync with feature.h (which will complain if this is out of sync)
|
||||
*/
|
||||
#define COP_FEATURE_SIZE 1
|
||||
|
||||
/* make this a struct so we can copy the feature bits with assignment */
|
||||
struct cop_feature_t {
|
||||
U32 bits[COP_FEATURE_SIZE];
|
||||
};
|
||||
|
||||
struct cop {
|
||||
BASEOP
|
||||
/* On LP64 putting this here takes advantage of the fact that BASEOP isn't
|
||||
@ -460,12 +469,11 @@ struct cop {
|
||||
/* compile time state of %^H. See the comment in op.c for how this is
|
||||
used to recreate a hash to return from caller. */
|
||||
COPHH * cop_hints_hash;
|
||||
/* for now just a bitmask stored here.
|
||||
If we get sufficient features this may become a pointer.
|
||||
/*
|
||||
How these flags are stored is subject to change without
|
||||
notice. Use the macros to test for features.
|
||||
*/
|
||||
U32 cop_features;
|
||||
struct cop_feature_t cop_features;
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
8
dump.c
8
dump.c
@ -28,6 +28,7 @@
|
||||
#define PERL_IN_DUMP_C
|
||||
#include "perl.h"
|
||||
#include "regcomp.h"
|
||||
#include "feature.h"
|
||||
|
||||
static const char* const svtypenames[SVt_LAST] = {
|
||||
"NULL",
|
||||
@ -1414,8 +1415,11 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const OP *o)
|
||||
/* add hints and features if set */
|
||||
if (cCOPo->cop_hints)
|
||||
S_opdump_indent(aTHX_ o, level, bar, file, "HINTS = %08x\n",cCOPo->cop_hints);
|
||||
if (cCOPo->cop_features)
|
||||
S_opdump_indent(aTHX_ o, level, bar, file, "FEATS = %08x\n",cCOPo->cop_features);
|
||||
if (ANY_FEATURE_BITS_SET(cCOPo)) {
|
||||
S_opdump_indent(aTHX_ o, level, bar, file, "FEATS = ");
|
||||
DUMP_FEATURE_BITS(file, cCOPo);
|
||||
PerlIO_puts(file, "\n");
|
||||
}
|
||||
|
||||
S_opdump_indent(aTHX_ o, level, bar, file, "SEQ = %u\n",
|
||||
(unsigned int)cCOPo->cop_seq);
|
||||
|
||||
265
feature.h
generated
265
feature.h
generated
@ -12,30 +12,63 @@
|
||||
|
||||
#define HINT_FEATURE_SHIFT 26
|
||||
|
||||
#define FEATURE_ALL_BIT 0x0001
|
||||
#define FEATURE_ANY_BIT 0x0002
|
||||
#define FEATURE_APOS_AS_NAME_SEP_BIT 0x0004
|
||||
#define FEATURE_BAREWORD_FILEHANDLES_BIT 0x0008
|
||||
#define FEATURE_BITWISE_BIT 0x0010
|
||||
#define FEATURE_CLASS_BIT 0x0020
|
||||
#define FEATURE___SUB___BIT 0x0040
|
||||
#define FEATURE_MYREF_BIT 0x0080
|
||||
#define FEATURE_DEFER_BIT 0x0100
|
||||
#define FEATURE_EVALBYTES_BIT 0x0200
|
||||
#define FEATURE_MORE_DELIMS_BIT 0x0400
|
||||
#define FEATURE_FC_BIT 0x0800
|
||||
#define FEATURE_INDIRECT_BIT 0x1000
|
||||
#define FEATURE_ISA_BIT 0x2000
|
||||
#define FEATURE_MODULE_TRUE_BIT 0x4000
|
||||
#define FEATURE_MULTIDIMENSIONAL_BIT 0x8000
|
||||
#define FEATURE_POSTDEREF_QQ_BIT 0x10000
|
||||
#define FEATURE_REFALIASING_BIT 0x20000
|
||||
#define FEATURE_SAY_BIT 0x40000
|
||||
#define FEATURE_SIGNATURES_BIT 0x80000
|
||||
#define FEATURE_STATE_BIT 0x100000
|
||||
#define FEATURE_TRY_BIT 0x200000
|
||||
#define FEATURE_UNIEVAL_BIT 0x400000
|
||||
#define FEATURE_UNICODE_BIT 0x800000
|
||||
/* Index 0 */
|
||||
#define FEATURE_ALL_BIT 0x00000001
|
||||
#define FEATURE_ANY_BIT 0x00000002
|
||||
#define FEATURE_APOS_AS_NAME_SEP_BIT 0x00000004
|
||||
#define FEATURE_BAREWORD_FILEHANDLES_BIT 0x00000008
|
||||
#define FEATURE_BITWISE_BIT 0x00000010
|
||||
#define FEATURE_CLASS_BIT 0x00000020
|
||||
#define FEATURE___SUB___BIT 0x00000040
|
||||
#define FEATURE_MYREF_BIT 0x00000080
|
||||
#define FEATURE_DEFER_BIT 0x00000100
|
||||
#define FEATURE_EVALBYTES_BIT 0x00000200
|
||||
#define FEATURE_MORE_DELIMS_BIT 0x00000400
|
||||
#define FEATURE_FC_BIT 0x00000800
|
||||
#define FEATURE_INDIRECT_BIT 0x00001000
|
||||
#define FEATURE_ISA_BIT 0x00002000
|
||||
#define FEATURE_MODULE_TRUE_BIT 0x00004000
|
||||
#define FEATURE_MULTIDIMENSIONAL_BIT 0x00008000
|
||||
#define FEATURE_POSTDEREF_QQ_BIT 0x00010000
|
||||
#define FEATURE_REFALIASING_BIT 0x00020000
|
||||
#define FEATURE_SAY_BIT 0x00040000
|
||||
#define FEATURE_SIGNATURES_BIT 0x00080000
|
||||
#define FEATURE_STATE_BIT 0x00100000
|
||||
#define FEATURE_TRY_BIT 0x00200000
|
||||
#define FEATURE_UNIEVAL_BIT 0x00400000
|
||||
#define FEATURE_UNICODE_BIT 0x00800000
|
||||
|
||||
#define FEATURE_ALL_INDEX 0
|
||||
#define FEATURE_ANY_INDEX 0
|
||||
#define FEATURE_APOS_AS_NAME_SEP_INDEX 0
|
||||
#define FEATURE_BAREWORD_FILEHANDLES_INDEX 0
|
||||
#define FEATURE_BITWISE_INDEX 0
|
||||
#define FEATURE_CLASS_INDEX 0
|
||||
#define FEATURE___SUB___INDEX 0
|
||||
#define FEATURE_MYREF_INDEX 0
|
||||
#define FEATURE_DEFER_INDEX 0
|
||||
#define FEATURE_EVALBYTES_INDEX 0
|
||||
#define FEATURE_MORE_DELIMS_INDEX 0
|
||||
#define FEATURE_FC_INDEX 0
|
||||
#define FEATURE_INDIRECT_INDEX 0
|
||||
#define FEATURE_ISA_INDEX 0
|
||||
#define FEATURE_MODULE_TRUE_INDEX 0
|
||||
#define FEATURE_MULTIDIMENSIONAL_INDEX 0
|
||||
#define FEATURE_POSTDEREF_QQ_INDEX 0
|
||||
#define FEATURE_REFALIASING_INDEX 0
|
||||
#define FEATURE_SAY_INDEX 0
|
||||
#define FEATURE_SIGNATURES_INDEX 0
|
||||
#define FEATURE_STATE_INDEX 0
|
||||
#define FEATURE_TRY_INDEX 0
|
||||
#define FEATURE_UNIEVAL_INDEX 0
|
||||
#define FEATURE_UNICODE_INDEX 0
|
||||
|
||||
#define REAL_COP_FEATURE_SIZE 1
|
||||
|
||||
/* If the following errors, update COP_FEATURE_SIZE in cop.h */
|
||||
#if defined(COP_FEATURE_SIZE) && COP_FEATURE_SIZE != REAL_COP_FEATURE_SIZE
|
||||
# error "COP_FEATURE_SIZE and REAL_COP_FEATURE_SIZE don't match"
|
||||
#endif
|
||||
|
||||
#define FEATURE_BUNDLE_DEFAULT 0
|
||||
#define FEATURE_BUNDLE_510 1
|
||||
@ -59,9 +92,9 @@
|
||||
#define CURRENT_FEATURE_BUNDLE \
|
||||
((CURRENT_HINTS & HINT_FEATURE_MASK) >> HINT_FEATURE_SHIFT)
|
||||
|
||||
#define FEATURE_IS_ENABLED_MASK(mask) \
|
||||
#define FEATURE_IS_ENABLED_MASK(index, mask) \
|
||||
((CURRENT_HINTS & HINT_LOCALIZE_HH) \
|
||||
? (PL_curcop->cop_features & (mask)) : FALSE)
|
||||
? (PL_curcop->cop_features.bits[index] & (mask)) : FALSE)
|
||||
|
||||
/* The longest string we pass in. */
|
||||
#define MAX_FEATURE_LEN (sizeof("bareword_filehandles")-1)
|
||||
@ -71,19 +104,19 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_FC_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_FC_INDEX, FEATURE_FC_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_ALL_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_ALL_BIT) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_ALL_INDEX, FEATURE_ALL_BIT) \
|
||||
)
|
||||
|
||||
#define FEATURE_ANY_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_ANY_BIT) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_ANY_INDEX, FEATURE_ANY_BIT) \
|
||||
)
|
||||
|
||||
#define FEATURE_ISA_IS_ENABLED \
|
||||
@ -91,7 +124,7 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_535 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_ISA_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_ISA_INDEX, FEATURE_ISA_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_SAY_IS_ENABLED \
|
||||
@ -99,7 +132,7 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_SAY_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_SAY_INDEX, FEATURE_SAY_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_TRY_IS_ENABLED \
|
||||
@ -107,19 +140,19 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_539 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_TRY_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_TRY_INDEX, FEATURE_TRY_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_CLASS_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_CLASS_BIT) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_CLASS_INDEX, FEATURE_CLASS_BIT) \
|
||||
)
|
||||
|
||||
#define FEATURE_DEFER_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_DEFER_BIT) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_DEFER_INDEX, FEATURE_DEFER_BIT) \
|
||||
)
|
||||
|
||||
#define FEATURE_STATE_IS_ENABLED \
|
||||
@ -127,7 +160,7 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_STATE_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_STATE_INDEX, FEATURE_STATE_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_BITWISE_IS_ENABLED \
|
||||
@ -135,14 +168,14 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_527 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_BITWISE_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_BITWISE_INDEX, FEATURE_BITWISE_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_INDIRECT_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527 \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_INDIRECT_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_INDIRECT_INDEX, FEATURE_INDIRECT_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_EVALBYTES_IS_ENABLED \
|
||||
@ -150,7 +183,7 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_EVALBYTES_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_EVALBYTES_INDEX, FEATURE_EVALBYTES_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_SIGNATURES_IS_ENABLED \
|
||||
@ -158,7 +191,7 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_535 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_SIGNATURES_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_SIGNATURES_INDEX, FEATURE_SIGNATURES_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE___SUB___IS_ENABLED \
|
||||
@ -166,7 +199,7 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE___SUB___BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE___SUB___INDEX, FEATURE___SUB___BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_MODULE_TRUE_IS_ENABLED \
|
||||
@ -174,13 +207,13 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_537 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_MODULE_TRUE_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_MODULE_TRUE_INDEX, FEATURE_MODULE_TRUE_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_REFALIASING_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_REFALIASING_BIT) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_REFALIASING_INDEX, FEATURE_REFALIASING_BIT) \
|
||||
)
|
||||
|
||||
#define FEATURE_POSTDEREF_QQ_IS_ENABLED \
|
||||
@ -188,7 +221,7 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_523 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_POSTDEREF_QQ_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_POSTDEREF_QQ_INDEX, FEATURE_POSTDEREF_QQ_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_UNIEVAL_IS_ENABLED \
|
||||
@ -196,13 +229,13 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_UNIEVAL_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_UNIEVAL_INDEX, FEATURE_UNIEVAL_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_MYREF_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_MYREF_BIT) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_MYREF_INDEX, FEATURE_MYREF_BIT) \
|
||||
)
|
||||
|
||||
#define FEATURE_UNICODE_IS_ENABLED \
|
||||
@ -210,40 +243,44 @@
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_511 && \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_541) \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_UNICODE_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_UNICODE_INDEX, FEATURE_UNICODE_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_MULTIDIMENSIONAL_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_527 \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_MULTIDIMENSIONAL_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_MULTIDIMENSIONAL_INDEX, FEATURE_MULTIDIMENSIONAL_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_BAREWORD_FILEHANDLES_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_535 \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_BAREWORD_FILEHANDLES_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_BAREWORD_FILEHANDLES_INDEX, FEATURE_BAREWORD_FILEHANDLES_BIT)) \
|
||||
)
|
||||
|
||||
#define FEATURE_MORE_DELIMS_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_MORE_DELIMS_BIT) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_MORE_DELIMS_INDEX, FEATURE_MORE_DELIMS_BIT) \
|
||||
)
|
||||
|
||||
#define FEATURE_APOS_AS_NAME_SEP_IS_ENABLED \
|
||||
( \
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_539 \
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_APOS_AS_NAME_SEP_BIT)) \
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_APOS_AS_NAME_SEP_INDEX, FEATURE_APOS_AS_NAME_SEP_BIT)) \
|
||||
)
|
||||
|
||||
|
||||
#define SAVEFEATUREBITS() SAVEI32(PL_compiling.cop_features)
|
||||
#define SAVEFEATUREBITS() \
|
||||
STMT_START { \
|
||||
SAVEI32(PL_compiling.cop_features.bits[0]); \
|
||||
} STMT_END
|
||||
|
||||
#define CLEARFEATUREBITS() (PL_compiling.cop_features = 0)
|
||||
#define CLEARFEATUREBITS() \
|
||||
(PL_compiling.cop_features.bits[0] = 0)
|
||||
|
||||
#define FETCHFEATUREBITSHH(hh) S_fetch_feature_bits_hh(aTHX_ (hh))
|
||||
|
||||
@ -305,11 +342,13 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (memBEGINs(keypv, keylen, "feature_")) {
|
||||
const char *subf = keypv + (sizeof("feature_")-1);
|
||||
U32 mask = 0;
|
||||
int index = 0;
|
||||
switch (*subf) {
|
||||
case '_':
|
||||
if (keylen == sizeof("feature___SUB__")-1
|
||||
&& memcmp(subf+1, "_SUB__", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE___SUB___BIT;
|
||||
index = FEATURE___SUB___INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -318,16 +357,19 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_all")-1
|
||||
&& memcmp(subf+1, "ll", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_ALL_BIT;
|
||||
index = FEATURE_ALL_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_any")-1
|
||||
&& memcmp(subf+1, "ny", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_ANY_BIT;
|
||||
index = FEATURE_ANY_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_apos_as_name_sep")-1
|
||||
&& memcmp(subf+1, "pos_as_name_sep", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_APOS_AS_NAME_SEP_BIT;
|
||||
index = FEATURE_APOS_AS_NAME_SEP_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -336,11 +378,13 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_bareword_filehandles")-1
|
||||
&& memcmp(subf+1, "areword_filehandles", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_BAREWORD_FILEHANDLES_BIT;
|
||||
index = FEATURE_BAREWORD_FILEHANDLES_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_bitwise")-1
|
||||
&& memcmp(subf+1, "itwise", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_BITWISE_BIT;
|
||||
index = FEATURE_BITWISE_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -349,6 +393,7 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_class")-1
|
||||
&& memcmp(subf+1, "lass", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_CLASS_BIT;
|
||||
index = FEATURE_CLASS_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -357,6 +402,7 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_defer")-1
|
||||
&& memcmp(subf+1, "efer", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_DEFER_BIT;
|
||||
index = FEATURE_DEFER_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -365,6 +411,7 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_evalbytes")-1
|
||||
&& memcmp(subf+1, "valbytes", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_EVALBYTES_BIT;
|
||||
index = FEATURE_EVALBYTES_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -373,6 +420,7 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_fc")-1
|
||||
&& memcmp(subf+1, "c", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_FC_BIT;
|
||||
index = FEATURE_FC_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -381,11 +429,13 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_indirect")-1
|
||||
&& memcmp(subf+1, "ndirect", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_INDIRECT_BIT;
|
||||
index = FEATURE_INDIRECT_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_isa")-1
|
||||
&& memcmp(subf+1, "sa", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_ISA_BIT;
|
||||
index = FEATURE_ISA_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -394,21 +444,25 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_module_true")-1
|
||||
&& memcmp(subf+1, "odule_true", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_MODULE_TRUE_BIT;
|
||||
index = FEATURE_MODULE_TRUE_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_more_delims")-1
|
||||
&& memcmp(subf+1, "ore_delims", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_MORE_DELIMS_BIT;
|
||||
index = FEATURE_MORE_DELIMS_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_multidimensional")-1
|
||||
&& memcmp(subf+1, "ultidimensional", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_MULTIDIMENSIONAL_BIT;
|
||||
index = FEATURE_MULTIDIMENSIONAL_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_myref")-1
|
||||
&& memcmp(subf+1, "yref", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_MYREF_BIT;
|
||||
index = FEATURE_MYREF_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -417,6 +471,7 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_postderef_qq")-1
|
||||
&& memcmp(subf+1, "ostderef_qq", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_POSTDEREF_QQ_BIT;
|
||||
index = FEATURE_POSTDEREF_QQ_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -425,6 +480,7 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_refaliasing")-1
|
||||
&& memcmp(subf+1, "efaliasing", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_REFALIASING_BIT;
|
||||
index = FEATURE_REFALIASING_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -433,16 +489,19 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_say")-1
|
||||
&& memcmp(subf+1, "ay", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_SAY_BIT;
|
||||
index = FEATURE_SAY_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_signatures")-1
|
||||
&& memcmp(subf+1, "ignatures", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_SIGNATURES_BIT;
|
||||
index = FEATURE_SIGNATURES_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_state")-1
|
||||
&& memcmp(subf+1, "tate", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_STATE_BIT;
|
||||
index = FEATURE_STATE_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -451,6 +510,7 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_try")-1
|
||||
&& memcmp(subf+1, "ry", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_TRY_BIT;
|
||||
index = FEATURE_TRY_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -459,11 +519,13 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (keylen == sizeof("feature_unicode")-1
|
||||
&& memcmp(subf+1, "nicode", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_UNICODE_BIT;
|
||||
index = FEATURE_UNICODE_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (keylen == sizeof("feature_unieval")-1
|
||||
&& memcmp(subf+1, "nieval", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_UNIEVAL_BIT;
|
||||
index = FEATURE_UNIEVAL_INDEX;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@ -472,9 +534,9 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
return;
|
||||
}
|
||||
if (valsv ? SvTRUE(valsv) : valbool)
|
||||
PL_compiling.cop_features |= mask;
|
||||
PL_compiling.cop_features.bits[index] |= mask;
|
||||
else
|
||||
PL_compiling.cop_features &= ~mask;
|
||||
PL_compiling.cop_features.bits[index] &= ~mask;
|
||||
}
|
||||
}
|
||||
#endif /* PERL_IN_MG_C */
|
||||
@ -484,6 +546,7 @@ struct perl_feature_bit {
|
||||
const char *name;
|
||||
STRLEN namelen;
|
||||
U32 mask;
|
||||
int index;
|
||||
};
|
||||
|
||||
#ifdef PERL_IN_PP_CTL_C
|
||||
@ -494,163 +557,201 @@ PL_feature_bits[] = {
|
||||
/* feature all */
|
||||
"feature_all",
|
||||
STRLENs("feature_all"),
|
||||
FEATURE_ALL_BIT
|
||||
FEATURE_ALL_BIT,
|
||||
FEATURE_ALL_INDEX
|
||||
},
|
||||
{
|
||||
/* feature any */
|
||||
"feature_any",
|
||||
STRLENs("feature_any"),
|
||||
FEATURE_ANY_BIT
|
||||
FEATURE_ANY_BIT,
|
||||
FEATURE_ANY_INDEX
|
||||
},
|
||||
{
|
||||
/* feature apostrophe_as_package_separator */
|
||||
"feature_apos_as_name_sep",
|
||||
STRLENs("feature_apos_as_name_sep"),
|
||||
FEATURE_APOS_AS_NAME_SEP_BIT
|
||||
FEATURE_APOS_AS_NAME_SEP_BIT,
|
||||
FEATURE_APOS_AS_NAME_SEP_INDEX
|
||||
},
|
||||
{
|
||||
/* feature bareword_filehandles */
|
||||
"feature_bareword_filehandles",
|
||||
STRLENs("feature_bareword_filehandles"),
|
||||
FEATURE_BAREWORD_FILEHANDLES_BIT
|
||||
FEATURE_BAREWORD_FILEHANDLES_BIT,
|
||||
FEATURE_BAREWORD_FILEHANDLES_INDEX
|
||||
},
|
||||
{
|
||||
/* feature bitwise */
|
||||
"feature_bitwise",
|
||||
STRLENs("feature_bitwise"),
|
||||
FEATURE_BITWISE_BIT
|
||||
FEATURE_BITWISE_BIT,
|
||||
FEATURE_BITWISE_INDEX
|
||||
},
|
||||
{
|
||||
/* feature class */
|
||||
"feature_class",
|
||||
STRLENs("feature_class"),
|
||||
FEATURE_CLASS_BIT
|
||||
FEATURE_CLASS_BIT,
|
||||
FEATURE_CLASS_INDEX
|
||||
},
|
||||
{
|
||||
/* feature current_sub */
|
||||
"feature___SUB__",
|
||||
STRLENs("feature___SUB__"),
|
||||
FEATURE___SUB___BIT
|
||||
FEATURE___SUB___BIT,
|
||||
FEATURE___SUB___INDEX
|
||||
},
|
||||
{
|
||||
/* feature declared_refs */
|
||||
"feature_myref",
|
||||
STRLENs("feature_myref"),
|
||||
FEATURE_MYREF_BIT
|
||||
FEATURE_MYREF_BIT,
|
||||
FEATURE_MYREF_INDEX
|
||||
},
|
||||
{
|
||||
/* feature defer */
|
||||
"feature_defer",
|
||||
STRLENs("feature_defer"),
|
||||
FEATURE_DEFER_BIT
|
||||
FEATURE_DEFER_BIT,
|
||||
FEATURE_DEFER_INDEX
|
||||
},
|
||||
{
|
||||
/* feature evalbytes */
|
||||
"feature_evalbytes",
|
||||
STRLENs("feature_evalbytes"),
|
||||
FEATURE_EVALBYTES_BIT
|
||||
FEATURE_EVALBYTES_BIT,
|
||||
FEATURE_EVALBYTES_INDEX
|
||||
},
|
||||
{
|
||||
/* feature extra_paired_delimiters */
|
||||
"feature_more_delims",
|
||||
STRLENs("feature_more_delims"),
|
||||
FEATURE_MORE_DELIMS_BIT
|
||||
FEATURE_MORE_DELIMS_BIT,
|
||||
FEATURE_MORE_DELIMS_INDEX
|
||||
},
|
||||
{
|
||||
/* feature fc */
|
||||
"feature_fc",
|
||||
STRLENs("feature_fc"),
|
||||
FEATURE_FC_BIT
|
||||
FEATURE_FC_BIT,
|
||||
FEATURE_FC_INDEX
|
||||
},
|
||||
{
|
||||
/* feature indirect */
|
||||
"feature_indirect",
|
||||
STRLENs("feature_indirect"),
|
||||
FEATURE_INDIRECT_BIT
|
||||
FEATURE_INDIRECT_BIT,
|
||||
FEATURE_INDIRECT_INDEX
|
||||
},
|
||||
{
|
||||
/* feature isa */
|
||||
"feature_isa",
|
||||
STRLENs("feature_isa"),
|
||||
FEATURE_ISA_BIT
|
||||
FEATURE_ISA_BIT,
|
||||
FEATURE_ISA_INDEX
|
||||
},
|
||||
{
|
||||
/* feature module_true */
|
||||
"feature_module_true",
|
||||
STRLENs("feature_module_true"),
|
||||
FEATURE_MODULE_TRUE_BIT
|
||||
FEATURE_MODULE_TRUE_BIT,
|
||||
FEATURE_MODULE_TRUE_INDEX
|
||||
},
|
||||
{
|
||||
/* feature multidimensional */
|
||||
"feature_multidimensional",
|
||||
STRLENs("feature_multidimensional"),
|
||||
FEATURE_MULTIDIMENSIONAL_BIT
|
||||
FEATURE_MULTIDIMENSIONAL_BIT,
|
||||
FEATURE_MULTIDIMENSIONAL_INDEX
|
||||
},
|
||||
{
|
||||
/* feature postderef_qq */
|
||||
"feature_postderef_qq",
|
||||
STRLENs("feature_postderef_qq"),
|
||||
FEATURE_POSTDEREF_QQ_BIT
|
||||
FEATURE_POSTDEREF_QQ_BIT,
|
||||
FEATURE_POSTDEREF_QQ_INDEX
|
||||
},
|
||||
{
|
||||
/* feature refaliasing */
|
||||
"feature_refaliasing",
|
||||
STRLENs("feature_refaliasing"),
|
||||
FEATURE_REFALIASING_BIT
|
||||
FEATURE_REFALIASING_BIT,
|
||||
FEATURE_REFALIASING_INDEX
|
||||
},
|
||||
{
|
||||
/* feature say */
|
||||
"feature_say",
|
||||
STRLENs("feature_say"),
|
||||
FEATURE_SAY_BIT
|
||||
FEATURE_SAY_BIT,
|
||||
FEATURE_SAY_INDEX
|
||||
},
|
||||
{
|
||||
/* feature signatures */
|
||||
"feature_signatures",
|
||||
STRLENs("feature_signatures"),
|
||||
FEATURE_SIGNATURES_BIT
|
||||
FEATURE_SIGNATURES_BIT,
|
||||
FEATURE_SIGNATURES_INDEX
|
||||
},
|
||||
{
|
||||
/* feature state */
|
||||
"feature_state",
|
||||
STRLENs("feature_state"),
|
||||
FEATURE_STATE_BIT
|
||||
FEATURE_STATE_BIT,
|
||||
FEATURE_STATE_INDEX
|
||||
},
|
||||
{
|
||||
/* feature try */
|
||||
"feature_try",
|
||||
STRLENs("feature_try"),
|
||||
FEATURE_TRY_BIT
|
||||
FEATURE_TRY_BIT,
|
||||
FEATURE_TRY_INDEX
|
||||
},
|
||||
{
|
||||
/* feature unicode_eval */
|
||||
"feature_unieval",
|
||||
STRLENs("feature_unieval"),
|
||||
FEATURE_UNIEVAL_BIT
|
||||
FEATURE_UNIEVAL_BIT,
|
||||
FEATURE_UNIEVAL_INDEX
|
||||
},
|
||||
{
|
||||
/* feature unicode_strings */
|
||||
"feature_unicode",
|
||||
STRLENs("feature_unicode"),
|
||||
FEATURE_UNICODE_BIT
|
||||
FEATURE_UNICODE_BIT,
|
||||
FEATURE_UNICODE_INDEX
|
||||
},
|
||||
{ NULL, 0, 0U }
|
||||
{ NULL, 0, 0U, 0 }
|
||||
};
|
||||
|
||||
PERL_STATIC_INLINE void
|
||||
S_fetch_feature_bits_hh(pTHX_ HV *hh) {
|
||||
PL_compiling.cop_features = 0;
|
||||
CLEARFEATUREBITS();
|
||||
|
||||
const struct perl_feature_bit *fb = PL_feature_bits;
|
||||
while (fb->name) {
|
||||
SV **svp = hv_fetch(hh, fb->name, (I32)fb->namelen, 0);
|
||||
if (svp && SvTRUE(*svp))
|
||||
PL_compiling.cop_features |= fb->mask;
|
||||
PL_compiling.cop_features.bits[fb->index] |= fb->mask;
|
||||
++fb;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif /* PERL_IN_PP_CTL_C */
|
||||
|
||||
#ifdef PERL_IN_DUMP_C
|
||||
|
||||
#define ANY_FEATURE_BITS_SET(cop) \
|
||||
( \
|
||||
cop->cop_features.bits[0] \
|
||||
)
|
||||
|
||||
#define DUMP_FEATURE_BITS(file, cop) \
|
||||
STMT_START { \
|
||||
PerlIO_printf(file, "0x%08x", cop->cop_features.bits[0]); \
|
||||
} STMT_END
|
||||
|
||||
#endif /* PERL_IN_DUMP_C */
|
||||
|
||||
#endif /* PERL_FEATURE_H_ */
|
||||
|
||||
|
||||
105
regen/feature.pl
105
regen/feature.pl
@ -116,16 +116,22 @@ my @removed = qw( array_base switch );
|
||||
###########################################################################
|
||||
# More data generated from the above
|
||||
|
||||
if (keys %feature > 32) {
|
||||
die "cop_features only has room for 32 features";
|
||||
}
|
||||
|
||||
my %feature_bits;
|
||||
my %feature_indices;
|
||||
my $mask = 1;
|
||||
my $index = 0;
|
||||
for my $feature (sort keys %feature) {
|
||||
$feature_bits{$feature} = $mask;
|
||||
$mask <<= 1;
|
||||
$feature_indices{$feature} = $index;
|
||||
if ($mask == 0x8000_0000) {
|
||||
$mask = 1;
|
||||
++$index;
|
||||
}
|
||||
else {
|
||||
$mask <<= 1;
|
||||
}
|
||||
}
|
||||
my $cop_feature_size = $mask == 1 ? $index : $index + 1;
|
||||
|
||||
for (keys %feature_bundle) {
|
||||
next unless /^5\.(\d*[13579])\z/;
|
||||
@ -302,15 +308,34 @@ print $h <<EOH;
|
||||
#if defined(PERL_CORE) || defined (PERL_EXT)
|
||||
|
||||
#define HINT_FEATURE_SHIFT $HintShift
|
||||
|
||||
EOH
|
||||
|
||||
for (sort keys %feature_bits) {
|
||||
printf $h "#define FEATURE_%s_BIT%*s %#06x\n", uc($feature{$_}),
|
||||
if ($feature_bits{$_} == 1) {
|
||||
print $h "\n/* Index $feature_indices{$_} */\n";
|
||||
}
|
||||
printf $h "#define FEATURE_%s_BIT%*s %#010x\n", uc($feature{$_}),
|
||||
$width-length($feature{$_}), "", $feature_bits{$_};
|
||||
}
|
||||
print $h "\n";
|
||||
|
||||
for (sort keys %feature_indices) {
|
||||
printf $h "#define FEATURE_%s_INDEX%*s %d\n", uc($feature{$_}),
|
||||
$width-length($feature{$_}), "", $feature_indices{$_};
|
||||
}
|
||||
print $h "\n";
|
||||
|
||||
# we don't require that every source #includes <feature.h>
|
||||
print $h <<EOH;
|
||||
#define REAL_COP_FEATURE_SIZE $cop_feature_size
|
||||
|
||||
/* If the following errors, update COP_FEATURE_SIZE in cop.h */
|
||||
#if defined(COP_FEATURE_SIZE) && COP_FEATURE_SIZE != REAL_COP_FEATURE_SIZE
|
||||
# error "COP_FEATURE_SIZE and REAL_COP_FEATURE_SIZE don't match"
|
||||
#endif
|
||||
|
||||
EOH
|
||||
|
||||
my $count;
|
||||
for (@HintedBundles) {
|
||||
(my $key = uc) =~ y/.//d;
|
||||
@ -330,9 +355,9 @@ print $h <<'EOH';
|
||||
#define CURRENT_FEATURE_BUNDLE \
|
||||
((CURRENT_HINTS & HINT_FEATURE_MASK) >> HINT_FEATURE_SHIFT)
|
||||
|
||||
#define FEATURE_IS_ENABLED_MASK(mask) \
|
||||
#define FEATURE_IS_ENABLED_MASK(index, mask) \
|
||||
((CURRENT_HINTS & HINT_LOCALIZE_HH) \
|
||||
? (PL_curcop->cop_features & (mask)) : FALSE)
|
||||
? (PL_curcop->cop_features.bits[index] & (mask)) : FALSE)
|
||||
|
||||
/* The longest string we pass in. */
|
||||
EOH
|
||||
@ -356,7 +381,7 @@ for (
|
||||
( \\
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_$last \\
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \\
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_${NAME}_BIT)) \\
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_${NAME}_INDEX, FEATURE_${NAME}_BIT)) \\
|
||||
)
|
||||
|
||||
EOI
|
||||
@ -368,7 +393,7 @@ EOI
|
||||
(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_$first && \\
|
||||
CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_$last) \\
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \\
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_${NAME}_BIT)) \\
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_${NAME}_INDEX, FEATURE_${NAME}_BIT)) \\
|
||||
)
|
||||
|
||||
EOH3
|
||||
@ -379,7 +404,7 @@ EOH3
|
||||
( \\
|
||||
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_$first \\
|
||||
|| (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \\
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_${NAME}_BIT)) \\
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_${NAME}_INDEX, FEATURE_${NAME}_BIT)) \\
|
||||
)
|
||||
|
||||
EOH4
|
||||
@ -389,18 +414,27 @@ EOH4
|
||||
#define FEATURE_${NAME}_IS_ENABLED \\
|
||||
( \\
|
||||
CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \\
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_${NAME}_BIT) \\
|
||||
FEATURE_IS_ENABLED_MASK(FEATURE_${NAME}_INDEX, FEATURE_${NAME}_BIT) \\
|
||||
)
|
||||
|
||||
EOH5
|
||||
}
|
||||
}
|
||||
|
||||
my $save_bits = "STMT_START { \\\n "
|
||||
. join("\\\n ", map { "SAVEI32(PL_compiling.cop_features.bits[$_]); " } 0 .. $cop_feature_size-1)
|
||||
. " \\\n } STMT_END";
|
||||
|
||||
my $clear_bits = "("
|
||||
. join(" \\\n ", map "PL_compiling.cop_features.bits[$_] = ", 0 .. $cop_feature_size-1) . "0)";
|
||||
|
||||
print $h <<EOH;
|
||||
|
||||
#define SAVEFEATUREBITS() SAVEI32(PL_compiling.cop_features)
|
||||
#define SAVEFEATUREBITS() \\
|
||||
$save_bits
|
||||
|
||||
#define CLEARFEATUREBITS() (PL_compiling.cop_features = 0)
|
||||
#define CLEARFEATUREBITS() \\
|
||||
$clear_bits
|
||||
|
||||
#define FETCHFEATUREBITSHH(hh) S_fetch_feature_bits_hh(aTHX_ (hh))
|
||||
|
||||
@ -450,6 +484,7 @@ S_magic_sethint_feature(pTHX_ SV *keysv, const char *keypv, STRLEN keylen,
|
||||
if (memBEGINs(keypv, keylen, "feature_")) {
|
||||
const char *subf = keypv + (sizeof("feature_")-1);
|
||||
U32 mask = 0;
|
||||
int index = 0;
|
||||
switch (*subf) {
|
||||
EOJ
|
||||
|
||||
@ -470,6 +505,7 @@ EOS
|
||||
$if (keylen == sizeof("feature_$subkey")-1
|
||||
&& memcmp(subf+1, "$rest", keylen - sizeof("feature_")) == 0) {
|
||||
mask = FEATURE_\U${subkey}\E_BIT;
|
||||
index = FEATURE_\U${subkey}\E_INDEX;
|
||||
break;
|
||||
}
|
||||
EOJ
|
||||
@ -487,9 +523,9 @@ print $h <<EOJ;
|
||||
return;
|
||||
}
|
||||
if (valsv ? SvTRUE(valsv) : valbool)
|
||||
PL_compiling.cop_features |= mask;
|
||||
PL_compiling.cop_features.bits[index] |= mask;
|
||||
else
|
||||
PL_compiling.cop_features &= ~mask;
|
||||
PL_compiling.cop_features.bits[index] &= ~mask;
|
||||
}
|
||||
}
|
||||
#endif /* PERL_IN_MG_C */
|
||||
@ -499,6 +535,7 @@ struct perl_feature_bit {
|
||||
const char *name;
|
||||
STRLEN namelen;
|
||||
U32 mask;
|
||||
int index;
|
||||
};
|
||||
|
||||
#ifdef PERL_IN_PP_CTL_C
|
||||
@ -513,29 +550,53 @@ for my $key (sort keys %feature) {
|
||||
/* feature $key */
|
||||
"feature_$val",
|
||||
STRLENs("feature_$val"),
|
||||
FEATURE_\U$val\E_BIT
|
||||
FEATURE_\U$val\E_BIT,
|
||||
FEATURE_\U$val\E_INDEX
|
||||
},
|
||||
EOJ
|
||||
}
|
||||
|
||||
print $h <<EOJ;
|
||||
{ NULL, 0, 0U }
|
||||
{ NULL, 0, 0U, 0 }
|
||||
};
|
||||
|
||||
PERL_STATIC_INLINE void
|
||||
S_fetch_feature_bits_hh(pTHX_ HV *hh) {
|
||||
PL_compiling.cop_features = 0;
|
||||
CLEARFEATUREBITS();
|
||||
|
||||
const struct perl_feature_bit *fb = PL_feature_bits;
|
||||
while (fb->name) {
|
||||
SV **svp = hv_fetch(hh, fb->name, (I32)fb->namelen, 0);
|
||||
if (svp && SvTRUE(*svp))
|
||||
PL_compiling.cop_features |= fb->mask;
|
||||
PL_compiling.cop_features.bits[fb->index] |= fb->mask;
|
||||
++fb;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif /* PERL_IN_PP_CTL_C */
|
||||
|
||||
#ifdef PERL_IN_DUMP_C
|
||||
|
||||
EOJ
|
||||
|
||||
my $any_bits_set = "( \\\n " .
|
||||
join(" || \\\n ", map "cop->cop_features.bits[$_]", 0 .. $cop_feature_size-1) .
|
||||
" \\\n )";
|
||||
|
||||
my $dump_bits = "STMT_START { \\\n " .
|
||||
join(qq( \\\n PerlIO_putc(file, ','); \\\n ),
|
||||
map { qq(PerlIO_printf(file, "0x%08x", cop->cop_features.bits[$_]);) }
|
||||
0 .. $cop_feature_size-1) .
|
||||
" \\\n } STMT_END";
|
||||
|
||||
print $h <<EOJ;
|
||||
#define ANY_FEATURE_BITS_SET(cop) \\
|
||||
$any_bits_set
|
||||
|
||||
#define DUMP_FEATURE_BITS(file, cop) \\
|
||||
$dump_bits
|
||||
|
||||
#endif /* PERL_IN_DUMP_C */
|
||||
|
||||
#endif /* PERL_FEATURE_H_ */
|
||||
EOJ
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user