# define SvREFCNT_inc_simple_void(sv) SvREFCNT_inc(sv)
#endif
+#ifndef GvCV_set
+# define GvCV_set(G, C) (GvCV(G) = (C))
+#endif
+
#ifndef HvNAME_get
# define HvNAME_get(H) HvNAME(H)
#endif
#endif
#define SU_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
+#define SU_HAS_PERL_EXACT(R, V, S) ((PERL_REVISION == (R)) && (PERL_VERSION == (V)) && (PERL_SUBVERSION == (S)))
/* --- Threads and multiplicity -------------------------------------------- */
# define MY_CXT_CLONE NOOP
#endif
+/* --- Global data --------------------------------------------------------- */
+
+#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
+
+typedef struct {
+ char *stack_placeholder;
+ I32 cxix;
+ I32 items;
+ SV **savesp;
+ LISTOP return_op;
+ OP proxy_op;
+} my_cxt_t;
+
+START_MY_CXT
+
/* --- Stack manipulations ------------------------------------------------- */
+#define SU_SAVE_PLACEHOLDER() save_pptr(&MY_CXT.stack_placeholder)
+
+#define SU_SAVE_DESTRUCTOR_SIZE 3
+#define SU_SAVE_PLACEHOLDER_SIZE 3
+
+#define SU_SAVE_SCALAR_SIZE 3
+
+#define SU_SAVE_ARY_SIZE 3
+#define SU_SAVE_AELEM_SIZE 4
+#ifdef SAVEADELETE
+# define SU_SAVE_ADELETE_SIZE 3
+#else
+# define SU_SAVE_ADELETE_SIZE SU_SAVE_DESTRUCTOR_SIZE
+#endif
+#if SU_SAVE_AELEM_SIZE < SU_SAVE_ADELETE_SIZE
+# define SU_SAVE_AELEM_OR_ADELETE_SIZE SU_SAVE_ADELETE_SIZE
+#else
+# define SU_SAVE_AELEM_OR_ADELETE_SIZE SU_SAVE_AELEM_SIZE
+#endif
+
+#define SU_SAVE_HASH_SIZE 3
+#define SU_SAVE_HELEM_SIZE 4
+#define SU_SAVE_HDELETE_SIZE 4
+#if SU_SAVE_HELEM_SIZE < SU_SAVE_HDELETE_SIZE
+# define SU_SAVE_HELEM_OR_HDELETE_SIZE SU_SAVE_HDELETE_SIZE
+#else
+# define SU_SAVE_HELEM_OR_HDELETE_SIZE SU_SAVE_HELEM_SIZE
+#endif
+
+#define SU_SAVE_GVCV_SIZE SU_SAVE_DESTRUCTOR_SIZE
+
+#if !SU_HAS_PERL(5, 8, 9)
+# define SU_SAVE_GP_SIZE 6
+#elif !SU_HAS_PERL(5, 13, 0) || (SU_RELEASE && SU_HAS_PERL_EXACT(5, 13, 0))
+# define SU_SAVE_GP_SIZE 3
+#elif !SU_HAS_PERL(5, 13, 8)
+# define SU_SAVE_GP_SIZE 4
+#else
+# define SU_SAVE_GP_SIZE 3
+#endif
+
#ifndef SvCANEXISTDELETE
# define SvCANEXISTDELETE(sv) \
(!SvRMAGICAL(sv) \
}
}
+/* ... Saving code slots from a glob ....................................... */
+
+#if !SU_HAS_PERL(5, 10, 0) && !defined(mro_method_changed_in)
+# define mro_method_changed_in(G) PL_sub_generation++
+#endif
+
+typedef struct {
+ GV *gv;
+ CV *old_cv;
+} su_save_gvcv_ud;
+
+STATIC void su_restore_gvcv(pTHX_ void *ud_) {
+ su_save_gvcv_ud *ud = ud_;
+ GV *gv = ud->gv;
+
+ GvCV_set(gv, ud->old_cv);
+ GvCVGEN(gv) = 0;
+ mro_method_changed_in(GvSTASH(gv));
+
+ Safefree(ud);
+}
+
+STATIC void su_save_gvcv(pTHX_ GV *gv) {
+#define su_save_gvcv(G) su_save_gvcv(aTHX_ (G))
+ su_save_gvcv_ud *ud;
+
+ Newx(ud, 1, su_save_gvcv_ud);
+ ud->gv = gv;
+ ud->old_cv = GvCV(gv);
+
+ GvCV_set(gv, NULL);
+ GvCVGEN(gv) = 0;
+ mro_method_changed_in(GvSTASH(gv));
+
+ SAVEDESTRUCTOR_X(su_restore_gvcv, ud);
+}
+
/* --- Actions ------------------------------------------------------------- */
typedef struct {
I32 depth;
+ I32 pad;
I32 *origin;
void (*handler)(pTHX_ void *);
} su_ud_common;
#define SU_UD_DEPTH(U) (((su_ud_common *) (U))->depth)
+#define SU_UD_PAD(U) (((su_ud_common *) (U))->pad)
#define SU_UD_ORIGIN(U) (((su_ud_common *) (U))->origin)
#define SU_UD_HANDLER(U) (((su_ud_common *) (U))->handler)
su_ud_reap *ud = (su_ud_reap *) ud_;
#if SU_HAS_PERL(5, 9, 5)
PERL_CONTEXT saved_cx;
- I32 dieing = PL_op->op_type == OP_DIE;
I32 cxix;
#endif
* the sub scope from call_sv, although it's still needed in our caller. */
#if SU_HAS_PERL(5, 9, 5)
- if (dieing) {
- if (cxstack_ix < cxstack_max)
- cxix = cxstack_ix + 1;
- else
- cxix = Perl_cxinc(aTHX);
- saved_cx = cxstack[cxix];
- }
+ if (cxstack_ix < cxstack_max)
+ cxix = cxstack_ix + 1;
+ else
+ cxix = Perl_cxinc(aTHX);
+ saved_cx = cxstack[cxix];
#endif
call_sv(ud->cb, G_VOID);
#if SU_HAS_PERL(5, 9, 5)
- if (dieing)
- cxstack[cxix] = saved_cx;
+ cxstack[cxix] = saved_cx;
#endif
PUTBACK;
svtype type;
} su_ud_localize;
-STATIC void su_ud_localize_init(pTHX_ su_ud_localize *ud, SV *sv, SV *val, SV *elem) {
+#define SU_UD_LOCALIZE_FREE(U) STMT_START { \
+ SvREFCNT_dec((U)->elem); \
+ SvREFCNT_dec((U)->val); \
+ SvREFCNT_dec((U)->sv); \
+ SU_UD_FREE(U); \
+} STMT_END
+
+STATIC I32 su_ud_localize_init(pTHX_ su_ud_localize *ud, SV *sv, SV *val, SV *elem) {
#define su_ud_localize_init(UD, S, V, E) su_ud_localize_init(aTHX_ (UD), (S), (V), (E))
UV deref = 0;
svtype t = SVt_NULL;
+ I32 size;
SvREFCNT_inc_simple_void(sv);
t = SvTYPE(SvRV(val));
deref = 1;
}
+ } else if (SvROK(sv)) {
+ croak("Invalid %s reference as the localization target",
+ sv_reftype(SvRV(sv), 0));
} else {
STRLEN len, l;
const char *p = SvPV_const(sv, len), *s;
switch (t) {
case SVt_PVAV:
+ size = elem ? SU_SAVE_AELEM_OR_ADELETE_SIZE
+ : SU_SAVE_ARY_SIZE;
+ deref = 0;
+ break;
case SVt_PVHV:
- case SVt_PVCV:
+ size = elem ? SU_SAVE_HELEM_OR_HDELETE_SIZE
+ : SU_SAVE_HASH_SIZE;
+ deref = 0;
+ break;
case SVt_PVGV:
+ size = SU_SAVE_GP_SIZE;
deref = 0;
+ break;
+ case SVt_PVCV:
+ size = SU_SAVE_GVCV_SIZE;
+ deref = 0;
+ break;
default:
+ size = SU_SAVE_SCALAR_SIZE;
break;
}
/* When deref is set, val isn't NULL */
ud->val = val ? newSVsv(deref ? SvRV(val) : val) : NULL;
ud->elem = SvREFCNT_inc(elem);
ud->type = t;
+
+ return size;
}
STATIC void su_localize(pTHX_ void *ud_) {
gv = (GV *) sv;
} else {
#ifdef gv_fetchsv
- gv = gv_fetchsv(sv, GV_ADDMULTI, SVt_PVGV);
+ gv = gv_fetchsv(sv, GV_ADDMULTI, t);
#else
STRLEN len;
const char *name = SvPV_const(sv, len);
- gv = gv_fetchpvn_flags(name, len, GV_ADDMULTI, SVt_PVGV);
+ gv = gv_fetchpvn_flags(name, len, GV_ADDMULTI, t);
#endif
}
save_gp(gv, 1); /* hide previous entry in symtab */
break;
case SVt_PVCV:
- SAVESPTR(GvCV(gv));
- GvCV(gv) = NULL;
+ su_save_gvcv(gv);
break;
default:
gv = (GV *) save_scalar(gv);
SvSetMagicSV((SV *) gv, val);
done:
- SvREFCNT_dec(ud->elem);
- SvREFCNT_dec(ud->val);
- SvREFCNT_dec(ud->sv);
- SU_UD_FREE(ud);
+ SU_UD_LOCALIZE_FREE(ud);
}
/* --- Pop a context back -------------------------------------------------- */
SU_UD_DEPTH(ud) = --depth;
if (depth > 0) {
- I32 i = 1;
-
- SAVEDESTRUCTOR_X(su_pop, ud);
-
- /* Skip depths corresponding to scopes for which leave_scope() might not be
- * called. */
- while (depth > 1 && PL_scopestack_ix >= i) {
- I32 j = PL_scopestack[PL_scopestack_ix - i];
-
- if (j < PL_savestack_ix)
- break;
-
- SU_D(PerlIO_printf(Perl_debug_log,
- "%p: skip scope%*cat depth=%2d scope_ix=%2d new_top=%2d >= cur_base=%2d\n",
- ud, 6, ' ', depth, PL_scopestack_ix - i, j, PL_savestack_ix));
-
- SU_UD_DEPTH(ud) = --depth;
-
- ++i;
+ I32 pad;
+
+ if ((pad = SU_UD_PAD(ud))) {
+ dMY_CXT;
+ do {
+ SU_D(PerlIO_printf(Perl_debug_log,
+ "%p: push a pad slot at depth=%2d scope_ix=%2d save_ix=%2d\n",
+ ud, depth, PL_scopestack_ix, PL_savestack_ix));
+ SU_SAVE_PLACEHOLDER();
+ } while (--pad);
}
SU_D(PerlIO_printf(Perl_debug_log,
- "%p: set destructor at depth=%2d scope_ix=%2d save_ix=%2d\n",
- ud, depth, PL_scopestack_ix, PL_savestack_ix));
+ "%p: push destructor at depth=%2d scope_ix=%2d save_ix=%2d\n",
+ ud, depth, PL_scopestack_ix, PL_savestack_ix));
+ SAVEDESTRUCTOR_X(su_pop, ud);
} else {
SU_UD_HANDLER(ud)(aTHX_ ud);
}
ud, PL_savestack_ix, PL_scopestack[PL_scopestack_ix]));
}
-/* --- Global data --------------------------------------------------------- */
-
-#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
-
-typedef struct {
- int stack_placeholder;
- I32 cxix;
- I32 items;
- SV **savesp;
- OP fakeop;
-} my_cxt_t;
-
-START_MY_CXT
-
/* --- Initialize the stack and the action userdata ------------------------ */
-STATIC I32 su_init(pTHX_ I32 cxix, void *ud, I32 size) {
-#define su_init(L, U, S) su_init(aTHX_ (L), (U), (S))
- I32 i, depth = 1, *origin;
+STATIC I32 su_init(pTHX_ void *ud, I32 cxix, I32 size) {
+#define su_init(U, C, S) su_init(aTHX_ (U), (C), (S))
+ I32 i, depth = 1, pad, offset, *origin;
SU_D(PerlIO_printf(Perl_debug_log, "%p: ### init for cx %d\n", ud, cxix));
+ if (size <= SU_SAVE_DESTRUCTOR_SIZE)
+ pad = 0;
+ else {
+ I32 extra = size - SU_SAVE_DESTRUCTOR_SIZE;
+ pad = extra / SU_SAVE_PLACEHOLDER_SIZE;
+ if (extra % SU_SAVE_PLACEHOLDER_SIZE)
+ ++pad;
+ }
+ offset = SU_SAVE_DESTRUCTOR_SIZE + SU_SAVE_PLACEHOLDER_SIZE * pad;
+
+ SU_D(PerlIO_printf(Perl_debug_log, "%p: size=%d pad=%d offset=%d\n",
+ ud, size, pad, offset));
+
for (i = cxstack_ix; i > cxix; --i) {
PERL_CONTEXT *cx = cxstack + i;
switch (CxTYPE(cx)) {
break;
}
}
- SU_D(PerlIO_printf(Perl_debug_log, "%p: depth is %d\n", ud, depth));
+ SU_D(PerlIO_printf(Perl_debug_log, "%p: going down to depth %d\n", ud, depth));
Newx(origin, depth + 1, I32);
origin[0] = PL_scopestack[PL_scopestack_ix - depth];
for (i = depth - 1; i >= 1; --i) {
I32 j = PL_scopestack_ix - i;
origin[depth - i] = PL_scopestack[j];
- PL_scopestack[j] += 3;
+ PL_scopestack[j] += offset;
}
origin[depth] = PL_savestack_ix;
SU_UD_ORIGIN(ud) = origin;
SU_UD_DEPTH(ud) = depth;
-
- SU_D(PerlIO_printf(Perl_debug_log,
- "%p: set original destructor at depth=%2d scope_ix=%2d save_ix=%2d\n",
- ud, depth, PL_scopestack_ix - 1, PL_savestack_ix));
+ SU_UD_PAD(ud) = pad;
/* Make sure the first destructor fires by pushing enough fake slots on the
* stack. */
- if (PL_savestack_ix + 3 <= PL_scopestack[PL_scopestack_ix - 1]) {
+ if (PL_savestack_ix + SU_SAVE_DESTRUCTOR_SIZE
+ <= PL_scopestack[PL_scopestack_ix - 1]) {
dMY_CXT;
do {
- save_int(&MY_CXT.stack_placeholder);
- } while (PL_savestack_ix + 3 <= PL_scopestack[PL_scopestack_ix - 1]);
+ SU_D(PerlIO_printf(Perl_debug_log,
+ "%p: push a fake slot at scope_ix=%2d save_ix=%2d\n",
+ ud, PL_scopestack_ix, PL_savestack_ix));
+ SU_SAVE_PLACEHOLDER();
+ } while (PL_savestack_ix + SU_SAVE_DESTRUCTOR_SIZE
+ <= PL_scopestack[PL_scopestack_ix - 1]);
}
-
+ SU_D(PerlIO_printf(Perl_debug_log,
+ "%p: push first destructor at scope_ix=%2d save_ix=%2d\n",
+ ud, PL_scopestack_ix, PL_savestack_ix));
SAVEDESTRUCTOR_X(su_pop, ud);
SU_D({
items, PL_stack_sp - PL_stack_base, *PL_markstack_ptr, mark);
});
- PL_op = PL_ppaddr[OP_RETURN](aTHX);
+ PL_op = (OP *) &(MY_CXT.return_op);
+ PL_op = PL_op->op_ppaddr(aTHX);
+
*PL_markstack_ptr = mark;
- MY_CXT.fakeop.op_next = PL_op;
- PL_op = &(MY_CXT.fakeop);
+ MY_CXT.proxy_op.op_next = PL_op;
+ PL_op = &(MY_CXT.proxy_op);
}
/* --- XS ------------------------------------------------------------------ */
HV *stash;
MY_CXT_INIT;
- MY_CXT.stack_placeholder = 0;
+
+ MY_CXT.stack_placeholder = NULL;
+
+ /* NewOp() calls calloc() which just zeroes the memory with memset(). */
+ Zero(&(MY_CXT.return_op), 1, sizeof(MY_CXT.return_op));
+ MY_CXT.return_op.op_type = OP_RETURN;
+ MY_CXT.return_op.op_ppaddr = PL_ppaddr[OP_RETURN];
+
+ Zero(&(MY_CXT.proxy_op), 1, sizeof(MY_CXT.proxy_op));
+ MY_CXT.proxy_op.op_type = OP_STUB;
+ MY_CXT.proxy_op.op_ppaddr = NULL;
stash = gv_stashpv(__PACKAGE__, 1);
newCONSTSUB(stash, "TOP", newSViv(0));
void
CLONE(...)
PROTOTYPE: DISABLE
-CODE:
- PERL_UNUSED_VAR(items);
+PPCODE:
{
MY_CXT_CLONE;
}
+ XSRETURN(0);
#endif /* SU_THREADSAFE */
SU_UD_ORIGIN(ud) = NULL;
SU_UD_HANDLER(ud) = su_reap;
ud->cb = newSVsv(hook);
- su_init(cxix, ud, 3);
+ su_init(ud, cxix, SU_SAVE_DESTRUCTOR_SIZE);
void
localize(SV *sv, SV *val, ...)
PROTOTYPE: $$;$
PREINIT:
I32 cxix;
- I32 size = 3;
+ I32 size;
su_ud_localize *ud;
CODE:
SU_GET_CONTEXT(2, 2);
Newx(ud, 1, su_ud_localize);
SU_UD_ORIGIN(ud) = NULL;
SU_UD_HANDLER(ud) = su_localize;
- su_ud_localize_init(ud, sv, val, NULL);
-#if !SU_HAS_PERL(5, 8, 9)
- if (ud->type >= SVt_PVGV)
- size = 6;
-#endif
- su_init(cxix, ud, size);
+ size = su_ud_localize_init(ud, sv, val, NULL);
+ su_init(ud, cxix, size);
void
localize_elem(SV *sv, SV *elem, SV *val, ...)
PROTOTYPE: $$$;$
PREINIT:
I32 cxix;
+ I32 size;
su_ud_localize *ud;
CODE:
+ if (SvTYPE(sv) >= SVt_PVGV)
+ croak("Can't infer the element localization type from a glob and the value");
SU_GET_CONTEXT(3, 3);
Newx(ud, 1, su_ud_localize);
SU_UD_ORIGIN(ud) = NULL;
SU_UD_HANDLER(ud) = su_localize;
- su_ud_localize_init(ud, sv, val, elem);
- su_init(cxix, ud, 4);
+ size = su_ud_localize_init(ud, sv, val, elem);
+ if (ud->type != SVt_PVAV && ud->type != SVt_PVHV) {
+ SU_UD_LOCALIZE_FREE(ud);
+ croak("Can't localize an element of something that isn't an array or a hash");
+ }
+ su_init(ud, cxix, size);
void
localize_delete(SV *sv, SV *elem, ...)
PROTOTYPE: $$;$
PREINIT:
I32 cxix;
- I32 size = 4;
+ I32 size;
su_ud_localize *ud;
CODE:
SU_GET_CONTEXT(2, 2);
Newx(ud, 1, su_ud_localize);
SU_UD_ORIGIN(ud) = NULL;
SU_UD_HANDLER(ud) = su_localize;
- su_ud_localize_init(ud, sv, NULL, elem);
-#if !SU_HAS_PERL(5, 8, 9)
- if (ud->type >= SVt_PVGV)
- size = 6;
-#endif
- su_init(cxix, ud, size);
+ size = su_ud_localize_init(ud, sv, NULL, elem);
+ su_init(ud, cxix, size);
projects / perl / modules / Scope-Upper.git / blobdiff