X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=thrdvar.h;h=e4cfacc06caf8999df1dd59b4553320c5806700f;hb=706de38c2aa2b981f7071fda099501bf2cc8caeb;hp=d9cb9c6334a1ce959ae4113be0b9b97a1469cf04;hpb=364723c2ea2c2681016fad994c4f40cc3a0bb17d;p=p5sagit%2Fp5-mst-13.2.git diff --git a/thrdvar.h b/thrdvar.h index d9cb9c6..e4cfacc 100644 --- a/thrdvar.h +++ b/thrdvar.h @@ -10,13 +10,14 @@ * * When building without USE_THREADS, these variables will be truly global. * When building without USE_THREADS but with MULTIPLICITY, these variables - * will be global per-interpreter. - * - * Avoid build-specific #ifdefs here, like DEBUGGING. That way, - * we can keep binary compatibility of the curinterp structure */ + * will be global per-interpreter. */ /* Important ones in the first cache line (if alignment is done right) */ +#ifdef USE_THREADS +PERLVAR(interp, PerlInterpreter*) /* thread owner */ +#endif + PERLVAR(Tstack_sp, SV **) /* top of the stack */ #ifdef OP_IN_REGISTER PERLVAR(Topsave, OP *) @@ -53,6 +54,20 @@ PERLVAR(Tretstack_max, I32) PERLVAR(TSv, SV *) /* used to hold temporary values */ PERLVAR(TXpv, XPV *) /* used to hold temporary values */ +/* +=for apidoc Amn|STRLEN|PL_na + +A convenience variable which is typically used with C when one +doesn't care about the length of the string. It is usually more efficient +to either declare a local variable and use that instead or to use the +C macro. + +=cut +*/ + +PERLVAR(Tna, STRLEN) /* for use in SvPV when length is + Not Applicable */ + /* stat stuff */ PERLVAR(Tstatbuf, Stat_t) PERLVAR(Tstatcache, Stat_t) /* _ */ @@ -91,8 +106,13 @@ PERLVAR(Tlocalizing, int) /* are we processing a local() list? */ PERLVAR(Tcurstack, AV *) /* THE STACK */ PERLVAR(Tcurstackinfo, PERL_SI *) /* current stack + context */ PERLVAR(Tmainstack, AV *) /* the stack when nothing funny is happening */ + PERLVAR(Ttop_env, JMPENV *) /* ptr. to current sigjmp() environment */ PERLVAR(Tstart_env, JMPENV) /* empty startup sigjmp() environment */ +#ifdef PERL_FLEXIBLE_EXCEPTIONS +PERLVARI(Tprotect, protect_proc_t, MEMBER_TO_FPTR(Perl_default_protect)) +#endif +PERLVARI(Terrors, SV *, Nullsv) /* outstanding queued errors */ /* statics "owned" by various functions */ PERLVAR(Tav_fetch_sv, SV *) /* owned by av_fetch() */ @@ -111,6 +131,10 @@ PERLVAR(Tfirstgv, GV *) /* $a */ PERLVAR(Tsecondgv, GV *) /* $b */ PERLVAR(Tsortcxix, I32) /* from pp_ctl.c */ +/* float buffer */ +PERLVAR(Tefloatbuf, char*) +PERLVAR(Tefloatsize, STRLEN) + /* regex stuff */ PERLVAR(Tscreamfirst, I32 *) @@ -134,12 +158,13 @@ PERLVAR(Tseen_evals, I32) /* from regcomp.c */ PERLVAR(Tregcomp_rx, regexp *) /* from regcomp.c */ PERLVAR(Textralen, I32) /* from regcomp.c */ PERLVAR(Tcolorset, int) /* from regcomp.c */ -PERLVAR(Tcolors[6], char *) /* from regcomp.c */ +PERLVARA(Tcolors,6, char *) /* from regcomp.c */ +PERLVAR(Treg_whilem_seen, I32) /* number of WHILEM in this expr */ PERLVAR(Treginput, char *) /* String-input pointer. */ PERLVAR(Tregbol, char *) /* Beginning of input, for ^ check. */ PERLVAR(Tregeol, char *) /* End of input, for $ check. */ -PERLVAR(Tregstartp, char **) /* Pointer to startp array. */ -PERLVAR(Tregendp, char **) /* Ditto for endp. */ +PERLVAR(Tregstartp, I32 *) /* Pointer to startp array. */ +PERLVAR(Tregendp, I32 *) /* Ditto for endp. */ PERLVAR(Treglastparen, U32 *) /* Similarly for lastparen. */ PERLVAR(Tregtill, char *) /* How far we are required to go. */ PERLVAR(Tregprev, char) /* char before regbol, \n if none */ @@ -160,18 +185,31 @@ PERLVAR(Treg_ganch, char *) /* position of \G */ PERLVAR(Treg_sv, SV *) /* what we match against */ PERLVAR(Treg_magic, MAGIC *) /* pos-magic of what we match */ PERLVAR(Treg_oldpos, I32) /* old pos of what we match */ - -PERLVARI(Tregcompp, regcomp_t, FUNC_NAME_TO_PTR(pregcomp)) - /* Pointer to RE compiler */ -PERLVARI(Tregexecp, regexec_t, FUNC_NAME_TO_PTR(regexec_flags)) - /* Pointer to RE executer */ -PERLVARI(Treginterp_cnt,int, 0) /* Whether `re' +PERLVARI(Treg_oldcurpm, PMOP*, NULL) /* curpm before match */ +PERLVARI(Treg_curpm, PMOP*, NULL) /* curpm during match */ +PERLVAR(Treg_oldsaved, char*) /* old saved substr during match */ +PERLVAR(Treg_oldsavedlen, STRLEN) /* old length of saved substr during match */ +PERLVAR(Treg_maxiter, I32) /* max wait until caching pos */ +PERLVAR(Treg_leftiter, I32) /* wait until caching pos */ +PERLVARI(Treg_poscache, char *, Nullch) /* cache of pos of WHILEM */ +PERLVAR(Treg_poscache_size, STRLEN) /* size of pos cache of WHILEM */ + +PERLVARI(Tregcompp, regcomp_t, MEMBER_TO_FPTR(Perl_pregcomp)) + /* Pointer to REx compiler */ +PERLVARI(Tregexecp, regexec_t, MEMBER_TO_FPTR(Perl_regexec_flags)) + /* Pointer to REx executer */ +PERLVARI(Tregint_start, re_intuit_start_t, MEMBER_TO_FPTR(Perl_re_intuit_start)) + /* Pointer to optimized REx executer */ +PERLVARI(Tregint_string,re_intuit_string_t, MEMBER_TO_FPTR(Perl_re_intuit_string)) + /* Pointer to optimized REx string */ +PERLVARI(Tregfree, regfree_t, MEMBER_TO_FPTR(Perl_pregfree)) + /* Pointer to REx free()er */ + +PERLVARI(Treginterp_cnt,int, 0) /* Whether `Regexp' was interpolated. */ PERLVARI(Treg_starttry, char *, 0) /* -Dr: where regtry was called. */ -#ifdef DEBUGGING PERLVARI(Twatchaddr, char **, 0) PERLVAR(Twatchok, char *) -#endif /* Note that the variables below are all explicitly referenced in the code * as thr->whatever and therefore don't need the 'T' prefix. */ @@ -186,7 +224,6 @@ PERLVAR(threadsv, AV *) /* Per-thread SVs ($_, $@ etc.) */ PERLVAR(threadsvp, SV **) /* AvARRAY(threadsv) */ PERLVAR(specific, AV *) /* Thread-specific user data */ PERLVAR(errsv, SV *) /* Backing SV for $@ */ -PERLVAR(errhv, HV *) /* HV for what was %@ in pp_ctl.c */ PERLVAR(mutex, perl_mutex) /* For the fields others can change */ PERLVAR(tid, U32) PERLVAR(prev, struct perl_thread *)