X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FLexical-Types.git;a=blobdiff_plain;f=Types.xs;fp=Types.xs;h=7629733c1085416c1312e3f3b9d263a753748107;hp=20963ee6764cab9ac3e95cb47ce0870637e92f9b;hb=30d9da627f7321ff834ee9a53ef8fb508eda2be5;hpb=12b1d673a4194d57b87cf9e5d9c0b96c9da28ba6 diff --git a/Types.xs b/Types.xs index 20963ee..7629733 100644 --- a/Types.xs +++ b/Types.xs @@ -6,540 +6,63 @@ #include "perl.h" #include "XSUB.h" -#define __PACKAGE__ "Lexical::Types" -#define __PACKAGE_LEN__ (sizeof(__PACKAGE__)-1) +/* --- XS helpers ---------------------------------------------------------- */ -/* --- Compatibility wrappers ---------------------------------------------- */ - -#define LT_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S)))))) - -#if LT_HAS_PERL(5, 10, 0) || defined(PL_parser) -# ifndef PL_in_my_stash -# define PL_in_my_stash PL_parser->in_my_stash -# endif -#else -# ifndef PL_in_my_stash -# define PL_in_my_stash PL_Iin_my_stash -# endif -#endif - -#ifndef LT_WORKAROUND_REQUIRE_PROPAGATION -# define LT_WORKAROUND_REQUIRE_PROPAGATION !LT_HAS_PERL(5, 10, 1) -#endif - -#ifndef LT_HAS_RPEEP -# define LT_HAS_RPEEP LT_HAS_PERL(5, 13, 5) -#endif - -#ifndef HvNAME_get -# define HvNAME_get(H) HvNAME(H) -#endif - -#ifndef HvNAMELEN_get -# define HvNAMELEN_get(H) strlen(HvNAME_get(H)) -#endif - -#ifndef OpSIBLING -# ifdef OP_SIBLING -# define OpSIBLING(O) OP_SIBLING(O) -# else -# define OpSIBLING(O) ((O)->op_sibling) -# endif -#endif - -#ifndef SvREFCNT_inc_simple_void_NN -# define SvREFCNT_inc_simple_void_NN(S) ((void) SvREFCNT_inc(S)) -#endif - -#ifdef DEBUGGING -# define LT_ASSERT(C) assert(C) -#else -# define LT_ASSERT(C) -#endif - -/* ... Thread safety and multiplicity ...................................... */ - -/* Safe unless stated otherwise in Makefile.PL */ -#ifndef LT_FORKSAFE -# define LT_FORKSAFE 1 -#endif - -#ifndef LT_MULTIPLICITY -# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT) -# define LT_MULTIPLICITY 1 -# else -# define LT_MULTIPLICITY 0 -# endif -#endif - -#ifndef tTHX -# define tTHX PerlInterpreter* -#endif - -#if LT_MULTIPLICITY && defined(USE_ITHREADS) && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV)) -# define LT_THREADSAFE 1 -# ifndef MY_CXT_CLONE -# define MY_CXT_CLONE \ - dMY_CXT_SV; \ - my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1)); \ - Copy(INT2PTR(my_cxt_t*, SvUV(my_cxt_sv)), my_cxtp, 1, my_cxt_t); \ - sv_setuv(my_cxt_sv, PTR2UV(my_cxtp)) -# endif -#else -# define LT_THREADSAFE 0 -# undef dMY_CXT -# define dMY_CXT dNOOP -# undef MY_CXT -# define MY_CXT lt_globaldata -# undef START_MY_CXT -# define START_MY_CXT static my_cxt_t MY_CXT; -# undef MY_CXT_INIT -# define MY_CXT_INIT NOOP -# undef MY_CXT_CLONE -# define MY_CXT_CLONE NOOP -# undef pMY_CXT -# define pMY_CXT -# undef pMY_CXT_ -# define pMY_CXT_ -# undef aMY_CXT -# define aMY_CXT -# undef aMY_CXT_ -# define aMY_CXT_ -#endif - -#if LT_THREADSAFE -/* We must use preexistent global mutexes or we will never be able to destroy - * them. */ -# if LT_HAS_PERL(5, 9, 3) -# define LT_LOADED_LOCK MUTEX_LOCK(&PL_my_ctx_mutex) -# define LT_LOADED_UNLOCK MUTEX_UNLOCK(&PL_my_ctx_mutex) -# else -# define LT_LOADED_LOCK OP_REFCNT_LOCK -# define LT_LOADED_UNLOCK OP_REFCNT_UNLOCK -# endif -#else -# define LT_LOADED_LOCK NOOP -# define LT_LOADED_UNLOCK NOOP -#endif - -#if defined(OP_CHECK_MUTEX_LOCK) && defined(OP_CHECK_MUTEX_UNLOCK) -# define LT_CHECK_LOCK OP_CHECK_MUTEX_LOCK -# define LT_CHECK_UNLOCK OP_CHECK_MUTEX_UNLOCK -#elif LT_HAS_PERL(5, 9, 3) -# define LT_CHECK_LOCK OP_REFCNT_LOCK -# define LT_CHECK_UNLOCK OP_REFCNT_UNLOCK -#else -/* Before perl 5.9.3, lt_ck_*() calls are already protected by the LT_LOADED - * mutex, which falls back to the OP_REFCNT mutex. Make sure we don't lock it - * twice. */ -# define LT_CHECK_LOCK NOOP -# define LT_CHECK_UNLOCK NOOP -#endif - -typedef OP *(*lt_ck_t)(pTHX_ OP *); - -#ifdef wrap_op_checker - -# define lt_ck_replace(T, NC, OCP) wrap_op_checker((T), (NC), (OCP)) - -#else - -static void lt_ck_replace(pTHX_ OPCODE type, lt_ck_t new_ck, lt_ck_t *old_ck_p){ -#define lt_ck_replace(T, NC, OCP) lt_ck_replace(aTHX_ (T), (NC), (OCP)) - LT_CHECK_LOCK; - if (!*old_ck_p) { - *old_ck_p = PL_check[type]; - PL_check[type] = new_ck; - } - LT_CHECK_UNLOCK; -} - -#endif - -static void lt_ck_restore(pTHX_ OPCODE type, lt_ck_t *old_ck_p) { -#define lt_ck_restore(T, OCP) lt_ck_restore(aTHX_ (T), (OCP)) - LT_CHECK_LOCK; - if (*old_ck_p) { - PL_check[type] = *old_ck_p; - *old_ck_p = 0; - } - LT_CHECK_UNLOCK; -} - -/* --- Helpers ------------------------------------------------------------- */ - -/* ... Check if the module is loaded ....................................... */ - -static I32 lt_loaded = 0; - -#if LT_THREADSAFE - -#define PTABLE_NAME ptable_loaded -#define PTABLE_NEED_DELETE 1 -#define PTABLE_NEED_WALK 0 - -#include "ptable.h" - -#define ptable_loaded_store(T, K, V) ptable_loaded_store(aPTBLMS_ (T), (K), (V)) -#define ptable_loaded_delete(T, K) ptable_loaded_delete(aPTBLMS_ (T), (K)) -#define ptable_loaded_free(T) ptable_loaded_free(aPTBLMS_ (T)) - -static ptable *lt_loaded_cxts = NULL; - -#ifdef DEBUGGING - -static int lt_is_loaded(pTHX_ void *cxt) { -#define lt_is_loaded(C) lt_is_loaded(aTHX_ (C)) - int res = 0; - - LT_LOADED_LOCK; - if (lt_loaded_cxts && ptable_fetch(lt_loaded_cxts, cxt)) - res = 1; - LT_LOADED_UNLOCK; - - return res; -} - -#endif /* DEBUGGING */ - -static int lt_set_loaded_locked(pTHX_ void *cxt) { -#define lt_set_loaded_locked(C) lt_set_loaded_locked(aTHX_ (C)) - int global_setup = 0; - - if (lt_loaded <= 0) { - LT_ASSERT(lt_loaded == 0); - LT_ASSERT(!lt_loaded_cxts); - lt_loaded_cxts = ptable_new(); - global_setup = 1; - } - ++lt_loaded; - LT_ASSERT(lt_loaded_cxts); - ptable_loaded_store(lt_loaded_cxts, cxt, cxt); - - return global_setup; -} - -static int lt_clear_loaded_locked(pTHX_ void *cxt) { -#define lt_clear_loaded_locked(C) lt_clear_loaded_locked(aTHX_ (C)) - int global_teardown = 0; - - if (lt_loaded > 1) { - LT_ASSERT(lt_loaded_cxts); - ptable_loaded_delete(lt_loaded_cxts, cxt); - --lt_loaded; - } else if (lt_loaded_cxts) { - LT_ASSERT(lt_loaded == 1); - ptable_loaded_free(lt_loaded_cxts); - lt_loaded_cxts = NULL; - lt_loaded = 0; - global_teardown = 1; - } - - return global_teardown; -} - -#else - -#define lt_is_loaded(C) (lt_loaded > 0) -#define lt_set_loaded_locked(C) ((lt_loaded++ <= 0) ? 1 : 0) -#define lt_clear_loaded_locked(C) ((--lt_loaded <= 0) ? 1 : 0) - -#endif - -/* ... Thread-safe hints ................................................... */ - -#if LT_WORKAROUND_REQUIRE_PROPAGATION - -typedef struct { - SV *code; - IV require_tag; -} lt_hint_t; - -#define LT_HINT_STRUCT 1 - -#define LT_HINT_CODE(H) ((H)->code) - -#define LT_HINT_FREE(H) { \ - lt_hint_t *h = (H); \ - SvREFCNT_dec(h->code); \ - PerlMemShared_free(h); \ -} - -#else /* LT_WORKAROUND_REQUIRE_PROPAGATION */ - -typedef SV lt_hint_t; - -#define LT_HINT_STRUCT 0 - -#define LT_HINT_CODE(H) (H) - -#define LT_HINT_FREE(H) SvREFCNT_dec(H); - -#endif /* !LT_WORKAROUND_REQUIRE_PROPAGATION */ - -#if LT_THREADSAFE - -#define PTABLE_NAME ptable_hints -#define PTABLE_VAL_FREE(V) LT_HINT_FREE(V) -#define PTABLE_NEED_DELETE 0 -#define PTABLE_NEED_WALK 1 - -#define pPTBL pTHX -#define pPTBL_ pTHX_ -#define aPTBL aTHX -#define aPTBL_ aTHX_ - -#include "ptable.h" - -#define ptable_hints_store(T, K, V) ptable_hints_store(aTHX_ (T), (K), (V)) -#define ptable_hints_free(T) ptable_hints_free(aTHX_ (T)) - -#endif /* LT_THREADSAFE */ - -/* ... "Seen" pointer table ................................................ */ - -#define PTABLE_NAME ptable_seen -#define PTABLE_NEED_DELETE 0 -#define PTABLE_NEED_WALK 0 - -#include "ptable.h" - -/* PerlMemShared_free() needs the [ap]PTBLMS_? default values */ -#define ptable_seen_store(T, K, V) ptable_seen_store(aPTBLMS_ (T), (K), (V)) -#define ptable_seen_clear(T) ptable_seen_clear(aPTBLMS_ (T)) -#define ptable_seen_free(T) ptable_seen_free(aPTBLMS_ (T)) +#define XSH_PACKAGE "Lexical::Types" -/* ... Global data ......................................................... */ +#include "xsh/caps.h" +#include "xsh/util.h" +#include "xsh/ops.h" +#include "xsh/peep.h" -#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION +/* ... Lexical hints ....................................................... */ -typedef struct { - peep_t old_peep; - ptable *seen; /* It really is a ptable_seen */ -#if LT_THREADSAFE - ptable *tbl; /* It really is a ptable_hints */ - tTHX owner; -#endif - SV *default_meth; -} my_cxt_t; +#define XSH_HINTS_TYPE_SV 1 -START_MY_CXT +#include "xsh/hints.h" -/* ... Cloning global data ................................................. */ +#define lt_hint() xsh_hints_detag(xsh_hints_fetch()) -#if LT_THREADSAFE +/* ... Thread-local storage ................................................ */ typedef struct { - ptable *tbl; -#if LT_HAS_PERL(5, 13, 2) - CLONE_PARAMS *params; -#else - CLONE_PARAMS params; -#endif -} lt_ptable_clone_ud; - -#if LT_HAS_PERL(5, 13, 2) -# define lt_ptable_clone_ud_init(U, T, O) \ - (U).tbl = (T); \ - (U).params = Perl_clone_params_new((O), aTHX) -# define lt_ptable_clone_ud_deinit(U) Perl_clone_params_del((U).params) -# define lt_dup_inc(S, U) SvREFCNT_inc(sv_dup((S), (U)->params)) -#else -# define lt_ptable_clone_ud_init(U, T, O) \ - (U).tbl = (T); \ - (U).params.stashes = newAV(); \ - (U).params.flags = 0; \ - (U).params.proto_perl = (O) -# define lt_ptable_clone_ud_deinit(U) SvREFCNT_dec((U).params.stashes) -# define lt_dup_inc(S, U) SvREFCNT_inc(sv_dup((S), &((U)->params))) -#endif - -static void lt_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) { - lt_ptable_clone_ud *ud = ud_; - lt_hint_t *h1 = ent->val; - lt_hint_t *h2; - -#if LT_HINT_STRUCT - - h2 = PerlMemShared_malloc(sizeof *h2); - h2->code = lt_dup_inc(h1->code, ud); -#if LT_WORKAROUND_REQUIRE_PROPAGATION - h2->require_tag = PTR2IV(lt_dup_inc(INT2PTR(SV *, h1->require_tag), ud)); -#endif - -#else /* LT_HINT_STRUCT */ - - h2 = lt_dup_inc(h1, ud); - -#endif /* !LT_HINT_STRUCT */ - - ptable_hints_store(ud->tbl, ent->key, h2); -} + SV *default_meth; +} xsh_user_cxt_t; -#endif /* LT_THREADSAFE */ +#define XSH_THREADS_COMPILE_TIME_PROTECTION 1 +#define XSH_THREADS_USER_CLONE_NEEDS_DUP 1 -/* ... Hint tags ........................................................... */ - -#if LT_WORKAROUND_REQUIRE_PROPAGATION - -static IV lt_require_tag(pTHX) { -#define lt_require_tag() lt_require_tag(aTHX) - const CV *cv, *outside; - - cv = PL_compcv; - - if (!cv) { - /* If for some reason the pragma is operational at run-time, try to discover - * the current cv in use. */ - const PERL_SI *si; - - for (si = PL_curstackinfo; si; si = si->si_prev) { - I32 cxix; - - for (cxix = si->si_cxix; cxix >= 0; --cxix) { - const PERL_CONTEXT *cx = si->si_cxstack + cxix; - - switch (CxTYPE(cx)) { - case CXt_SUB: - case CXt_FORMAT: - /* The propagation workaround is only needed up to 5.10.0 and at that - * time format and sub contexts were still identical. And even later the - * cv members offsets should have been kept the same. */ - cv = cx->blk_sub.cv; - goto get_enclosing_cv; - case CXt_EVAL: - cv = cx->blk_eval.cv; - goto get_enclosing_cv; - default: - break; - } - } - } - - cv = PL_main_cv; - } - -get_enclosing_cv: - for (outside = CvOUTSIDE(cv); outside; outside = CvOUTSIDE(cv)) - cv = outside; - - return PTR2IV(cv); -} +#if XSH_THREADSAFE -#endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */ +static void xsh_user_clone(pTHX_ const xsh_user_cxt_t *old_cxt, xsh_user_cxt_t *new_cxt, CLONE_PARAMS *params) { + new_cxt->default_meth = xsh_dup_inc(old_cxt->default_meth, params); -static SV *lt_tag(pTHX_ SV *value) { -#define lt_tag(V) lt_tag(aTHX_ (V)) - lt_hint_t *h; - SV *code = NULL; -#if LT_THREADSAFE - dMY_CXT; - - if (!MY_CXT.tbl) - return newSViv(0); -#endif /* LT_THREADSAFE */ - - if (SvROK(value)) { - value = SvRV(value); - if (SvTYPE(value) >= SVt_PVCV) { - code = value; - SvREFCNT_inc_simple_void_NN(code); - } - } - -#if LT_HINT_STRUCT - h = PerlMemShared_malloc(sizeof *h); - h->code = code; -# if LT_WORKAROUND_REQUIRE_PROPAGATION - h->require_tag = lt_require_tag(); -# endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */ -#else /* LT_HINT_STRUCT */ - h = code; -#endif /* !LT_HINT_STRUCT */ - -#if LT_THREADSAFE - /* We only need for the key to be an unique tag for looking up the value later - * Allocated memory provides convenient unique identifiers, so that's why we - * use the hint as the key itself. */ - ptable_hints_store(MY_CXT.tbl, h, h); -#endif /* LT_THREADSAFE */ - - return newSViv(PTR2IV(h)); + return; } -static SV *lt_detag(pTHX_ const SV *hint) { -#define lt_detag(H) lt_detag(aTHX_ (H)) - lt_hint_t *h; -#if LT_THREADSAFE - dMY_CXT; - - if (!MY_CXT.tbl) - return NULL; -#endif /* LT_THREADSAFE */ - - if (!(hint && SvIOK(hint))) - return NULL; - - h = INT2PTR(lt_hint_t *, SvIVX(hint)); -#if LT_THREADSAFE - h = ptable_fetch(MY_CXT.tbl, h); -#endif /* LT_THREADSAFE */ -#if LT_WORKAROUND_REQUIRE_PROPAGATION - if (lt_require_tag() != h->require_tag) - return NULL; -#endif /* LT_WORKAROUND_REQUIRE_PROPAGATION */ - - return LT_HINT_CODE(h); -} +#endif /* XSH_THREADSAFE */ -static VOL U32 lt_hash = 0; - -static SV *lt_hint(pTHX) { -#define lt_hint() lt_hint(aTHX) - SV *hint; -#ifdef cop_hints_fetch_pvn - hint = cop_hints_fetch_pvn(PL_curcop, __PACKAGE__, __PACKAGE_LEN__, lt_hash,0); -#elif LT_HAS_PERL(5, 9, 5) - hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash, - NULL, - __PACKAGE__, __PACKAGE_LEN__, - 0, - lt_hash); -#else - SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, 0); - if (!val) - return 0; - hint = *val; -#endif - return lt_detag(hint); -} +#include "xsh/threads.h" /* ... op => info map ...................................................... */ -#define PTABLE_NAME ptable_map -#define PTABLE_VAL_FREE(V) PerlMemShared_free(V) -#define PTABLE_NEED_DELETE 1 -#define PTABLE_NEED_WALK 0 +#define PTABLE_NAME ptable_map +#define PTABLE_VAL_FREE(V) PerlMemShared_free(V) +#define PTABLE_VAL_NEED_CONTEXT 0 +#define PTABLE_NEED_DELETE 1 +#define PTABLE_NEED_WALK 0 -#include "ptable.h" +#include "xsh/ptable.h" -/* PerlMemShared_free() needs the [ap]PTBLMS_? default values */ -#define ptable_map_store(T, K, V) ptable_map_store(aPTBLMS_ (T), (K), (V)) -#define ptable_map_delete(T, K) ptable_map_delete(aPTBLMS_ (T), (K)) +#define ptable_map_store(T, K, V) ptable_map_store(aPMS_ (T), (K), (V)) +#define ptable_map_delete(T, K) ptable_map_delete(aPMS_ (T), (K)) +#define ptable_map_free(T) ptable_map_free(aPMS_ (T)) #ifdef USE_ITHREADS static perl_mutex lt_op_map_mutex; -#define LT_LOCK(M) MUTEX_LOCK(M) -#define LT_UNLOCK(M) MUTEX_UNLOCK(M) - -#else /* USE_ITHREADS */ - -#define LT_LOCK(M) -#define LT_UNLOCK(M) - -#endif /* !USE_ITHREADS */ +#endif /* USE_ITHREADS */ static ptable *lt_op_padxv_map = NULL; @@ -614,7 +137,7 @@ static void lt_padxv_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV #define lt_padxv_map_store(O, OP, TP, TM, PP) lt_padxv_map_store(aTHX_ (O), (OP), (TP), (TM), (PP)) lt_op_padxv_info *oi; - LT_LOCK(<_op_map_mutex); + XSH_LOCK(<_op_map_mutex); if (!(oi = ptable_fetch(lt_op_padxv_map, o))) { oi = PerlMemShared_malloc(sizeof *oi); @@ -663,13 +186,13 @@ static void lt_padxv_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV oi->old_pp = old_pp; - LT_UNLOCK(<_op_map_mutex); + XSH_UNLOCK(<_op_map_mutex); } static const lt_op_padxv_info *lt_padxv_map_fetch(const OP *o, lt_op_padxv_info *oi) { const lt_op_padxv_info *val; - LT_LOCK(<_op_map_mutex); + XSH_LOCK(<_op_map_mutex); val = ptable_fetch(lt_op_padxv_map, o); if (val) { @@ -677,12 +200,12 @@ static const lt_op_padxv_info *lt_padxv_map_fetch(const OP *o, lt_op_padxv_info val = oi; } - LT_UNLOCK(<_op_map_mutex); + XSH_UNLOCK(<_op_map_mutex); return val; } -#if LT_HAS_PERL(5, 17, 6) +#if XSH_HAS_PERL(5, 17, 6) static ptable *lt_op_padrange_map = NULL; @@ -695,7 +218,7 @@ static void lt_padrange_map_store(pTHX_ const OP *o, const OP *s, OP *(*old_pp)( #define lt_padrange_map_store(O, S, PP) lt_padrange_map_store(aTHX_ (O), (S), (PP)) lt_op_padrange_info *oi; - LT_LOCK(<_op_map_mutex); + XSH_LOCK(<_op_map_mutex); if (!(oi = ptable_fetch(lt_op_padrange_map, o))) { oi = PerlMemShared_malloc(sizeof *oi); @@ -705,13 +228,13 @@ static void lt_padrange_map_store(pTHX_ const OP *o, const OP *s, OP *(*old_pp)( oi->old_pp = old_pp; oi->padxv_start = s; - LT_UNLOCK(<_op_map_mutex); + XSH_UNLOCK(<_op_map_mutex); } static const lt_op_padrange_info *lt_padrange_map_fetch(const OP *o, lt_op_padrange_info *oi) { const lt_op_padrange_info *val; - LT_LOCK(<_op_map_mutex); + XSH_LOCK(<_op_map_mutex); val = ptable_fetch(lt_op_padrange_map, o); if (val) { @@ -719,7 +242,7 @@ static const lt_op_padrange_info *lt_padrange_map_fetch(const OP *o, lt_op_padra val = oi; } - LT_UNLOCK(<_op_map_mutex); + XSH_UNLOCK(<_op_map_mutex); return val; } @@ -728,19 +251,43 @@ static const lt_op_padrange_info *lt_padrange_map_fetch(const OP *o, lt_op_padra static void lt_map_delete(pTHX_ const OP *o) { #define lt_map_delete(O) lt_map_delete(aTHX_ (O)) - LT_LOCK(<_op_map_mutex); + XSH_LOCK(<_op_map_mutex); ptable_map_delete(lt_op_padxv_map, o); -#if LT_HAS_PERL(5, 17, 6) +#if XSH_HAS_PERL(5, 17, 6) ptable_map_delete(lt_op_padrange_map, o); #endif - LT_UNLOCK(<_op_map_mutex); + XSH_UNLOCK(<_op_map_mutex); } -/* --- Hooks --------------------------------------------------------------- */ +/* --- Compatibility wrappers ---------------------------------------------- */ + +#if XSH_HAS_PERL(5, 10, 0) || defined(PL_parser) +# ifndef PL_in_my_stash +# define PL_in_my_stash PL_parser->in_my_stash +# endif +#else +# ifndef PL_in_my_stash +# define PL_in_my_stash PL_Iin_my_stash +# endif +#endif + +#ifndef HvNAME_get +# define HvNAME_get(H) HvNAME(H) +#endif + +#ifndef HvNAMELEN_get +# define HvNAMELEN_get(H) strlen(HvNAME_get(H)) +#endif + +#ifndef SvREFCNT_inc_simple_void_NN +# define SvREFCNT_inc_simple_void_NN(S) ((void) SvREFCNT_inc(S)) +#endif + +/* --- PP functions -------------------------------------------------------- */ -/* ... Our pp_padsv ........................................................ */ +/* ... pp_padsv ............................................................ */ static OP *lt_pp_padsv(pTHX) { lt_op_padxv_info oi; @@ -754,9 +301,9 @@ static OP *lt_pp_padsv(pTHX) { return PL_op->op_ppaddr(aTHX); } -/* ... Our pp_padrange (on perl 5.17.6 and above) .......................... */ +/* ... pp_padrange (on perl 5.17.6 and above) .............................. */ -#if LT_HAS_PERL(5, 17, 6) +#if XSH_HAS_PERL(5, 17, 6) static OP *lt_pp_padrange(pTHX) { lt_op_padrange_info roi; @@ -784,7 +331,9 @@ static OP *lt_pp_padrange(pTHX) { #endif -/* ... Our ck_pad{any,sv} .................................................. */ +/* --- Check functions ----------------------------------------------------- */ + +/* ... ck_pad{any,sv} ...................................................... */ /* Sadly, the padsv OPs we are interested in don't trigger the padsv check * function, but are instead manually mutated from a padany. So we store @@ -801,9 +350,9 @@ static OP *lt_ck_padany(pTHX_ OP *o) { stash = PL_in_my_stash; if (stash && (code = lt_hint())) { - dMY_CXT; + dXSH_CXT; SV *orig_pkg = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash)); - SV *orig_meth = MY_CXT.default_meth; /* Guarded by lt_hint() */ + SV *orig_meth = XSH_CXT.default_meth; /* Guarded by lt_hint() */ SV *type_pkg = NULL; SV *type_meth = NULL; int items; @@ -825,7 +374,7 @@ static OP *lt_ck_padany(pTHX_ OP *o) { SPAGAIN; if (items > 2) - croak(__PACKAGE__ " mangler should return zero, one or two scalars, but got %d", items); + croak(XSH_PACKAGE " mangler should return zero, one or two scalars, but got %d", items); if (items == 0) { SvREFCNT_dec(orig_pkg); FREETMPS; @@ -878,9 +427,9 @@ static OP *lt_ck_padsv(pTHX_ OP *o) { return lt_old_ck_padsv(aTHX_ o); } -/* ... Our peephole optimizer .............................................. */ +/* --- Our peephole optimizer ---------------------------------------------- */ -#if LT_HAS_PERL(5, 17, 6) +#if XSH_HAS_PERL(5, 17, 6) static int lt_maybe_padrange_setup(pTHX_ OP *o, const OP *start) { #define lt_maybe_padrange_setup(O, S) lt_maybe_padrange_setup(aTHX_ (O), (S)) @@ -894,13 +443,13 @@ static int lt_maybe_padrange_setup(pTHX_ OP *o, const OP *start) { /* In a padrange sequence, either all lexicals are typed, or none are. * Thus we can stop at the first padsv op. However, note that these * lexicals can need to call different methods in different packages. */ - LT_LOCK(<_op_map_mutex); + XSH_LOCK(<_op_map_mutex); if (ptable_fetch(lt_op_padxv_map, p)) { - LT_UNLOCK(<_op_map_mutex); + XSH_UNLOCK(<_op_map_mutex); lt_padrange_map_store(o, start, o->op_ppaddr); o->op_ppaddr = lt_pp_padrange; } else { - LT_UNLOCK(<_op_map_mutex); + XSH_UNLOCK(<_op_map_mutex); } return 1; } @@ -911,27 +460,25 @@ static int lt_maybe_padrange_setup(pTHX_ OP *o, const OP *start) { #endif -static void lt_peep_rec(pTHX_ OP *o, ptable *seen) { -#define lt_peep_rec(O) lt_peep_rec(aTHX_ (O), seen) +static void xsh_peep_rec(pTHX_ OP *o, ptable *seen) { for (; o; o = o->op_next) { - if (ptable_fetch(seen, o)) + if (xsh_peep_seen(o, seen)) break; - ptable_seen_store(seen, o, o); switch (o->op_type) { case OP_PADSV: if (o->op_ppaddr != lt_pp_padsv && o->op_private & OPpLVAL_INTRO) { lt_op_padxv_info *oi; - LT_LOCK(<_op_map_mutex); + XSH_LOCK(<_op_map_mutex); oi = ptable_fetch(lt_op_padxv_map, o); if (oi) { oi->old_pp = o->op_ppaddr; o->op_ppaddr = lt_pp_padsv; } - LT_UNLOCK(<_op_map_mutex); + XSH_UNLOCK(<_op_map_mutex); } break; -#if LT_HAS_PERL(5, 17, 6) +#if XSH_HAS_PERL(5, 17, 6) case OP_PADRANGE: /* We deal with special padrange ops later, in the aassign op they belong * to. */ @@ -966,170 +513,67 @@ static void lt_peep_rec(pTHX_ OP *o, ptable *seen) { break; } #endif -#if !LT_HAS_RPEEP - case OP_MAPWHILE: - case OP_GREPWHILE: - case OP_AND: - case OP_OR: - case OP_ANDASSIGN: - case OP_ORASSIGN: - case OP_COND_EXPR: - case OP_RANGE: -# if LT_HAS_PERL(5, 10, 0) - case OP_ONCE: - case OP_DOR: - case OP_DORASSIGN: -# endif - lt_peep_rec(cLOGOPo->op_other); - break; - case OP_ENTERLOOP: - case OP_ENTERITER: - lt_peep_rec(cLOOPo->op_redoop); - lt_peep_rec(cLOOPo->op_nextop); - lt_peep_rec(cLOOPo->op_lastop); - break; -# if LT_HAS_PERL(5, 9, 5) - case OP_SUBST: - lt_peep_rec(cPMOPo->op_pmstashstartu.op_pmreplstart); - break; -# else - case OP_QR: - case OP_MATCH: - case OP_SUBST: - lt_peep_rec(cPMOPo->op_pmreplstart); - break; -# endif -#endif /* !LT_HAS_RPEEP */ default: + xsh_peep_maybe_recurse(o, seen); break; } } } -static void lt_peep(pTHX_ OP *o) { - ptable *seen; - dMY_CXT; - - LT_ASSERT(lt_is_loaded(&MY_CXT)); - - MY_CXT.old_peep(aTHX_ o); - - seen = MY_CXT.seen; - if (seen) { - ptable_seen_clear(seen); - lt_peep_rec(o); - ptable_seen_clear(seen); - } -} - /* --- Module setup/teardown ----------------------------------------------- */ -static void lt_teardown(pTHX_ void *root) { - dMY_CXT; - - LT_LOADED_LOCK; - - if (lt_clear_loaded_locked(&MY_CXT)) { - lt_ck_restore(OP_PADANY, <_old_ck_padany); - lt_ck_restore(OP_PADSV, <_old_ck_padsv); - - ptable_map_free(lt_op_padxv_map); - lt_op_padxv_map = NULL; - -#if LT_HAS_PERL(5, 17, 6) - ptable_map_free(lt_op_padrange_map); - lt_op_padrange_map = NULL; +static void xsh_user_global_setup(pTHX) { + lt_op_padxv_map = ptable_new(32); +#if XSH_HAS_PERL(5, 17, 6) + lt_op_padrange_map = ptable_new(32); #endif #ifdef USE_ITHREADS - MUTEX_DESTROY(<_op_map_mutex); + MUTEX_INIT(<_op_map_mutex); #endif - } - - LT_LOADED_UNLOCK; - - if (MY_CXT.old_peep) { -#if LT_HAS_RPEEP - PL_rpeepp = MY_CXT.old_peep; -#else - PL_peepp = MY_CXT.old_peep; -#endif - MY_CXT.old_peep = 0; - } - ptable_seen_free(MY_CXT.seen); - MY_CXT.seen = NULL; - -#if LT_THREADSAFE - ptable_hints_free(MY_CXT.tbl); - MY_CXT.tbl = NULL; -#endif - - SvREFCNT_dec(MY_CXT.default_meth); - MY_CXT.default_meth = NULL; + xsh_ck_replace(OP_PADANY, lt_ck_padany, <_old_ck_padany); + xsh_ck_replace(OP_PADSV, lt_ck_padsv, <_old_ck_padsv); return; } -static void lt_setup(pTHX) { -#define lt_setup() lt_setup(aTHX) - MY_CXT_INIT; /* Takes/release PL_my_ctx_mutex */ - - LT_LOADED_LOCK; +static void xsh_user_local_setup(pTHX_ xsh_user_cxt_t *cxt) { + HV *stash; - if (lt_set_loaded_locked(&MY_CXT)) { - PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__); + stash = gv_stashpvn(XSH_PACKAGE, XSH_PACKAGE_LEN, 1); + newCONSTSUB(stash, "LT_THREADSAFE", newSVuv(XSH_THREADSAFE)); + newCONSTSUB(stash, "LT_FORKSAFE", newSVuv(XSH_FORKSAFE)); - lt_op_padxv_map = ptable_new(); -#if LT_HAS_PERL(5, 17, 6) - lt_op_padrange_map = ptable_new(); -#endif + cxt->default_meth = newSVpvn("TYPEDSCALAR", 11); + SvREADONLY_on(cxt->default_meth); -#ifdef USE_ITHREADS - MUTEX_INIT(<_op_map_mutex); -#endif + return; +} - lt_ck_replace(OP_PADANY, lt_ck_padany, <_old_ck_padany); - lt_ck_replace(OP_PADSV, lt_ck_padsv, <_old_ck_padsv); - } +static void xsh_user_local_teardown(pTHX_ xsh_user_cxt_t *cxt) { + SvREFCNT_dec(cxt->default_meth); + cxt->default_meth = NULL; - LT_LOADED_UNLOCK; + return; +} - { - HV *stash; +static void xsh_user_global_teardown(pTHX) { + xsh_ck_restore(OP_PADANY, <_old_ck_padany); + xsh_ck_restore(OP_PADSV, <_old_ck_padsv); - stash = gv_stashpvn(__PACKAGE__, __PACKAGE_LEN__, 1); - newCONSTSUB(stash, "LT_THREADSAFE", newSVuv(LT_THREADSAFE)); - newCONSTSUB(stash, "LT_FORKSAFE", newSVuv(LT_FORKSAFE)); - } + ptable_map_free(lt_op_padxv_map); + lt_op_padxv_map = NULL; -#if LT_HAS_RPEEP - if (PL_rpeepp != lt_peep) { - MY_CXT.old_peep = PL_rpeepp; - PL_rpeepp = lt_peep; - } -#else - if (PL_peepp != lt_peep) { - MY_CXT.old_peep = PL_peepp; - PL_peepp = lt_peep; - } +#if XSH_HAS_PERL(5, 17, 6) + ptable_map_free(lt_op_padrange_map); + lt_op_padrange_map = NULL; #endif - else { - MY_CXT.old_peep = 0; - } - MY_CXT.seen = ptable_new(); - -#if LT_THREADSAFE - MY_CXT.tbl = ptable_new(); - MY_CXT.owner = aTHX; +#ifdef USE_ITHREADS + MUTEX_DESTROY(<_op_map_mutex); #endif - MY_CXT.default_meth = newSVpvn("TYPEDSCALAR", 11); - SvREADONLY_on(MY_CXT.default_meth); - - call_atexit(lt_teardown, NULL); - return; } @@ -1141,54 +585,28 @@ PROTOTYPES: ENABLE BOOT: { - lt_setup(); + xsh_setup(); } -#if LT_THREADSAFE +#if XSH_THREADSAFE void CLONE(...) PROTOTYPE: DISABLE -PREINIT: - ptable *t; - ptable *s; - SV *cloned_default_meth; PPCODE: - { - { - lt_ptable_clone_ud ud; - dMY_CXT; - - t = ptable_new(); - lt_ptable_clone_ud_init(ud, t, MY_CXT.owner); - ptable_walk(MY_CXT.tbl, lt_ptable_clone, &ud); - cloned_default_meth = lt_dup_inc(MY_CXT.default_meth, &ud); - lt_ptable_clone_ud_deinit(ud); - } - s = ptable_new(); - } - { - MY_CXT_CLONE; - MY_CXT.seen = s; - MY_CXT.tbl = t; - MY_CXT.owner = aTHX; - MY_CXT.default_meth = cloned_default_meth; - { - int global_setup; - LT_LOADED_LOCK; - global_setup = lt_set_loaded_locked(&MY_CXT); - LT_ASSERT(!global_setup); - LT_LOADED_UNLOCK; - } - } + xsh_clone(); XSRETURN(0); #endif SV * -_tag(SV *value) +_tag(SV *code) PROTOTYPE: $ CODE: - RETVAL = lt_tag(value); + if (!SvOK(code)) + code = NULL; + else if (SvROK(code)) + code = SvRV(code); + RETVAL = xsh_hints_tag(code); OUTPUT: RETVAL