static opclass
cc_opclass(pTHX_ const OP *o)
{
+ bool custom = 0;
+
if (!o)
return OPc_NULL;
return OPc_PADOP;
#endif
- switch (PL_opargs[o->op_type] & OA_CLASS_MASK) {
+ if (o->op_type == OP_CUSTOM)
+ custom = 1;
+
+ switch (OP_CLASS(o)) {
case OA_BASEOP:
return OPc_BASEOP;
* Character translations (tr///) are usually a PVOP, keeping a
* pointer to a table of shorts used to look up translations.
* Under utf8, however, a simple table isn't practical; instead,
- * the OP is an SVOP, and the SV is a reference to a swash
+ * the OP is an SVOP (or, under threads, a PADOP),
+ * and the SV is a reference to a swash
* (i.e., an RV pointing to an HV).
*/
- return (o->op_private & (OPpTRANS_TO_UTF|OPpTRANS_FROM_UTF))
+ return (!custom &&
+ (o->op_private & (OPpTRANS_TO_UTF|OPpTRANS_FROM_UTF))
+ )
+#if defined(USE_ITHREADS) \
+ && (PERL_VERSION > 8 || (PERL_VERSION == 8 && PERL_SUBVERSION >= 9))
+ ? OPc_PADOP : OPc_PVOP;
+#else
? OPc_SVOP : OPc_PVOP;
+#endif
case OA_LOOP:
return OPc_LOOP;
return OPc_PVOP;
}
warn("can't determine class of operator %s, assuming BASEOP\n",
- PL_op_name[o->op_type]);
+ OP_NAME(o));
return OPc_BASEOP;
}
-static char *
-cc_opclassname(pTHX_ const OP *o)
+static SV *
+make_op_object(pTHX_ const OP *o)
{
- return (char *)opclassnames[cc_opclass(aTHX_ o)];
+ SV *opsv = sv_newmortal();
+ sv_setiv(newSVrv(opsv, opclassnames[cc_opclass(aTHX_ o)]), PTR2IV(o));
+ return opsv;
}
-/* FIXME - figure out how to get the typemap to assign this to ST(0), rather
- than creating a new mortal for ST(0) then passing it in as the first
- argument. */
static SV *
-make_sv_object(pTHX_ SV *arg, SV *sv)
+make_sv_object(pTHX_ SV *sv)
{
+ SV *const arg = sv_newmortal();
const char *type = 0;
IV iv;
dMY_CXT;
- if (!arg)
- arg = sv_newmortal();
-
- for (iv = 0; iv < sizeof(specialsv_list)/sizeof(SV*); iv++) {
+ for (iv = 0; iv < (IV)(sizeof(specialsv_list)/sizeof(SV*)); iv++) {
if (sv == specialsv_list[iv]) {
type = "B::SPECIAL";
break;
}
static SV *
-make_warnings_object(pTHX_ STRLEN *warnings)
+make_warnings_object(pTHX_ const COP *const cop)
{
+ const STRLEN *const warnings = cop->cop_warnings;
const char *type = 0;
dMY_CXT;
IV iv = sizeof(specialsv_list)/sizeof(SV*);
Perl_emulate_cop_io(aTHX_ cop, value);
if(SvOK(value)) {
- return make_sv_object(aTHX_ NULL, value);
+ return make_sv_object(aTHX_ value);
} else {
SvREFCNT_dec(value);
- return make_sv_object(aTHX_ NULL, NULL);
+ return make_sv_object(aTHX_ NULL);
}
}
#endif
# define PMOP_pmdynflags(o) o->op_pmdynflags
#endif
-static void
-walkoptree(pTHX_ SV *opsv, const char *method)
+static SV *
+walkoptree(pTHX_ OP *o, const char *method, SV *ref)
{
dSP;
- OP *o, *kid;
+ OP *kid;
+ SV *object;
+ const char *const classname = opclassnames[cc_opclass(aTHX_ o)];
dMY_CXT;
- if (!SvROK(opsv))
- croak("opsv is not a reference");
- opsv = sv_mortalcopy(opsv);
- o = INT2PTR(OP*,SvIV((SV*)SvRV(opsv)));
+ /* Check that no-one has changed our reference, or is holding a reference
+ to it. */
+ if (SvREFCNT(ref) == 1 && SvROK(ref) && SvTYPE(ref) == SVt_RV
+ && (object = SvRV(ref)) && SvREFCNT(object) == 1
+ && SvTYPE(object) == SVt_PVMG && SvIOK_only(object)
+ && !SvMAGICAL(object) && !SvMAGIC(object) && SvSTASH(object)) {
+ /* Looks good, so rebless it for the class we need: */
+ sv_bless(ref, gv_stashpv(classname, GV_ADD));
+ } else {
+ /* Need to make a new one. */
+ ref = sv_newmortal();
+ object = newSVrv(ref, classname);
+ }
+ sv_setiv(object, PTR2IV(o));
+
if (walkoptree_debug) {
PUSHMARK(sp);
- XPUSHs(opsv);
+ XPUSHs(ref);
PUTBACK;
perl_call_method("walkoptree_debug", G_DISCARD);
}
PUSHMARK(sp);
- XPUSHs(opsv);
+ XPUSHs(ref);
PUTBACK;
perl_call_method(method, G_DISCARD);
if (o && (o->op_flags & OPf_KIDS)) {
for (kid = ((UNOP*)o)->op_first; kid; kid = kid->op_sibling) {
- /* Use the same opsv. Rely on methods not to mess it up. */
- sv_setiv(newSVrv(opsv, cc_opclassname(aTHX_ kid)), PTR2IV(kid));
- walkoptree(aTHX_ opsv, method);
+ ref = walkoptree(aTHX_ kid, method, ref);
}
}
if (o && (cc_opclass(aTHX_ o) == OPc_PMOP) && o->op_type != OP_PUSHRE
&& (kid = PMOP_pmreplroot(cPMOPo)))
{
- sv_setiv(newSVrv(opsv, cc_opclassname(aTHX_ kid)), PTR2IV(kid));
- walkoptree(aTHX_ opsv, method);
+ ref = walkoptree(aTHX_ kid, method, ref);
}
+ return ref;
}
static SV **
oplist(pTHX_ OP *o, SV **SP)
{
for(; o; o = o->op_next) {
- SV *opsv;
#if PERL_VERSION >= 9
if (o->op_opt == 0)
break;
break;
o->op_seq = 0;
#endif
- opsv = sv_newmortal();
- sv_setiv(newSVrv(opsv, cc_opclassname(aTHX_ (OP*)o)), PTR2IV(o));
- XPUSHs(opsv);
+ XPUSHs(make_op_object(aTHX_ o));
switch (o->op_type) {
case OP_SUBST:
SP = oplist(aTHX_ PMOP_pmreplstart(cPMOPo), SP);
typedef struct refcounted_he *B__RHE;
#endif
+#ifdef MULTIPLICITY
+# define ASSIGN_COMMON_ALIAS(var) \
+ STMT_START { XSANY.any_i32 = offsetof(struct interpreter, var); } STMT_END
+#else
+# define ASSIGN_COMMON_ALIAS(var) \
+ STMT_START { XSANY.any_ptr = (void *)&PL_##var; } STMT_END
+#endif
+
+/* This needs to be ALIASed in a custom way, hence can't easily be defined as
+ a regular XSUB. */
+static XSPROTO(intrpvar_sv_common); /* prototype to pass -Wmissing-prototypes */
+static XSPROTO(intrpvar_sv_common)
+{
+ dVAR;
+ dXSARGS;
+ SV *ret;
+ if (items != 0)
+ croak_xs_usage(cv, "");
+#ifdef MULTIPLICITY
+ ret = *(SV **)(XSANY.any_i32 + (char *)my_perl);
+#else
+ ret = *(SV **)(XSANY.any_ptr);
+#endif
+ ST(0) = make_sv_object(aTHX_ ret);
+ XSRETURN(1);
+}
+
#include "const-c.inc"
-MODULE = B PACKAGE = B PREFIX = B_
+MODULE = B PACKAGE = B
INCLUDE: const-xs.inc
BOOT:
{
- HV *stash = gv_stashpvs("B", GV_ADD);
- AV *export_ok = perl_get_av("B::EXPORT_OK", GV_ADD);
+ CV *cv;
+ const char *file = __FILE__;
MY_CXT_INIT;
specialsv_list[0] = Nullsv;
specialsv_list[1] = &PL_sv_undef;
specialsv_list[4] = (SV *) pWARN_ALL;
specialsv_list[5] = (SV *) pWARN_NONE;
specialsv_list[6] = (SV *) pWARN_STD;
-#if PERL_VERSION <= 8
-# define OPpPAD_STATE 0
-#endif
-}
-
-#define B_main_cv() PL_main_cv
-#define B_init_av() PL_initav
-#define B_inc_gv() PL_incgv
-#define B_check_av() PL_checkav_save
-#if PERL_VERSION > 8
-# define B_unitcheck_av() PL_unitcheckav_save
-#else
-# define B_unitcheck_av() NULL
-#endif
-#define B_begin_av() PL_beginav_save
-#define B_end_av() PL_endav
-#define B_main_root() PL_main_root
-#define B_main_start() PL_main_start
-#define B_amagic_generation() PL_amagic_generation
-#define B_sub_generation() PL_sub_generation
-#define B_defstash() PL_defstash
-#define B_curstash() PL_curstash
-#define B_dowarn() PL_dowarn
-#define B_comppadlist() (PL_main_cv ? CvPADLIST(PL_main_cv) : CvPADLIST(PL_compcv))
-#define B_sv_undef() &PL_sv_undef
-#define B_sv_yes() &PL_sv_yes
-#define B_sv_no() &PL_sv_no
-#define B_formfeed() PL_formfeed
-#ifdef USE_ITHREADS
-#define B_regex_padav() PL_regex_padav
-#endif
-
-B::AV
-B_init_av()
-
-B::AV
-B_check_av()
-
+
+ cv = newXS("B::init_av", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Iinitav);
+ cv = newXS("B::check_av", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Icheckav_save);
#if PERL_VERSION >= 9
-
-B::AV
-B_unitcheck_av()
-
+ cv = newXS("B::unitcheck_av", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Iunitcheckav_save);
#endif
-
-B::AV
-B_begin_av()
-
-B::AV
-B_end_av()
-
-B::GV
-B_inc_gv()
-
+ cv = newXS("B::begin_av", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Ibeginav_save);
+ cv = newXS("B::end_av", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Iendav);
+ cv = newXS("B::main_cv", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Imain_cv);
+ cv = newXS("B::inc_gv", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Iincgv);
+ cv = newXS("B::defstash", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Idefstash);
+ cv = newXS("B::curstash", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Icurstash);
+ cv = newXS("B::formfeed", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Iformfeed);
#ifdef USE_ITHREADS
-
-B::AV
-B_regex_padav()
-
+ cv = newXS("B::regex_padav", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Iregex_padav);
#endif
-
-B::CV
-B_main_cv()
-
-B::OP
-B_main_root()
-
-B::OP
-B_main_start()
+ cv = newXS("B::warnhook", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Iwarnhook);
+ cv = newXS("B::diehook", intrpvar_sv_common, file);
+ ASSIGN_COMMON_ALIAS(Idiehook);
+}
long
-B_amagic_generation()
-
-long
-B_sub_generation()
-
-B::AV
-B_comppadlist()
-
-B::SV
-B_sv_undef()
-
-B::SV
-B_sv_yes()
-
-B::SV
-B_sv_no()
-
-B::HV
-B_curstash()
-
-B::HV
-B_defstash()
-
-U8
-B_dowarn()
+amagic_generation()
+ CODE:
+ RETVAL = PL_amagic_generation;
+ OUTPUT:
+ RETVAL
-B::SV
-B_formfeed()
+void
+comppadlist()
+ PPCODE:
+ PUSHs(make_sv_object(aTHX_ (SV *)(PL_main_cv ? CvPADLIST(PL_main_cv)
+ : CvPADLIST(PL_compcv))));
void
-B_warnhook()
- CODE:
- ST(0) = make_sv_object(aTHX_ NULL, PL_warnhook);
+sv_undef()
+ ALIAS:
+ sv_no = 1
+ sv_yes = 2
+ PPCODE:
+ PUSHs(make_sv_object(aTHX_ ix > 1 ? &PL_sv_yes
+ : ix < 1 ? &PL_sv_undef
+ : &PL_sv_no));
void
-B_diehook()
- CODE:
- ST(0) = make_sv_object(aTHX_ NULL, PL_diehook);
+main_root()
+ ALIAS:
+ main_start = 1
+ PPCODE:
+ PUSHs(make_op_object(aTHX_ ix ? PL_main_start : PL_main_root));
-MODULE = B PACKAGE = B
+UV
+sub_generation()
+ ALIAS:
+ dowarn = 1
+ CODE:
+ RETVAL = ix ? PL_dowarn : PL_sub_generation;
+ OUTPUT:
+ RETVAL
void
-walkoptree(opsv, method)
- SV * opsv
+walkoptree(op, method)
+ B::OP op
const char * method
CODE:
- walkoptree(aTHX_ opsv, method);
+ (void) walkoptree(aTHX_ op, method, &PL_sv_undef);
int
walkoptree_debug(...)
address(sv)
SV * sv
-B::SV
+void
svref_2object(sv)
SV * sv
- CODE:
+ PPCODE:
if (!SvROK(sv))
croak("argument is not a reference");
- RETVAL = (SV*)SvRV(sv);
- OUTPUT:
- RETVAL
+ PUSHs(make_sv_object(aTHX_ SvRV(sv)));
void
opnumber(name)
void
minus_c()
+ ALIAS:
+ save_BEGINs = 1
CODE:
- PL_minus_c = TRUE;
+ if (ix)
+ PL_savebegin = TRUE;
+ else
+ PL_minus_c = TRUE;
void
-save_BEGINs()
- CODE:
- PL_savebegin = TRUE;
-
-SV *
cstring(sv)
SV * sv
ALIAS:
perlstring = 1
cchar = 2
PPCODE:
- PUSHs(ix == 2 ? cchar(aTHX_ sv) : cstring(aTHX_ sv, ix));
+ PUSHs(ix == 2 ? cchar(aTHX_ sv) : cstring(aTHX_ sv, (bool)ix));
void
threadsv_names()
#define COP_filegv_ix SVp | offsetof(struct cop, cop_filegv)
#endif
-MODULE = B PACKAGE = B::OP PREFIX = OP_
+MODULE = B PACKAGE = B::OP
size_t
-OP_size(o)
+size(o)
B::OP o
CODE:
RETVAL = opsizes[cc_opclass(aTHX_ o)];
ptr = (ix & 0xFFFF) + (char *)o;
switch ((U8)(ix >> 16)) {
case (U8)(OPp >> 16):
- {
- OP *const o2 = *((OP **)ptr);
- ret = sv_newmortal();
- sv_setiv(newSVrv(ret, cc_opclassname(aTHX_ o2)), PTR2IV(o2));
- break;
- }
+ ret = make_op_object(aTHX_ *((OP **)ptr));
+ break;
case (U8)(PADOFFSETp >> 16):
ret = sv_2mortal(newSVuv(*((PADOFFSET*)ptr)));
break;
ret = sv_2mortal(newSVuv(*((U32*)ptr)));
break;
case (U8)(SVp >> 16):
- ret = make_sv_object(aTHX_ NULL, *((SV **)ptr));
+ ret = make_sv_object(aTHX_ *((SV **)ptr));
break;
case (U8)(line_tp >> 16):
ret = sv_2mortal(newSVuv(*((line_t *)ptr)));
ret = sv_2mortal(newSVpv(*((char **)ptr), 0));
break;
#endif
+ default:
+ croak("Illegal alias 0x%08x for B::*next", (unsigned)ix);
+
}
ST(0) = ret;
XSRETURN(1);
char *
-OP_name(o)
+name(o)
B::OP o
ALIAS:
desc = 1
CODE:
- RETVAL = (char *)(ix ? PL_op_desc : PL_op_name)[o->op_type];
+ RETVAL = (char *)(ix ? OP_DESC(o) : OP_NAME(o));
OUTPUT:
RETVAL
void
-OP_ppaddr(o)
+ppaddr(o)
B::OP o
PREINIT:
int i;
#if PERL_VERSION >= 9
# These 3 are all bitfields, so we can't take their addresses.
UV
-OP_type(o)
+type(o)
B::OP o
ALIAS:
opt = 1
#else
UV
-OP_type(o)
+type(o)
B::OP o
ALIAS:
seq = 1
#endif
void
-OP_oplist(o)
+oplist(o)
B::OP o
PPCODE:
SP = oplist(aTHX_ o, SP);
-MODULE = B PACKAGE = B::LISTOP PREFIX = LISTOP_
+MODULE = B PACKAGE = B::LISTOP
U32
-LISTOP_children(o)
+children(o)
B::LISTOP o
OP * kid = NO_INIT
int i = NO_INIT
B::PMOP o
OP * root = NO_INIT
CODE:
- ST(0) = sv_newmortal();
root = o->op_pmreplroot;
/* OP_PUSHRE stores an SV* instead of an OP* in op_pmreplroot */
if (o->op_type == OP_PUSHRE) {
+ ST(0) = sv_newmortal();
# ifdef USE_ITHREADS
sv_setiv(ST(0), INT2PTR(PADOFFSET,root) );
# else
# endif
}
else {
- sv_setiv(newSVrv(ST(0), cc_opclassname(aTHX_ root)), PTR2IV(root));
+ ST(0) = make_op_object(aTHX_ root);
}
#else
PMOP_pmreplroot(o)
B::PMOP o
CODE:
- ST(0) = sv_newmortal();
if (o->op_type == OP_PUSHRE) {
# ifdef USE_ITHREADS
+ ST(0) = sv_newmortal();
sv_setiv(ST(0), o->op_pmreplrootu.op_pmtargetoff);
# else
GV *const target = o->op_pmreplrootu.op_pmtargetgv;
+ ST(0) = sv_newmortal();
sv_setiv(newSVrv(ST(0), target ?
svclassnames[SvTYPE((SV*)target)] : "B::SV"),
PTR2IV(target));
}
else {
OP *const root = o->op_pmreplrootu.op_pmreplroot;
- sv_setiv(newSVrv(ST(0), cc_opclassname(aTHX_ root)),
- PTR2IV(root));
+ ST(0) = make_op_object(aTHX_ root);
}
#endif
B::PMOP o
#else
-#define PMOP_pmstash(o) PmopSTASH(o);
-B::HV
+void
PMOP_pmstash(o)
B::PMOP o
+ PPCODE:
+ PUSHs(make_sv_object(aTHX_ (SV *) PmopSTASH(o)));
#endif
#if PERL_VERSION < 9
-#define PMOP_pmnext(o) o->op_pmnext
-B::PMOP
+void
PMOP_pmnext(o)
B::PMOP o
+ PPCODE:
+ PUSHs(make_op_object(aTHX_ o->op_pmnext));
U32
PMOP_pmpermflags(o)
MODULE = B PACKAGE = B::PADOP
-B::SV
+void
sv(o)
B::PADOP o
+ PREINIT:
+ SV *ret;
ALIAS:
gv = 1
- CODE:
+ PPCODE:
/* It happens that the output typemaps for B::SV and B::GV are
identical. The "smarts" are in make_sv_object(), which determines
which class to use based on SvTYPE(), rather than anything baked in
at compile time. */
if (o->op_padix) {
- RETVAL = PAD_SVl(o->op_padix);
- if (ix && SvTYPE(RETVAL) != SVt_PVGV)
- RETVAL = NULL;
+ ret = PAD_SVl(o->op_padix);
+ if (ix && SvTYPE(ret) != SVt_PVGV)
+ ret = NULL;
} else {
- RETVAL = NULL;
+ ret = NULL;
}
- OUTPUT:
- RETVAL
+ PUSHs(make_sv_object(aTHX_ ret));
-MODULE = B PACKAGE = B::PVOP PREFIX = PVOP_
+MODULE = B PACKAGE = B::PVOP
void
-PVOP_pv(o)
+pv(o)
B::PVOP o
CODE:
/*
* OP_TRANS uses op_pv to point to a table of 256 or >=258 shorts
* whereas other PVOPs point to a null terminated string.
*/
- if (o->op_type == OP_TRANS &&
+ if ((o->op_type == OP_TRANS || o->op_type == OP_TRANSR) &&
(o->op_private & OPpTRANS_COMPLEMENT) &&
!(o->op_private & OPpTRANS_DELETE))
{
const short entries = 257 + tbl[256];
ST(0) = newSVpvn_flags(o->op_pv, entries * sizeof(short), SVs_TEMP);
}
- else if (o->op_type == OP_TRANS) {
+ else if (o->op_type == OP_TRANS || o->op_type == OP_TRANSR) {
ST(0) = newSVpvn_flags(o->op_pv, 256 * sizeof(short), SVs_TEMP);
}
else
# above (B::OP::next)
#ifdef USE_ITHREADS
-#define COP_stash(o) CopSTASH(o)
-#define COP_filegv(o) CopFILEGV(o)
-B::HV
+void
COP_stash(o)
B::COP o
-
-B::GV
-COP_filegv(o)
- B::COP o
+ ALIAS:
+ filegv = 1
+ PPCODE:
+ PUSHs(make_sv_object(aTHX_
+ ix ? (SV *)CopFILEGV(o) : (SV *)CopSTASH(o)));
#else
-#define COP_stashpv(o) CopSTASHPV(o)
-#define COP_file(o) CopFILE(o)
char *
COP_stashpv(o)
B::COP o
-
-char *
-COP_file(o)
- B::COP o
+ ALIAS:
+ file = 1
+ CODE:
+ RETVAL = ix ? CopFILE(o) : CopSTASHPV(o);
+ OUTPUT:
+ RETVAL
#endif
void
COP_warnings(o)
B::COP o
- PPCODE:
-#if PERL_VERSION >= 9
- ST(0) = make_warnings_object(aTHX_ o->cop_warnings);
-#else
- ST(0) = make_sv_object(aTHX_ NULL, o->cop_warnings);
-#endif
- XSRETURN(1);
-
-void
-COP_io(o)
- B::COP o
- PPCODE:
+ ALIAS:
+ io = 1
+ PPCODE:
#if PERL_VERSION >= 9
- ST(0) = make_cop_io_object(aTHX_ o);
+ ST(0) = ix ? make_cop_io_object(aTHX_ o) : make_warnings_object(aTHX_ o);
#else
- ST(0) = make_sv_object(aTHX_ NULL, o->cop_io);
+ ST(0) = make_sv_object(aTHX_ ix ? o->cop_io : o->cop_warnings);
#endif
XSRETURN(1);
#define PVMG_stash_ix sv_SVp | offsetof(struct xpvmg, xmg_stash)
#if PERL_VERSION >= 10
+# if PERL_VERSION > 14
+# define PVBM_useful_ix sv_I32p | offsetof(struct xpvgv, xnv_u.xbm_s.xbm_useful)
+# define PVBM_previous_ix sv_UVp | offsetof(struct xpvuv, xuv_uv)
+# else
#define PVBM_useful_ix sv_I32p | offsetof(struct xpvgv, xiv_u.xivu_i32)
#define PVBM_previous_ix sv_U32p | offsetof(struct xpvgv, xnv_u.xbm_s.xbm_previous)
+# endif
#define PVBM_rare_ix sv_U8p | offsetof(struct xpvgv, xnv_u.xbm_s.xbm_rare)
#else
#define PVBM_useful_ix sv_I32p | offsetof(struct xpvbm, xbm_useful)
ptr = (ix & 0xFFFF) + (char *)SvANY(sv);
switch ((U8)(ix >> 16)) {
case (U8)(sv_SVp >> 16):
- ret = make_sv_object(aTHX_ NULL, *((SV **)ptr));
+ ret = make_sv_object(aTHX_ *((SV **)ptr));
break;
case (U8)(sv_IVp >> 16):
ret = sv_2mortal(newSViv(*((IV *)ptr)));
case (U8)(sv_U16p >> 16):
ret = sv_2mortal(newSVuv(*((U16 *)ptr)));
break;
+ default:
+ croak("Illegal alias 0x%08x for B::*IVX", (unsigned)ix);
}
ST(0) = ret;
XSRETURN(1);
ST(0) = newSVpvn_flags((char *)&w, 4, SVs_TEMP);
}
-#if PERL_VERSION >= 11
-# The input typemap checking makes no distinction between different SV types,
-# so the XS body will generate the same C code, despite the different XS
-# "types". So there is no change in behaviour from doing newXS like this,
-# compared with the old approach of having a (near) duplicate XS body.
-# We should fix the typemap checking.
-
-BOOT:
- newXS("B::IV::RV", XS_B__PV_RV, __FILE__);
-
-#endif
-
MODULE = B PACKAGE = B::NV PREFIX = Sv
NV
MODULE = B PACKAGE = B::RV PREFIX = Sv
-B::SV
+void
SvRV(sv)
B::RV sv
+ PPCODE:
+ PUSHs(make_sv_object(aTHX_ SvRV(sv)));
-#endif
+#else
-MODULE = B PACKAGE = B::PV PREFIX = Sv
+MODULE = B PACKAGE = B::REGEXP
-char*
-SvPVX(sv)
- B::PV sv
+void
+REGEX(sv)
+ B::REGEXP sv
+ ALIAS:
+ precomp = 1
+ PPCODE:
+ if (ix) {
+ PUSHs(newSVpvn_flags(RX_PRECOMP(sv), RX_PRELEN(sv), SVs_TEMP));
+ } else {
+ dXSTARG;
+ /* FIXME - can we code this method more efficiently? */
+ PUSHi(PTR2IV(sv));
+ }
-B::SV
-SvRV(sv)
+#endif
+
+MODULE = B PACKAGE = B::PV
+
+void
+RV(sv)
B::PV sv
- CODE:
- if( SvROK(sv) ) {
- RETVAL = SvRV(sv);
- }
- else {
+ PPCODE:
+ if (!SvROK(sv))
croak( "argument is not SvROK" );
- }
- OUTPUT:
- RETVAL
+ PUSHs(make_sv_object(aTHX_ SvRV(sv)));
void
-SvPV(sv)
+PV(sv)
B::PV sv
+ ALIAS:
+ PVX = 1
+ PVBM = 2
+ B::BM::TABLE = 3
+ PREINIT:
+ const char *p;
+ STRLEN len = 0;
+ U32 utf8 = 0;
CODE:
- if( SvPOK(sv) ) {
- STRLEN len = SvCUR(sv);
- const char *p = SvPVX_const(sv);
+ if (ix == 3) {
+ p = SvPV(sv, len);
+ /* Boyer-Moore table is just after string and its safety-margin \0 */
+ p += len + PERL_FBM_TABLE_OFFSET;
+ len = 256;
+ } else if (ix == 2) {
+ /* This used to read 257. I think that that was buggy - should have
+ been 258. (The "\0", the flags byte, and 256 for the table.)
+ The only user of this method is B::Bytecode in B::PV::bsave.
+ I'm guessing that nothing tested the runtime correctness of
+ output of bytecompiled string constant arguments to index (etc).
+
+ Note the start pointer is and has always been SvPVX(sv), not
+ SvPVX(sv) + SvCUR(sv) PVBM was added in 651aa52ea1faa806, and
+ first used by the compiler in 651aa52ea1faa806. It's used to
+ get a "complete" dump of the buffer at SvPVX(), not just the
+ PVBM table. This permits the generated bytecode to "load"
+ SvPVX in "one" hit. */
+ p = SvPVX_const(sv);
+ len = SvCUR(sv) + (SvVALID(sv) ? 256 + PERL_FBM_TABLE_OFFSET : 0);
+ } else if (ix) {
+ p = SvPVX(sv);
+ len = strlen(p);
+ } else if (SvPOK(sv)) {
+ len = SvCUR(sv);
+ p = SvPVX_const(sv);
+ utf8 = SvUTF8(sv);
#if PERL_VERSION < 10
/* Before 5.10 (well 931b58fb28fa5ca7), PAD_COMPNAME_GEN was stored
in SvCUR(), which meant we had to attempt this special casing
to avoid tripping up over variable names in the pads. */
if((SvLEN(sv) && len >= SvLEN(sv))) {
/* It claims to be longer than the space allocated for it -
- presuambly it's a variable name in the pad */
+ presumably it's a variable name in the pad */
len = strlen(p);
}
#endif
- ST(0) = newSVpvn_flags(p, len, SVs_TEMP | SvUTF8(sv));
}
else {
/* XXX for backward compatibility, but should fail */
/* croak( "argument is not SvPOK" ); */
- ST(0) = sv_newmortal();
+ p = NULL;
}
+ ST(0) = newSVpvn_flags(p, len, SVs_TEMP | utf8);
-# This used to read 257. I think that that was buggy - should have been 258.
-# (The "\0", the flags byte, and 256 for the table. Not that anything
-# anywhere calls this method. NWC.
-void
-SvPVBM(sv)
- B::PV sv
- CODE:
- ST(0) = newSVpvn_flags(SvPVX_const(sv),
- SvCUR(sv) + (SvVALID(sv) ? 256 + PERL_FBM_TABLE_OFFSET : 0),
- SVs_TEMP);
-
-MODULE = B PACKAGE = B::PVMG PREFIX = Sv
+MODULE = B PACKAGE = B::PVMG
void
-SvMAGIC(sv)
+MAGIC(sv)
B::PVMG sv
MAGIC * mg = NO_INIT
PPCODE:
for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic)
XPUSHs(make_mg_object(aTHX_ mg));
-MODULE = B PACKAGE = B::REGEXP
-
-#if PERL_VERSION >= 11
-
-IV
-REGEX(sv)
- B::REGEXP sv
- CODE:
- /* FIXME - can we code this method more efficiently? */
- RETVAL = PTR2IV(sv);
- OUTPUT:
- RETVAL
+MODULE = B PACKAGE = B::MAGIC
-SV*
-precomp(sv)
- B::REGEXP sv
- CODE:
- RETVAL = newSVpvn( RX_PRECOMP(sv), RX_PRELEN(sv) );
- OUTPUT:
- RETVAL
-
-#endif
-
-#define MgMOREMAGIC(mg) mg->mg_moremagic
-#define MgPRIVATE(mg) mg->mg_private
-#define MgTYPE(mg) mg->mg_type
-#define MgFLAGS(mg) mg->mg_flags
-#define MgOBJ(mg) mg->mg_obj
-#define MgLENGTH(mg) mg->mg_len
-#define MgREGEX(mg) PTR2IV(mg->mg_obj)
-
-MODULE = B PACKAGE = B::MAGIC PREFIX = Mg
-
-B::MAGIC
-MgMOREMAGIC(mg)
- B::MAGIC mg
- CODE:
- if( MgMOREMAGIC(mg) ) {
- RETVAL = MgMOREMAGIC(mg);
- }
- else {
- XSRETURN_UNDEF;
- }
- OUTPUT:
- RETVAL
-
-U16
-MgPRIVATE(mg)
- B::MAGIC mg
-
-char
-MgTYPE(mg)
- B::MAGIC mg
-
-U8
-MgFLAGS(mg)
- B::MAGIC mg
-
-B::SV
-MgOBJ(mg)
- B::MAGIC mg
-
-IV
-MgREGEX(mg)
- B::MAGIC mg
- CODE:
- if(mg->mg_type == PERL_MAGIC_qr) {
- RETVAL = MgREGEX(mg);
- }
- else {
- croak( "REGEX is only meaningful on r-magic" );
- }
- OUTPUT:
- RETVAL
-
-SV*
-precomp(mg)
- B::MAGIC mg
- CODE:
- if (mg->mg_type == PERL_MAGIC_qr) {
- REGEXP* rx = (REGEXP*)mg->mg_obj;
- RETVAL = Nullsv;
- if( rx )
- RETVAL = newSVpvn( RX_PRECOMP(rx), RX_PRELEN(rx) );
- }
- else {
- croak( "precomp is only meaningful on r-magic" );
- }
- OUTPUT:
- RETVAL
-
-I32
-MgLENGTH(mg)
- B::MAGIC mg
-
void
-MgPTR(mg)
+MOREMAGIC(mg)
B::MAGIC mg
- CODE:
- if (mg->mg_ptr){
- if (mg->mg_len >= 0){
- ST(0) = newSVpvn_flags(mg->mg_ptr, mg->mg_len, SVs_TEMP);
+ ALIAS:
+ PRIVATE = 1
+ TYPE = 2
+ FLAGS = 3
+ LENGTH = 4
+ OBJ = 5
+ PTR = 6
+ REGEX = 7
+ precomp = 8
+ PPCODE:
+ switch (ix) {
+ case 0:
+ XPUSHs(mg->mg_moremagic ? make_mg_object(aTHX_ mg->mg_moremagic)
+ : &PL_sv_undef);
+ break;
+ case 1:
+ mPUSHu(mg->mg_private);
+ break;
+ case 2:
+ PUSHs(newSVpvn_flags(&(mg->mg_type), 1, SVs_TEMP));
+ break;
+ case 3:
+ mPUSHu(mg->mg_flags);
+ break;
+ case 4:
+ mPUSHi(mg->mg_len);
+ break;
+ case 5:
+ PUSHs(make_sv_object(aTHX_ mg->mg_obj));
+ break;
+ case 6:
+ if (mg->mg_ptr) {
+ if (mg->mg_len >= 0) {
+ PUSHs(newSVpvn_flags(mg->mg_ptr, mg->mg_len, SVs_TEMP));
} else if (mg->mg_len == HEf_SVKEY) {
- ST(0) = make_sv_object(aTHX_ NULL, (SV*)mg->mg_ptr);
+ PUSHs(make_sv_object(aTHX_ (SV*)mg->mg_ptr));
} else
- ST(0) = sv_newmortal();
- } else
- ST(0) = sv_newmortal();
-
-MODULE = B PACKAGE = B::BM PREFIX = Bm
-
-void
-BmTABLE(sv)
- B::BM sv
- STRLEN len = NO_INIT
- char * str = NO_INIT
- CODE:
- str = SvPV(sv, len);
- /* Boyer-Moore table is just after string and its safety-margin \0 */
- ST(0) = newSVpvn_flags(str + len + PERL_FBM_TABLE_OFFSET, 256, SVs_TEMP);
+ PUSHs(sv_newmortal());
+ } else
+ PUSHs(sv_newmortal());
+ break;
+ case 7:
+ if(mg->mg_type == PERL_MAGIC_qr) {
+ mPUSHi(PTR2IV(mg->mg_obj));
+ } else {
+ croak("REGEX is only meaningful on r-magic");
+ }
+ break;
+ case 8:
+ if (mg->mg_type == PERL_MAGIC_qr) {
+ REGEXP *rx = (REGEXP *)mg->mg_obj;
+ PUSHs(newSVpvn_flags(rx ? RX_PRECOMP(rx) : NULL,
+ rx ? RX_PRELEN(rx) : 0, SVs_TEMP));
+ } else {
+ croak( "precomp is only meaningful on r-magic" );
+ }
+ break;
+ }
MODULE = B PACKAGE = B::GV PREFIX = Gv
ptr = (ix & 0xFFFF) + (char *)gp;
switch ((U8)(ix >> 16)) {
case (U8)(SVp >> 16):
- ret = make_sv_object(aTHX_ NULL, *((SV **)ptr));
+ ret = make_sv_object(aTHX_ *((SV **)ptr));
break;
case (U8)(U32p >> 16):
ret = sv_2mortal(newSVuv(*((U32*)ptr)));
case (U8)(line_tp >> 16):
ret = sv_2mortal(newSVuv(*((line_t *)ptr)));
break;
+ default:
+ croak("Illegal alias 0x%08x for B::*SV", (unsigned)ix);
}
ST(0) = ret;
XSRETURN(1);
-B::GV
-GvFILEGV(gv)
+void
+FILEGV(gv)
B::GV gv
+ PPCODE:
+ PUSHs(make_sv_object(aTHX_ (SV *)GvFILEGV(gv)));
MODULE = B PACKAGE = B::IO PREFIX = Io
SV **svp = AvARRAY(av);
I32 i;
for (i = 0; i <= AvFILL(av); i++)
- XPUSHs(make_sv_object(aTHX_ NULL, svp[i]));
+ XPUSHs(make_sv_object(aTHX_ svp[i]));
}
void
int idx
PPCODE:
if (idx >= 0 && AvFILL(av) >= 0 && idx <= AvFILL(av))
- XPUSHs(make_sv_object(aTHX_ NULL, (AvARRAY(av)[idx])));
+ XPUSHs(make_sv_object(aTHX_ (AvARRAY(av)[idx])));
else
- XPUSHs(make_sv_object(aTHX_ NULL, NULL));
+ XPUSHs(make_sv_object(aTHX_ NULL));
#if PERL_VERSION < 9
CvCONST(cv)
B::CV cv
-B::OP
+void
CvSTART(cv)
B::CV cv
ALIAS:
ROOT = 1
- CODE:
- RETVAL = CvISXSUB(cv) ? NULL : ix ? CvROOT(cv) : CvSTART(cv);
- OUTPUT:
- RETVAL
+ PPCODE:
+ PUSHs(make_op_object(aTHX_ CvISXSUB(cv) ? NULL
+ : ix ? CvROOT(cv) : CvSTART(cv)));
void
CvXSUB(cv)
XSUBANY = 1
CODE:
ST(0) = ix && CvCONST(cv)
- ? make_sv_object(aTHX_ NULL, (SV *)CvXSUBANY(cv).any_ptr)
+ ? make_sv_object(aTHX_ (SV *)CvXSUBANY(cv).any_ptr)
: sv_2mortal(newSViv(CvISXSUB(cv)
? (ix ? CvXSUBANY(cv).any_iv
: PTR2IV(CvXSUB(cv)))
: 0));
-MODULE = B PACKAGE = B::CV PREFIX = cv_
-
-B::SV
-cv_const_sv(cv)
+void
+const_sv(cv)
B::CV cv
+ PPCODE:
+ PUSHs(make_sv_object(aTHX_ (SV *)cv_const_sv(cv)));
MODULE = B PACKAGE = B::HV PREFIX = Hv
B::PMOP
HvPMROOT(hv)
B::HV hv
+ PPCODE:
+ PUSHs(make_op_object(aTHX_ HvPMROOT(hv)));
#endif
HvARRAY(hv)
B::HV hv
PPCODE:
- if (HvKEYS(hv) > 0) {
+ if (HvUSEDKEYS(hv) > 0) {
SV *sv;
char *key;
I32 len;
(void)hv_iterinit(hv);
- EXTEND(sp, HvKEYS(hv) * 2);
+ EXTEND(sp, HvUSEDKEYS(hv) * 2);
while ((sv = hv_iternextsv(hv, &key, &len))) {
mPUSHp(key, len);
- PUSHs(make_sv_object(aTHX_ NULL, sv));
+ PUSHs(make_sv_object(aTHX_ sv));
}
}
MODULE = B PACKAGE = B::HE PREFIX = He
-B::SV
+void
HeVAL(he)
B::HE he
ALIAS:
SVKEY_force = 1
- CODE:
- RETVAL = ix ? HeSVKEY_force(he) : HeVAL(he);
- OUTPUT:
- RETVAL
+ PPCODE:
+ PUSHs(make_sv_object(aTHX_ ix ? HeSVKEY_force(he) : HeVAL(he)));
U32
HeHASH(he)
B::HE he
-MODULE = B PACKAGE = B::RHE PREFIX = RHE_
+MODULE = B PACKAGE = B::RHE
#if PERL_VERSION >= 9
SV*
-RHE_HASH(h)
+HASH(h)
B::RHE h
CODE:
RETVAL = newRV( (SV*)cophh_2hv(h, 0) );
https://perl5.git.perl.org / perl5.git / blobdiff