make die/warn and other diagnostics go to wherever STDERR happens

[perl5.git] / embedvar.h

diff --git a/embedvar.h b/embedvar.h
index dbd94e9..22a970a 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -5,528 +5,727 @@
 
 /* (Doing namespace management portably in C is really gross.) */
 
 
 /* (Doing namespace management portably in C is really gross.) */
 

-/* Put interpreter-specific symbols into a struct? */
+/*
+   The following combinations of MULTIPLICITY, USE_THREADS, PERL_OBJECT
+   and PERL_IMPLICIT_CONTEXT are supported:
+     1) none
+     2) MULTIPLICITY   # supported for compatibility
+     3) MULTIPLICITY && PERL_IMPLICIT_CONTEXT
+     4) USE_THREADS && PERL_IMPLICIT_CONTEXT
+     5) MULTIPLICITY && USE_THREADS && PERL_IMPLICIT_CONTEXT
+     6) PERL_OBJECT && PERL_IMPLICIT_CONTEXT

 
 

-#ifdef MULTIPLICITY
+   All other combinations of these flags are errors.

 
 

-#ifndef USE_THREADS
-/* If we do not have threads then per-thread vars are per-interpreter */
+   #3, #4, #5, and #6 are supported directly, while #2 is a special
+   case of #3 (supported by redefining vTHX appropriately).
+*/

 
 

-#ifdef PERL_IMPLICIT_CONTEXT
+#if defined(MULTIPLICITY)
+/* cases 2, 3 and 5 above */

 
 

-/* everything has an implicit context pointer */
+#  if defined(PERL_IMPLICIT_CONTEXT)
+#    define vTHX       aTHX
+#  else
+#    define vTHX       PERL_GET_INTERP
+#  endif

 
 

-#define PL_Sv                  (my_perl->TSv)
-#define PL_Xpv                 (my_perl->TXpv)
-#define PL_av_fetch_sv         (my_perl->Tav_fetch_sv)
-#define PL_bodytarget          (my_perl->Tbodytarget)
-#define PL_bostr               (my_perl->Tbostr)
-#define PL_chopset             (my_perl->Tchopset)
-#define PL_colors              (my_perl->Tcolors)
-#define PL_colorset            (my_perl->Tcolorset)
-#define PL_curcop              (my_perl->Tcurcop)
-#define PL_curpad              (my_perl->Tcurpad)
-#define PL_curpm               (my_perl->Tcurpm)
-#define PL_curstack            (my_perl->Tcurstack)
-#define PL_curstackinfo                (my_perl->Tcurstackinfo)
-#define PL_curstash            (my_perl->Tcurstash)
-#define PL_defoutgv            (my_perl->Tdefoutgv)
-#define PL_defstash            (my_perl->Tdefstash)
-#define PL_delaymagic          (my_perl->Tdelaymagic)
-#define PL_dirty               (my_perl->Tdirty)
-#define PL_dumpindent          (my_perl->Tdumpindent)
-#define PL_extralen            (my_perl->Textralen)
-#define PL_firstgv             (my_perl->Tfirstgv)
-#define PL_formtarget          (my_perl->Tformtarget)
-#define PL_hv_fetch_ent_mh     (my_perl->Thv_fetch_ent_mh)
-#define PL_hv_fetch_sv         (my_perl->Thv_fetch_sv)
-#define PL_in_eval             (my_perl->Tin_eval)
-#define PL_last_in_gv          (my_perl->Tlast_in_gv)
-#define PL_lastgotoprobe       (my_perl->Tlastgotoprobe)
-#define PL_lastscream          (my_perl->Tlastscream)
-#define PL_localizing          (my_perl->Tlocalizing)
-#define PL_mainstack           (my_perl->Tmainstack)
-#define PL_markstack           (my_perl->Tmarkstack)
-#define PL_markstack_max       (my_perl->Tmarkstack_max)
-#define PL_markstack_ptr       (my_perl->Tmarkstack_ptr)
-#define PL_maxscream           (my_perl->Tmaxscream)
-#define PL_modcount            (my_perl->Tmodcount)
-#define PL_na                  (my_perl->Tna)
-#define PL_nrs                 (my_perl->Tnrs)
-#define PL_ofs                 (my_perl->Tofs)
-#define PL_ofslen              (my_perl->Tofslen)
-#define PL_op                  (my_perl->Top)
-#define PL_opsave              (my_perl->Topsave)
-#define PL_protect             (my_perl->Tprotect)
-#define PL_reg_call_cc         (my_perl->Treg_call_cc)
-#define PL_reg_curpm           (my_perl->Treg_curpm)
-#define PL_reg_eval_set                (my_perl->Treg_eval_set)
-#define PL_reg_flags           (my_perl->Treg_flags)
-#define PL_reg_ganch           (my_perl->Treg_ganch)
-#define PL_reg_magic           (my_perl->Treg_magic)
-#define PL_reg_oldcurpm                (my_perl->Treg_oldcurpm)
-#define PL_reg_oldpos          (my_perl->Treg_oldpos)
-#define PL_reg_oldsaved                (my_perl->Treg_oldsaved)
-#define PL_reg_oldsavedlen     (my_perl->Treg_oldsavedlen)
-#define PL_reg_re              (my_perl->Treg_re)
-#define PL_reg_start_tmp       (my_perl->Treg_start_tmp)
-#define PL_reg_start_tmpl      (my_perl->Treg_start_tmpl)
-#define PL_reg_starttry                (my_perl->Treg_starttry)
-#define PL_reg_sv              (my_perl->Treg_sv)
-#define PL_regbol              (my_perl->Tregbol)
-#define PL_regcc               (my_perl->Tregcc)
-#define PL_regcode             (my_perl->Tregcode)
-#define PL_regcomp_parse       (my_perl->Tregcomp_parse)
-#define PL_regcomp_rx          (my_perl->Tregcomp_rx)
-#define PL_regcompp            (my_perl->Tregcompp)
-#define PL_regdata             (my_perl->Tregdata)
-#define PL_regdummy            (my_perl->Tregdummy)
-#define PL_regendp             (my_perl->Tregendp)
-#define PL_regeol              (my_perl->Tregeol)
-#define PL_regexecp            (my_perl->Tregexecp)
-#define PL_regflags            (my_perl->Tregflags)
-#define PL_regindent           (my_perl->Tregindent)
-#define PL_reginput            (my_perl->Treginput)
-#define PL_reginterp_cnt       (my_perl->Treginterp_cnt)
-#define PL_reglastparen                (my_perl->Treglastparen)
-#define PL_regnarrate          (my_perl->Tregnarrate)
-#define PL_regnaughty          (my_perl->Tregnaughty)
-#define PL_regnpar             (my_perl->Tregnpar)
-#define PL_regprecomp          (my_perl->Tregprecomp)
-#define PL_regprev             (my_perl->Tregprev)
-#define PL_regprogram          (my_perl->Tregprogram)
-#define PL_regsawback          (my_perl->Tregsawback)
-#define PL_regseen             (my_perl->Tregseen)
-#define PL_regsize             (my_perl->Tregsize)
-#define PL_regstartp           (my_perl->Tregstartp)
-#define PL_regtill             (my_perl->Tregtill)
-#define PL_regxend             (my_perl->Tregxend)
-#define PL_restartop           (my_perl->Trestartop)
-#define PL_retstack            (my_perl->Tretstack)
-#define PL_retstack_ix         (my_perl->Tretstack_ix)
-#define PL_retstack_max                (my_perl->Tretstack_max)
-#define PL_rs                  (my_perl->Trs)
-#define PL_savestack           (my_perl->Tsavestack)
-#define PL_savestack_ix                (my_perl->Tsavestack_ix)
-#define PL_savestack_max       (my_perl->Tsavestack_max)
-#define PL_scopestack          (my_perl->Tscopestack)
-#define PL_scopestack_ix       (my_perl->Tscopestack_ix)
-#define PL_scopestack_max      (my_perl->Tscopestack_max)
-#define PL_screamfirst         (my_perl->Tscreamfirst)
-#define PL_screamnext          (my_perl->Tscreamnext)
-#define PL_secondgv            (my_perl->Tsecondgv)
-#define PL_seen_evals          (my_perl->Tseen_evals)
-#define PL_seen_zerolen                (my_perl->Tseen_zerolen)
-#define PL_sortcop             (my_perl->Tsortcop)
-#define PL_sortcxix            (my_perl->Tsortcxix)
-#define PL_sortstash           (my_perl->Tsortstash)
-#define PL_stack_base          (my_perl->Tstack_base)
-#define PL_stack_max           (my_perl->Tstack_max)
-#define PL_stack_sp            (my_perl->Tstack_sp)
-#define PL_start_env           (my_perl->Tstart_env)
-#define PL_statbuf             (my_perl->Tstatbuf)
-#define PL_statcache           (my_perl->Tstatcache)
-#define PL_statgv              (my_perl->Tstatgv)
-#define PL_statname            (my_perl->Tstatname)
-#define PL_tainted             (my_perl->Ttainted)
-#define PL_timesbuf            (my_perl->Ttimesbuf)
-#define PL_tmps_floor          (my_perl->Ttmps_floor)
-#define PL_tmps_ix             (my_perl->Ttmps_ix)
-#define PL_tmps_max            (my_perl->Ttmps_max)
-#define PL_tmps_stack          (my_perl->Ttmps_stack)
-#define PL_top_env             (my_perl->Ttop_env)
-#define PL_toptarget           (my_perl->Ttoptarget)
-#define PL_watchaddr           (my_perl->Twatchaddr)
-#define PL_watchok             (my_perl->Twatchok)
+#define PL_Sv                  (vTHX->TSv)
+#define PL_Xpv                 (vTHX->TXpv)
+#define PL_av_fetch_sv         (vTHX->Tav_fetch_sv)
+#define PL_bodytarget          (vTHX->Tbodytarget)
+#define PL_bostr               (vTHX->Tbostr)
+#define PL_chopset             (vTHX->Tchopset)
+#define PL_colors              (vTHX->Tcolors)
+#define PL_colorset            (vTHX->Tcolorset)
+#define PL_curcop              (vTHX->Tcurcop)
+#define PL_curpad              (vTHX->Tcurpad)
+#define PL_curpm               (vTHX->Tcurpm)
+#define PL_curstack            (vTHX->Tcurstack)
+#define PL_curstackinfo                (vTHX->Tcurstackinfo)
+#define PL_curstash            (vTHX->Tcurstash)
+#define PL_defoutgv            (vTHX->Tdefoutgv)
+#define PL_defstash            (vTHX->Tdefstash)
+#define PL_delaymagic          (vTHX->Tdelaymagic)
+#define PL_dirty               (vTHX->Tdirty)
+#define PL_dumpindent          (vTHX->Tdumpindent)
+#define PL_efloatbuf           (vTHX->Tefloatbuf)
+#define PL_efloatsize          (vTHX->Tefloatsize)
+#define PL_errors              (vTHX->Terrors)
+#define PL_extralen            (vTHX->Textralen)
+#define PL_firstgv             (vTHX->Tfirstgv)
+#define PL_formtarget          (vTHX->Tformtarget)
+#define PL_hv_fetch_ent_mh     (vTHX->Thv_fetch_ent_mh)
+#define PL_hv_fetch_sv         (vTHX->Thv_fetch_sv)
+#define PL_in_eval             (vTHX->Tin_eval)
+#define PL_last_in_gv          (vTHX->Tlast_in_gv)
+#define PL_lastgotoprobe       (vTHX->Tlastgotoprobe)
+#define PL_lastscream          (vTHX->Tlastscream)
+#define PL_localizing          (vTHX->Tlocalizing)
+#define PL_mainstack           (vTHX->Tmainstack)
+#define PL_markstack           (vTHX->Tmarkstack)
+#define PL_markstack_max       (vTHX->Tmarkstack_max)
+#define PL_markstack_ptr       (vTHX->Tmarkstack_ptr)
+#define PL_maxscream           (vTHX->Tmaxscream)
+#define PL_modcount            (vTHX->Tmodcount)
+#define PL_na                  (vTHX->Tna)
+#define PL_nrs                 (vTHX->Tnrs)
+#define PL_ofs                 (vTHX->Tofs)
+#define PL_ofslen              (vTHX->Tofslen)
+#define PL_op                  (vTHX->Top)
+#define PL_opsave              (vTHX->Topsave)
+#define PL_protect             (vTHX->Tprotect)
+#define PL_reg_call_cc         (vTHX->Treg_call_cc)
+#define PL_reg_curpm           (vTHX->Treg_curpm)
+#define PL_reg_eval_set                (vTHX->Treg_eval_set)
+#define PL_reg_flags           (vTHX->Treg_flags)
+#define PL_reg_ganch           (vTHX->Treg_ganch)
+#define PL_reg_leftiter                (vTHX->Treg_leftiter)
+#define PL_reg_magic           (vTHX->Treg_magic)
+#define PL_reg_maxiter         (vTHX->Treg_maxiter)
+#define PL_reg_oldcurpm                (vTHX->Treg_oldcurpm)
+#define PL_reg_oldpos          (vTHX->Treg_oldpos)
+#define PL_reg_oldsaved                (vTHX->Treg_oldsaved)
+#define PL_reg_oldsavedlen     (vTHX->Treg_oldsavedlen)
+#define PL_reg_poscache                (vTHX->Treg_poscache)
+#define PL_reg_poscache_size   (vTHX->Treg_poscache_size)
+#define PL_reg_re              (vTHX->Treg_re)
+#define PL_reg_start_tmp       (vTHX->Treg_start_tmp)
+#define PL_reg_start_tmpl      (vTHX->Treg_start_tmpl)
+#define PL_reg_starttry                (vTHX->Treg_starttry)
+#define PL_reg_sv              (vTHX->Treg_sv)
+#define PL_reg_whilem_seen     (vTHX->Treg_whilem_seen)
+#define PL_regbol              (vTHX->Tregbol)
+#define PL_regcc               (vTHX->Tregcc)
+#define PL_regcode             (vTHX->Tregcode)
+#define PL_regcomp_parse       (vTHX->Tregcomp_parse)
+#define PL_regcomp_rx          (vTHX->Tregcomp_rx)
+#define PL_regcompp            (vTHX->Tregcompp)
+#define PL_regdata             (vTHX->Tregdata)
+#define PL_regdummy            (vTHX->Tregdummy)
+#define PL_regendp             (vTHX->Tregendp)
+#define PL_regeol              (vTHX->Tregeol)
+#define PL_regexecp            (vTHX->Tregexecp)
+#define PL_regflags            (vTHX->Tregflags)
+#define PL_regfree             (vTHX->Tregfree)
+#define PL_regindent           (vTHX->Tregindent)
+#define PL_reginput            (vTHX->Treginput)
+#define PL_regint_start                (vTHX->Tregint_start)
+#define PL_regint_string       (vTHX->Tregint_string)
+#define PL_reginterp_cnt       (vTHX->Treginterp_cnt)
+#define PL_reglastparen                (vTHX->Treglastparen)
+#define PL_regnarrate          (vTHX->Tregnarrate)
+#define PL_regnaughty          (vTHX->Tregnaughty)
+#define PL_regnpar             (vTHX->Tregnpar)
+#define PL_regprecomp          (vTHX->Tregprecomp)
+#define PL_regprev             (vTHX->Tregprev)
+#define PL_regprogram          (vTHX->Tregprogram)
+#define PL_regsawback          (vTHX->Tregsawback)
+#define PL_regseen             (vTHX->Tregseen)
+#define PL_regsize             (vTHX->Tregsize)
+#define PL_regstartp           (vTHX->Tregstartp)
+#define PL_regtill             (vTHX->Tregtill)
+#define PL_regxend             (vTHX->Tregxend)
+#define PL_restartop           (vTHX->Trestartop)
+#define PL_retstack            (vTHX->Tretstack)
+#define PL_retstack_ix         (vTHX->Tretstack_ix)
+#define PL_retstack_max                (vTHX->Tretstack_max)
+#define PL_rs                  (vTHX->Trs)
+#define PL_savestack           (vTHX->Tsavestack)
+#define PL_savestack_ix                (vTHX->Tsavestack_ix)
+#define PL_savestack_max       (vTHX->Tsavestack_max)
+#define PL_scopestack          (vTHX->Tscopestack)
+#define PL_scopestack_ix       (vTHX->Tscopestack_ix)
+#define PL_scopestack_max      (vTHX->Tscopestack_max)
+#define PL_screamfirst         (vTHX->Tscreamfirst)
+#define PL_screamnext          (vTHX->Tscreamnext)
+#define PL_secondgv            (vTHX->Tsecondgv)
+#define PL_seen_evals          (vTHX->Tseen_evals)
+#define PL_seen_zerolen                (vTHX->Tseen_zerolen)
+#define PL_sortcop             (vTHX->Tsortcop)
+#define PL_sortcxix            (vTHX->Tsortcxix)
+#define PL_sortstash           (vTHX->Tsortstash)
+#define PL_stack_base          (vTHX->Tstack_base)
+#define PL_stack_max           (vTHX->Tstack_max)
+#define PL_stack_sp            (vTHX->Tstack_sp)
+#define PL_start_env           (vTHX->Tstart_env)
+#define PL_statbuf             (vTHX->Tstatbuf)
+#define PL_statcache           (vTHX->Tstatcache)
+#define PL_statgv              (vTHX->Tstatgv)
+#define PL_statname            (vTHX->Tstatname)
+#define PL_tainted             (vTHX->Ttainted)
+#define PL_timesbuf            (vTHX->Ttimesbuf)
+#define PL_tmps_floor          (vTHX->Ttmps_floor)
+#define PL_tmps_ix             (vTHX->Ttmps_ix)
+#define PL_tmps_max            (vTHX->Ttmps_max)
+#define PL_tmps_stack          (vTHX->Ttmps_stack)
+#define PL_top_env             (vTHX->Ttop_env)
+#define PL_toptarget           (vTHX->Ttoptarget)
+#define PL_watchaddr           (vTHX->Twatchaddr)
+#define PL_watchok             (vTHX->Twatchok)

 
 

-#else /* !PERL_IMPLICIT_CONTEXT */
+#  if defined(PERL_OBJECT)
+#    include "error: PERL_OBJECT + MULTIPLICITY don't go together"
+#  endif

 
 

-/* traditional MULTIPLICITY (intepreter is in a global) */
+#  if defined(USE_THREADS)
+/* case 5 above */

 
 

-#define PL_Sv                  (PL_curinterp->TSv)
-#define PL_Xpv                 (PL_curinterp->TXpv)
-#define PL_av_fetch_sv         (PL_curinterp->Tav_fetch_sv)
-#define PL_bodytarget          (PL_curinterp->Tbodytarget)
-#define PL_bostr               (PL_curinterp->Tbostr)
-#define PL_chopset             (PL_curinterp->Tchopset)
-#define PL_colors              (PL_curinterp->Tcolors)
-#define PL_colorset            (PL_curinterp->Tcolorset)
-#define PL_curcop              (PL_curinterp->Tcurcop)
-#define PL_curpad              (PL_curinterp->Tcurpad)
-#define PL_curpm               (PL_curinterp->Tcurpm)
-#define PL_curstack            (PL_curinterp->Tcurstack)
-#define PL_curstackinfo                (PL_curinterp->Tcurstackinfo)
-#define PL_curstash            (PL_curinterp->Tcurstash)
-#define PL_defoutgv            (PL_curinterp->Tdefoutgv)
-#define PL_defstash            (PL_curinterp->Tdefstash)
-#define PL_delaymagic          (PL_curinterp->Tdelaymagic)
-#define PL_dirty               (PL_curinterp->Tdirty)
-#define PL_dumpindent          (PL_curinterp->Tdumpindent)
-#define PL_extralen            (PL_curinterp->Textralen)
-#define PL_firstgv             (PL_curinterp->Tfirstgv)
-#define PL_formtarget          (PL_curinterp->Tformtarget)
-#define PL_hv_fetch_ent_mh     (PL_curinterp->Thv_fetch_ent_mh)
-#define PL_hv_fetch_sv         (PL_curinterp->Thv_fetch_sv)
-#define PL_in_eval             (PL_curinterp->Tin_eval)
-#define PL_last_in_gv          (PL_curinterp->Tlast_in_gv)
-#define PL_lastgotoprobe       (PL_curinterp->Tlastgotoprobe)
-#define PL_lastscream          (PL_curinterp->Tlastscream)
-#define PL_localizing          (PL_curinterp->Tlocalizing)
-#define PL_mainstack           (PL_curinterp->Tmainstack)
-#define PL_markstack           (PL_curinterp->Tmarkstack)
-#define PL_markstack_max       (PL_curinterp->Tmarkstack_max)
-#define PL_markstack_ptr       (PL_curinterp->Tmarkstack_ptr)
-#define PL_maxscream           (PL_curinterp->Tmaxscream)
-#define PL_modcount            (PL_curinterp->Tmodcount)
-#define PL_na                  (PL_curinterp->Tna)
-#define PL_nrs                 (PL_curinterp->Tnrs)
-#define PL_ofs                 (PL_curinterp->Tofs)
-#define PL_ofslen              (PL_curinterp->Tofslen)
-#define PL_op                  (PL_curinterp->Top)
-#define PL_opsave              (PL_curinterp->Topsave)
-#define PL_protect             (PL_curinterp->Tprotect)
-#define PL_reg_call_cc         (PL_curinterp->Treg_call_cc)
-#define PL_reg_curpm           (PL_curinterp->Treg_curpm)
-#define PL_reg_eval_set                (PL_curinterp->Treg_eval_set)
-#define PL_reg_flags           (PL_curinterp->Treg_flags)
-#define PL_reg_ganch           (PL_curinterp->Treg_ganch)
-#define PL_reg_magic           (PL_curinterp->Treg_magic)
-#define PL_reg_oldcurpm                (PL_curinterp->Treg_oldcurpm)
-#define PL_reg_oldpos          (PL_curinterp->Treg_oldpos)
-#define PL_reg_oldsaved                (PL_curinterp->Treg_oldsaved)
-#define PL_reg_oldsavedlen     (PL_curinterp->Treg_oldsavedlen)
-#define PL_reg_re              (PL_curinterp->Treg_re)
-#define PL_reg_start_tmp       (PL_curinterp->Treg_start_tmp)
-#define PL_reg_start_tmpl      (PL_curinterp->Treg_start_tmpl)
-#define PL_reg_starttry                (PL_curinterp->Treg_starttry)
-#define PL_reg_sv              (PL_curinterp->Treg_sv)
-#define PL_regbol              (PL_curinterp->Tregbol)
-#define PL_regcc               (PL_curinterp->Tregcc)
-#define PL_regcode             (PL_curinterp->Tregcode)
-#define PL_regcomp_parse       (PL_curinterp->Tregcomp_parse)
-#define PL_regcomp_rx          (PL_curinterp->Tregcomp_rx)
-#define PL_regcompp            (PL_curinterp->Tregcompp)
-#define PL_regdata             (PL_curinterp->Tregdata)
-#define PL_regdummy            (PL_curinterp->Tregdummy)
-#define PL_regendp             (PL_curinterp->Tregendp)
-#define PL_regeol              (PL_curinterp->Tregeol)
-#define PL_regexecp            (PL_curinterp->Tregexecp)
-#define PL_regflags            (PL_curinterp->Tregflags)
-#define PL_regindent           (PL_curinterp->Tregindent)
-#define PL_reginput            (PL_curinterp->Treginput)
-#define PL_reginterp_cnt       (PL_curinterp->Treginterp_cnt)
-#define PL_reglastparen                (PL_curinterp->Treglastparen)
-#define PL_regnarrate          (PL_curinterp->Tregnarrate)
-#define PL_regnaughty          (PL_curinterp->Tregnaughty)
-#define PL_regnpar             (PL_curinterp->Tregnpar)
-#define PL_regprecomp          (PL_curinterp->Tregprecomp)
-#define PL_regprev             (PL_curinterp->Tregprev)
-#define PL_regprogram          (PL_curinterp->Tregprogram)
-#define PL_regsawback          (PL_curinterp->Tregsawback)
-#define PL_regseen             (PL_curinterp->Tregseen)
-#define PL_regsize             (PL_curinterp->Tregsize)
-#define PL_regstartp           (PL_curinterp->Tregstartp)
-#define PL_regtill             (PL_curinterp->Tregtill)
-#define PL_regxend             (PL_curinterp->Tregxend)
-#define PL_restartop           (PL_curinterp->Trestartop)
-#define PL_retstack            (PL_curinterp->Tretstack)
-#define PL_retstack_ix         (PL_curinterp->Tretstack_ix)
-#define PL_retstack_max                (PL_curinterp->Tretstack_max)
-#define PL_rs                  (PL_curinterp->Trs)
-#define PL_savestack           (PL_curinterp->Tsavestack)
-#define PL_savestack_ix                (PL_curinterp->Tsavestack_ix)
-#define PL_savestack_max       (PL_curinterp->Tsavestack_max)
-#define PL_scopestack          (PL_curinterp->Tscopestack)
-#define PL_scopestack_ix       (PL_curinterp->Tscopestack_ix)
-#define PL_scopestack_max      (PL_curinterp->Tscopestack_max)
-#define PL_screamfirst         (PL_curinterp->Tscreamfirst)
-#define PL_screamnext          (PL_curinterp->Tscreamnext)
-#define PL_secondgv            (PL_curinterp->Tsecondgv)
-#define PL_seen_evals          (PL_curinterp->Tseen_evals)
-#define PL_seen_zerolen                (PL_curinterp->Tseen_zerolen)
-#define PL_sortcop             (PL_curinterp->Tsortcop)
-#define PL_sortcxix            (PL_curinterp->Tsortcxix)
-#define PL_sortstash           (PL_curinterp->Tsortstash)
-#define PL_stack_base          (PL_curinterp->Tstack_base)
-#define PL_stack_max           (PL_curinterp->Tstack_max)
-#define PL_stack_sp            (PL_curinterp->Tstack_sp)
-#define PL_start_env           (PL_curinterp->Tstart_env)
-#define PL_statbuf             (PL_curinterp->Tstatbuf)
-#define PL_statcache           (PL_curinterp->Tstatcache)
-#define PL_statgv              (PL_curinterp->Tstatgv)
-#define PL_statname            (PL_curinterp->Tstatname)
-#define PL_tainted             (PL_curinterp->Ttainted)
-#define PL_timesbuf            (PL_curinterp->Ttimesbuf)
-#define PL_tmps_floor          (PL_curinterp->Ttmps_floor)
-#define PL_tmps_ix             (PL_curinterp->Ttmps_ix)
-#define PL_tmps_max            (PL_curinterp->Ttmps_max)
-#define PL_tmps_stack          (PL_curinterp->Ttmps_stack)
-#define PL_top_env             (PL_curinterp->Ttop_env)
-#define PL_toptarget           (PL_curinterp->Ttoptarget)
-#define PL_watchaddr           (PL_curinterp->Twatchaddr)
-#define PL_watchok             (PL_curinterp->Twatchok)
+#define PL_Argv                        (PERL_GET_INTERP->IArgv)
+#define PL_Cmd                 (PERL_GET_INTERP->ICmd)
+#define PL_DBcv                        (PERL_GET_INTERP->IDBcv)
+#define PL_DBgv                        (PERL_GET_INTERP->IDBgv)
+#define PL_DBline              (PERL_GET_INTERP->IDBline)
+#define PL_DBsignal            (PERL_GET_INTERP->IDBsignal)
+#define PL_DBsingle            (PERL_GET_INTERP->IDBsingle)
+#define PL_DBsub               (PERL_GET_INTERP->IDBsub)
+#define PL_DBtrace             (PERL_GET_INTERP->IDBtrace)
+#define PL_Dir                 (PERL_GET_INTERP->IDir)
+#define PL_Env                 (PERL_GET_INTERP->IEnv)
+#define PL_LIO                 (PERL_GET_INTERP->ILIO)
+#define PL_Mem                 (PERL_GET_INTERP->IMem)
+#define PL_Proc                        (PERL_GET_INTERP->IProc)
+#define PL_Sock                        (PERL_GET_INTERP->ISock)
+#define PL_StdIO               (PERL_GET_INTERP->IStdIO)
+#define PL_amagic_generation   (PERL_GET_INTERP->Iamagic_generation)
+#define PL_ampergv             (PERL_GET_INTERP->Iampergv)
+#define PL_an                  (PERL_GET_INTERP->Ian)
+#define PL_archpat_auto                (PERL_GET_INTERP->Iarchpat_auto)
+#define PL_argvgv              (PERL_GET_INTERP->Iargvgv)
+#define PL_argvoutgv           (PERL_GET_INTERP->Iargvoutgv)
+#define PL_basetime            (PERL_GET_INTERP->Ibasetime)
+#define PL_beginav             (PERL_GET_INTERP->Ibeginav)
+#define PL_bitcount            (PERL_GET_INTERP->Ibitcount)
+#define PL_bufend              (PERL_GET_INTERP->Ibufend)
+#define PL_bufptr              (PERL_GET_INTERP->Ibufptr)
+#define PL_cddir               (PERL_GET_INTERP->Icddir)
+#define PL_collation_ix                (PERL_GET_INTERP->Icollation_ix)
+#define PL_collation_name      (PERL_GET_INTERP->Icollation_name)
+#define PL_collation_standard  (PERL_GET_INTERP->Icollation_standard)
+#define PL_collxfrm_base       (PERL_GET_INTERP->Icollxfrm_base)
+#define PL_collxfrm_mult       (PERL_GET_INTERP->Icollxfrm_mult)
+#define PL_compcv              (PERL_GET_INTERP->Icompcv)
+#define PL_compiling           (PERL_GET_INTERP->Icompiling)
+#define PL_comppad             (PERL_GET_INTERP->Icomppad)
+#define PL_comppad_name                (PERL_GET_INTERP->Icomppad_name)
+#define PL_comppad_name_fill   (PERL_GET_INTERP->Icomppad_name_fill)
+#define PL_comppad_name_floor  (PERL_GET_INTERP->Icomppad_name_floor)
+#define PL_cop_seqmax          (PERL_GET_INTERP->Icop_seqmax)
+#define PL_copline             (PERL_GET_INTERP->Icopline)
+#define PL_cred_mutex          (PERL_GET_INTERP->Icred_mutex)
+#define PL_cryptseen           (PERL_GET_INTERP->Icryptseen)
+#define PL_cshlen              (PERL_GET_INTERP->Icshlen)
+#define PL_cshname             (PERL_GET_INTERP->Icshname)
+#define PL_curcopdb            (PERL_GET_INTERP->Icurcopdb)
+#define PL_curstname           (PERL_GET_INTERP->Icurstname)
+#define PL_curthr              (PERL_GET_INTERP->Icurthr)
+#define PL_dbargs              (PERL_GET_INTERP->Idbargs)
+#define PL_debdelim            (PERL_GET_INTERP->Idebdelim)
+#define PL_debname             (PERL_GET_INTERP->Idebname)
+#define PL_debstash            (PERL_GET_INTERP->Idebstash)
+#define PL_debug               (PERL_GET_INTERP->Idebug)
+#define PL_defgv               (PERL_GET_INTERP->Idefgv)
+#define PL_diehook             (PERL_GET_INTERP->Idiehook)
+#define PL_dlevel              (PERL_GET_INTERP->Idlevel)
+#define PL_dlmax               (PERL_GET_INTERP->Idlmax)
+#define PL_doextract           (PERL_GET_INTERP->Idoextract)
+#define PL_doswitches          (PERL_GET_INTERP->Idoswitches)
+#define PL_dowarn              (PERL_GET_INTERP->Idowarn)
+#define PL_e_script            (PERL_GET_INTERP->Ie_script)
+#define PL_egid                        (PERL_GET_INTERP->Iegid)
+#define PL_endav               (PERL_GET_INTERP->Iendav)
+#define PL_envgv               (PERL_GET_INTERP->Ienvgv)
+#define PL_errgv               (PERL_GET_INTERP->Ierrgv)
+#define PL_error_count         (PERL_GET_INTERP->Ierror_count)
+#define PL_euid                        (PERL_GET_INTERP->Ieuid)
+#define PL_eval_cond           (PERL_GET_INTERP->Ieval_cond)
+#define PL_eval_mutex          (PERL_GET_INTERP->Ieval_mutex)
+#define PL_eval_owner          (PERL_GET_INTERP->Ieval_owner)
+#define PL_eval_root           (PERL_GET_INTERP->Ieval_root)
+#define PL_eval_start          (PERL_GET_INTERP->Ieval_start)
+#define PL_evalseq             (PERL_GET_INTERP->Ievalseq)
+#define PL_exitlist            (PERL_GET_INTERP->Iexitlist)
+#define PL_exitlistlen         (PERL_GET_INTERP->Iexitlistlen)
+#define PL_expect              (PERL_GET_INTERP->Iexpect)
+#define PL_fdpid               (PERL_GET_INTERP->Ifdpid)
+#define PL_filemode            (PERL_GET_INTERP->Ifilemode)
+#define PL_filter_debug                (PERL_GET_INTERP->Ifilter_debug)
+#define PL_forkprocess         (PERL_GET_INTERP->Iforkprocess)
+#define PL_formfeed            (PERL_GET_INTERP->Iformfeed)
+#define PL_generation          (PERL_GET_INTERP->Igeneration)
+#define PL_gensym              (PERL_GET_INTERP->Igensym)
+#define PL_gid                 (PERL_GET_INTERP->Igid)
+#define PL_glob_index          (PERL_GET_INTERP->Iglob_index)
+#define PL_globalstash         (PERL_GET_INTERP->Iglobalstash)
+#define PL_he_root             (PERL_GET_INTERP->Ihe_root)
+#define PL_hintgv              (PERL_GET_INTERP->Ihintgv)
+#define PL_hints               (PERL_GET_INTERP->Ihints)
+#define PL_in_clean_all                (PERL_GET_INTERP->Iin_clean_all)
+#define PL_in_clean_objs       (PERL_GET_INTERP->Iin_clean_objs)
+#define PL_in_my               (PERL_GET_INTERP->Iin_my)
+#define PL_in_my_stash         (PERL_GET_INTERP->Iin_my_stash)
+#define PL_incgv               (PERL_GET_INTERP->Iincgv)
+#define PL_initav              (PERL_GET_INTERP->Iinitav)
+#define PL_inplace             (PERL_GET_INTERP->Iinplace)
+#define PL_last_lop            (PERL_GET_INTERP->Ilast_lop)
+#define PL_last_lop_op         (PERL_GET_INTERP->Ilast_lop_op)
+#define PL_last_swash_hv       (PERL_GET_INTERP->Ilast_swash_hv)
+#define PL_last_swash_key      (PERL_GET_INTERP->Ilast_swash_key)
+#define PL_last_swash_klen     (PERL_GET_INTERP->Ilast_swash_klen)
+#define PL_last_swash_slen     (PERL_GET_INTERP->Ilast_swash_slen)
+#define PL_last_swash_tmps     (PERL_GET_INTERP->Ilast_swash_tmps)
+#define PL_last_uni            (PERL_GET_INTERP->Ilast_uni)
+#define PL_lastfd              (PERL_GET_INTERP->Ilastfd)
+#define PL_lastsize            (PERL_GET_INTERP->Ilastsize)
+#define PL_lastspbase          (PERL_GET_INTERP->Ilastspbase)
+#define PL_laststatval         (PERL_GET_INTERP->Ilaststatval)
+#define PL_laststype           (PERL_GET_INTERP->Ilaststype)
+#define PL_leftgv              (PERL_GET_INTERP->Ileftgv)
+#define PL_lex_brackets                (PERL_GET_INTERP->Ilex_brackets)
+#define PL_lex_brackstack      (PERL_GET_INTERP->Ilex_brackstack)
+#define PL_lex_casemods                (PERL_GET_INTERP->Ilex_casemods)
+#define PL_lex_casestack       (PERL_GET_INTERP->Ilex_casestack)
+#define PL_lex_defer           (PERL_GET_INTERP->Ilex_defer)
+#define PL_lex_dojoin          (PERL_GET_INTERP->Ilex_dojoin)
+#define PL_lex_expect          (PERL_GET_INTERP->Ilex_expect)
+#define PL_lex_fakebrack       (PERL_GET_INTERP->Ilex_fakebrack)
+#define PL_lex_formbrack       (PERL_GET_INTERP->Ilex_formbrack)
+#define PL_lex_inpat           (PERL_GET_INTERP->Ilex_inpat)
+#define PL_lex_inwhat          (PERL_GET_INTERP->Ilex_inwhat)
+#define PL_lex_op              (PERL_GET_INTERP->Ilex_op)
+#define PL_lex_repl            (PERL_GET_INTERP->Ilex_repl)
+#define PL_lex_starts          (PERL_GET_INTERP->Ilex_starts)
+#define PL_lex_state           (PERL_GET_INTERP->Ilex_state)
+#define PL_lex_stuff           (PERL_GET_INTERP->Ilex_stuff)
+#define PL_lineary             (PERL_GET_INTERP->Ilineary)
+#define PL_linestart           (PERL_GET_INTERP->Ilinestart)
+#define PL_linestr             (PERL_GET_INTERP->Ilinestr)
+#define PL_localpatches                (PERL_GET_INTERP->Ilocalpatches)
+#define PL_main_cv             (PERL_GET_INTERP->Imain_cv)
+#define PL_main_root           (PERL_GET_INTERP->Imain_root)
+#define PL_main_start          (PERL_GET_INTERP->Imain_start)
+#define PL_malloc_mutex                (PERL_GET_INTERP->Imalloc_mutex)
+#define PL_max_intro_pending   (PERL_GET_INTERP->Imax_intro_pending)
+#define PL_maxo                        (PERL_GET_INTERP->Imaxo)
+#define PL_maxsysfd            (PERL_GET_INTERP->Imaxsysfd)
+#define PL_mess_sv             (PERL_GET_INTERP->Imess_sv)
+#define PL_min_intro_pending   (PERL_GET_INTERP->Imin_intro_pending)
+#define PL_minus_F             (PERL_GET_INTERP->Iminus_F)
+#define PL_minus_a             (PERL_GET_INTERP->Iminus_a)
+#define PL_minus_c             (PERL_GET_INTERP->Iminus_c)
+#define PL_minus_l             (PERL_GET_INTERP->Iminus_l)
+#define PL_minus_n             (PERL_GET_INTERP->Iminus_n)
+#define PL_minus_p             (PERL_GET_INTERP->Iminus_p)
+#define PL_modglobal           (PERL_GET_INTERP->Imodglobal)
+#define PL_multi_close         (PERL_GET_INTERP->Imulti_close)
+#define PL_multi_end           (PERL_GET_INTERP->Imulti_end)
+#define PL_multi_open          (PERL_GET_INTERP->Imulti_open)
+#define PL_multi_start         (PERL_GET_INTERP->Imulti_start)
+#define PL_multiline           (PERL_GET_INTERP->Imultiline)
+#define PL_mystrk              (PERL_GET_INTERP->Imystrk)
+#define PL_nexttoke            (PERL_GET_INTERP->Inexttoke)
+#define PL_nexttype            (PERL_GET_INTERP->Inexttype)
+#define PL_nextval             (PERL_GET_INTERP->Inextval)
+#define PL_nice_chunk          (PERL_GET_INTERP->Inice_chunk)
+#define PL_nice_chunk_size     (PERL_GET_INTERP->Inice_chunk_size)
+#define PL_nomemok             (PERL_GET_INTERP->Inomemok)
+#define PL_nthreads            (PERL_GET_INTERP->Inthreads)
+#define PL_nthreads_cond       (PERL_GET_INTERP->Inthreads_cond)
+#define PL_numeric_local       (PERL_GET_INTERP->Inumeric_local)
+#define PL_numeric_name                (PERL_GET_INTERP->Inumeric_name)
+#define PL_numeric_radix       (PERL_GET_INTERP->Inumeric_radix)
+#define PL_numeric_standard    (PERL_GET_INTERP->Inumeric_standard)
+#define PL_ofmt                        (PERL_GET_INTERP->Iofmt)
+#define PL_oldbufptr           (PERL_GET_INTERP->Ioldbufptr)
+#define PL_oldlastpm           (PERL_GET_INTERP->Ioldlastpm)
+#define PL_oldname             (PERL_GET_INTERP->Ioldname)
+#define PL_oldoldbufptr                (PERL_GET_INTERP->Ioldoldbufptr)
+#define PL_op_mask             (PERL_GET_INTERP->Iop_mask)
+#define PL_op_seqmax           (PERL_GET_INTERP->Iop_seqmax)
+#define PL_origalen            (PERL_GET_INTERP->Iorigalen)
+#define PL_origargc            (PERL_GET_INTERP->Iorigargc)
+#define PL_origargv            (PERL_GET_INTERP->Iorigargv)
+#define PL_origenviron         (PERL_GET_INTERP->Iorigenviron)
+#define PL_origfilename                (PERL_GET_INTERP->Iorigfilename)
+#define PL_ors                 (PERL_GET_INTERP->Iors)
+#define PL_orslen              (PERL_GET_INTERP->Iorslen)
+#define PL_osname              (PERL_GET_INTERP->Iosname)
+#define PL_pad_reset_pending   (PERL_GET_INTERP->Ipad_reset_pending)
+#define PL_padix               (PERL_GET_INTERP->Ipadix)
+#define PL_padix_floor         (PERL_GET_INTERP->Ipadix_floor)
+#define PL_patchlevel          (PERL_GET_INTERP->Ipatchlevel)
+#define PL_pending_ident       (PERL_GET_INTERP->Ipending_ident)
+#define PL_perl_destruct_level (PERL_GET_INTERP->Iperl_destruct_level)
+#define PL_perldb              (PERL_GET_INTERP->Iperldb)
+#define PL_pidstatus           (PERL_GET_INTERP->Ipidstatus)
+#define PL_preambleav          (PERL_GET_INTERP->Ipreambleav)
+#define PL_preambled           (PERL_GET_INTERP->Ipreambled)
+#define PL_preprocess          (PERL_GET_INTERP->Ipreprocess)
+#define PL_profiledata         (PERL_GET_INTERP->Iprofiledata)
+#define PL_replgv              (PERL_GET_INTERP->Ireplgv)
+#define PL_rightgv             (PERL_GET_INTERP->Irightgv)
+#define PL_rsfp                        (PERL_GET_INTERP->Irsfp)
+#define PL_rsfp_filters                (PERL_GET_INTERP->Irsfp_filters)
+#define PL_runops              (PERL_GET_INTERP->Irunops)
+#define PL_sawampersand                (PERL_GET_INTERP->Isawampersand)
+#define PL_sawstudy            (PERL_GET_INTERP->Isawstudy)
+#define PL_sawvec              (PERL_GET_INTERP->Isawvec)
+#define PL_sh_path             (PERL_GET_INTERP->Ish_path)
+#define PL_siggv               (PERL_GET_INTERP->Isiggv)
+#define PL_sighandlerp         (PERL_GET_INTERP->Isighandlerp)
+#define PL_splitstr            (PERL_GET_INTERP->Isplitstr)
+#define PL_srand_called                (PERL_GET_INTERP->Isrand_called)
+#define PL_statusvalue         (PERL_GET_INTERP->Istatusvalue)
+#define PL_statusvalue_vms     (PERL_GET_INTERP->Istatusvalue_vms)
+#define PL_stderrgv            (PERL_GET_INTERP->Istderrgv)
+#define PL_stdingv             (PERL_GET_INTERP->Istdingv)
+#define PL_strchop             (PERL_GET_INTERP->Istrchop)
+#define PL_strtab              (PERL_GET_INTERP->Istrtab)
+#define PL_strtab_mutex                (PERL_GET_INTERP->Istrtab_mutex)
+#define PL_sub_generation      (PERL_GET_INTERP->Isub_generation)
+#define PL_sublex_info         (PERL_GET_INTERP->Isublex_info)
+#define PL_subline             (PERL_GET_INTERP->Isubline)
+#define PL_subname             (PERL_GET_INTERP->Isubname)
+#define PL_sv_arenaroot                (PERL_GET_INTERP->Isv_arenaroot)
+#define PL_sv_count            (PERL_GET_INTERP->Isv_count)
+#define PL_sv_mutex            (PERL_GET_INTERP->Isv_mutex)
+#define PL_sv_no               (PERL_GET_INTERP->Isv_no)
+#define PL_sv_objcount         (PERL_GET_INTERP->Isv_objcount)
+#define PL_sv_root             (PERL_GET_INTERP->Isv_root)
+#define PL_sv_undef            (PERL_GET_INTERP->Isv_undef)
+#define PL_sv_yes              (PERL_GET_INTERP->Isv_yes)
+#define PL_svref_mutex         (PERL_GET_INTERP->Isvref_mutex)
+#define PL_sys_intern          (PERL_GET_INTERP->Isys_intern)
+#define PL_tainting            (PERL_GET_INTERP->Itainting)
+#define PL_thisexpr            (PERL_GET_INTERP->Ithisexpr)
+#define PL_thr_key             (PERL_GET_INTERP->Ithr_key)
+#define PL_threadnum           (PERL_GET_INTERP->Ithreadnum)
+#define PL_threads_mutex       (PERL_GET_INTERP->Ithreads_mutex)
+#define PL_threadsv_names      (PERL_GET_INTERP->Ithreadsv_names)
+#define PL_thrsv               (PERL_GET_INTERP->Ithrsv)
+#define PL_tokenbuf            (PERL_GET_INTERP->Itokenbuf)
+#define PL_uid                 (PERL_GET_INTERP->Iuid)
+#define PL_unsafe              (PERL_GET_INTERP->Iunsafe)
+#define PL_utf8_alnum          (PERL_GET_INTERP->Iutf8_alnum)
+#define PL_utf8_alnumc         (PERL_GET_INTERP->Iutf8_alnumc)
+#define PL_utf8_alpha          (PERL_GET_INTERP->Iutf8_alpha)
+#define PL_utf8_ascii          (PERL_GET_INTERP->Iutf8_ascii)
+#define PL_utf8_cntrl          (PERL_GET_INTERP->Iutf8_cntrl)
+#define PL_utf8_digit          (PERL_GET_INTERP->Iutf8_digit)
+#define PL_utf8_graph          (PERL_GET_INTERP->Iutf8_graph)
+#define PL_utf8_lower          (PERL_GET_INTERP->Iutf8_lower)
+#define PL_utf8_mark           (PERL_GET_INTERP->Iutf8_mark)
+#define PL_utf8_print          (PERL_GET_INTERP->Iutf8_print)
+#define PL_utf8_punct          (PERL_GET_INTERP->Iutf8_punct)
+#define PL_utf8_space          (PERL_GET_INTERP->Iutf8_space)
+#define PL_utf8_tolower                (PERL_GET_INTERP->Iutf8_tolower)
+#define PL_utf8_totitle                (PERL_GET_INTERP->Iutf8_totitle)
+#define PL_utf8_toupper                (PERL_GET_INTERP->Iutf8_toupper)
+#define PL_utf8_upper          (PERL_GET_INTERP->Iutf8_upper)
+#define PL_utf8_xdigit         (PERL_GET_INTERP->Iutf8_xdigit)
+#define PL_uudmap              (PERL_GET_INTERP->Iuudmap)
+#define PL_warnhook            (PERL_GET_INTERP->Iwarnhook)
+#define PL_xiv_arenaroot       (PERL_GET_INTERP->Ixiv_arenaroot)
+#define PL_xiv_root            (PERL_GET_INTERP->Ixiv_root)
+#define PL_xnv_root            (PERL_GET_INTERP->Ixnv_root)
+#define PL_xpv_root            (PERL_GET_INTERP->Ixpv_root)
+#define PL_xpvav_root          (PERL_GET_INTERP->Ixpvav_root)
+#define PL_xpvbm_root          (PERL_GET_INTERP->Ixpvbm_root)
+#define PL_xpvcv_root          (PERL_GET_INTERP->Ixpvcv_root)
+#define PL_xpvhv_root          (PERL_GET_INTERP->Ixpvhv_root)
+#define PL_xpviv_root          (PERL_GET_INTERP->Ixpviv_root)
+#define PL_xpvlv_root          (PERL_GET_INTERP->Ixpvlv_root)
+#define PL_xpvmg_root          (PERL_GET_INTERP->Ixpvmg_root)
+#define PL_xpvnv_root          (PERL_GET_INTERP->Ixpvnv_root)
+#define PL_xrv_root            (PERL_GET_INTERP->Ixrv_root)
+#define PL_yychar              (PERL_GET_INTERP->Iyychar)
+#define PL_yydebug             (PERL_GET_INTERP->Iyydebug)
+#define PL_yyerrflag           (PERL_GET_INTERP->Iyyerrflag)
+#define PL_yylval              (PERL_GET_INTERP->Iyylval)
+#define PL_yynerrs             (PERL_GET_INTERP->Iyynerrs)
+#define PL_yyval               (PERL_GET_INTERP->Iyyval)

 
 

-#endif /* !PERL_IMPLICIT_CONTEXT */
-#endif /* !USE_THREADS */
+#  else                /* !USE_THREADS */
+/* cases 2 and 3 above */

 
 

-/* These are always per-interpreter if there is more than one */
+#define PL_Argv                        (vTHX->IArgv)
+#define PL_Cmd                 (vTHX->ICmd)
+#define PL_DBcv                        (vTHX->IDBcv)
+#define PL_DBgv                        (vTHX->IDBgv)
+#define PL_DBline              (vTHX->IDBline)
+#define PL_DBsignal            (vTHX->IDBsignal)
+#define PL_DBsingle            (vTHX->IDBsingle)
+#define PL_DBsub               (vTHX->IDBsub)
+#define PL_DBtrace             (vTHX->IDBtrace)
+#define PL_Dir                 (vTHX->IDir)
+#define PL_Env                 (vTHX->IEnv)
+#define PL_LIO                 (vTHX->ILIO)
+#define PL_Mem                 (vTHX->IMem)
+#define PL_Proc                        (vTHX->IProc)
+#define PL_Sock                        (vTHX->ISock)
+#define PL_StdIO               (vTHX->IStdIO)
+#define PL_amagic_generation   (vTHX->Iamagic_generation)
+#define PL_ampergv             (vTHX->Iampergv)
+#define PL_an                  (vTHX->Ian)
+#define PL_archpat_auto                (vTHX->Iarchpat_auto)
+#define PL_argvgv              (vTHX->Iargvgv)
+#define PL_argvoutgv           (vTHX->Iargvoutgv)
+#define PL_basetime            (vTHX->Ibasetime)
+#define PL_beginav             (vTHX->Ibeginav)
+#define PL_bitcount            (vTHX->Ibitcount)
+#define PL_bufend              (vTHX->Ibufend)
+#define PL_bufptr              (vTHX->Ibufptr)
+#define PL_cddir               (vTHX->Icddir)
+#define PL_collation_ix                (vTHX->Icollation_ix)
+#define PL_collation_name      (vTHX->Icollation_name)
+#define PL_collation_standard  (vTHX->Icollation_standard)
+#define PL_collxfrm_base       (vTHX->Icollxfrm_base)
+#define PL_collxfrm_mult       (vTHX->Icollxfrm_mult)
+#define PL_compcv              (vTHX->Icompcv)
+#define PL_compiling           (vTHX->Icompiling)
+#define PL_comppad             (vTHX->Icomppad)
+#define PL_comppad_name                (vTHX->Icomppad_name)
+#define PL_comppad_name_fill   (vTHX->Icomppad_name_fill)
+#define PL_comppad_name_floor  (vTHX->Icomppad_name_floor)
+#define PL_cop_seqmax          (vTHX->Icop_seqmax)
+#define PL_copline             (vTHX->Icopline)
+#define PL_cred_mutex          (vTHX->Icred_mutex)
+#define PL_cryptseen           (vTHX->Icryptseen)
+#define PL_cshlen              (vTHX->Icshlen)
+#define PL_cshname             (vTHX->Icshname)
+#define PL_curcopdb            (vTHX->Icurcopdb)
+#define PL_curstname           (vTHX->Icurstname)
+#define PL_curthr              (vTHX->Icurthr)
+#define PL_dbargs              (vTHX->Idbargs)
+#define PL_debdelim            (vTHX->Idebdelim)
+#define PL_debname             (vTHX->Idebname)
+#define PL_debstash            (vTHX->Idebstash)
+#define PL_debug               (vTHX->Idebug)
+#define PL_defgv               (vTHX->Idefgv)
+#define PL_diehook             (vTHX->Idiehook)
+#define PL_dlevel              (vTHX->Idlevel)
+#define PL_dlmax               (vTHX->Idlmax)
+#define PL_doextract           (vTHX->Idoextract)
+#define PL_doswitches          (vTHX->Idoswitches)
+#define PL_dowarn              (vTHX->Idowarn)
+#define PL_e_script            (vTHX->Ie_script)
+#define PL_egid                        (vTHX->Iegid)
+#define PL_endav               (vTHX->Iendav)
+#define PL_envgv               (vTHX->Ienvgv)
+#define PL_errgv               (vTHX->Ierrgv)
+#define PL_error_count         (vTHX->Ierror_count)
+#define PL_euid                        (vTHX->Ieuid)
+#define PL_eval_cond           (vTHX->Ieval_cond)
+#define PL_eval_mutex          (vTHX->Ieval_mutex)
+#define PL_eval_owner          (vTHX->Ieval_owner)
+#define PL_eval_root           (vTHX->Ieval_root)
+#define PL_eval_start          (vTHX->Ieval_start)
+#define PL_evalseq             (vTHX->Ievalseq)
+#define PL_exitlist            (vTHX->Iexitlist)
+#define PL_exitlistlen         (vTHX->Iexitlistlen)
+#define PL_expect              (vTHX->Iexpect)
+#define PL_fdpid               (vTHX->Ifdpid)
+#define PL_filemode            (vTHX->Ifilemode)
+#define PL_filter_debug                (vTHX->Ifilter_debug)
+#define PL_forkprocess         (vTHX->Iforkprocess)
+#define PL_formfeed            (vTHX->Iformfeed)
+#define PL_generation          (vTHX->Igeneration)
+#define PL_gensym              (vTHX->Igensym)
+#define PL_gid                 (vTHX->Igid)
+#define PL_glob_index          (vTHX->Iglob_index)
+#define PL_globalstash         (vTHX->Iglobalstash)
+#define PL_he_root             (vTHX->Ihe_root)
+#define PL_hintgv              (vTHX->Ihintgv)
+#define PL_hints               (vTHX->Ihints)
+#define PL_in_clean_all                (vTHX->Iin_clean_all)
+#define PL_in_clean_objs       (vTHX->Iin_clean_objs)
+#define PL_in_my               (vTHX->Iin_my)
+#define PL_in_my_stash         (vTHX->Iin_my_stash)
+#define PL_incgv               (vTHX->Iincgv)
+#define PL_initav              (vTHX->Iinitav)
+#define PL_inplace             (vTHX->Iinplace)
+#define PL_last_lop            (vTHX->Ilast_lop)
+#define PL_last_lop_op         (vTHX->Ilast_lop_op)
+#define PL_last_swash_hv       (vTHX->Ilast_swash_hv)
+#define PL_last_swash_key      (vTHX->Ilast_swash_key)
+#define PL_last_swash_klen     (vTHX->Ilast_swash_klen)
+#define PL_last_swash_slen     (vTHX->Ilast_swash_slen)
+#define PL_last_swash_tmps     (vTHX->Ilast_swash_tmps)
+#define PL_last_uni            (vTHX->Ilast_uni)
+#define PL_lastfd              (vTHX->Ilastfd)
+#define PL_lastsize            (vTHX->Ilastsize)
+#define PL_lastspbase          (vTHX->Ilastspbase)
+#define PL_laststatval         (vTHX->Ilaststatval)
+#define PL_laststype           (vTHX->Ilaststype)
+#define PL_leftgv              (vTHX->Ileftgv)
+#define PL_lex_brackets                (vTHX->Ilex_brackets)
+#define PL_lex_brackstack      (vTHX->Ilex_brackstack)
+#define PL_lex_casemods                (vTHX->Ilex_casemods)
+#define PL_lex_casestack       (vTHX->Ilex_casestack)
+#define PL_lex_defer           (vTHX->Ilex_defer)
+#define PL_lex_dojoin          (vTHX->Ilex_dojoin)
+#define PL_lex_expect          (vTHX->Ilex_expect)
+#define PL_lex_fakebrack       (vTHX->Ilex_fakebrack)
+#define PL_lex_formbrack       (vTHX->Ilex_formbrack)
+#define PL_lex_inpat           (vTHX->Ilex_inpat)
+#define PL_lex_inwhat          (vTHX->Ilex_inwhat)
+#define PL_lex_op              (vTHX->Ilex_op)
+#define PL_lex_repl            (vTHX->Ilex_repl)
+#define PL_lex_starts          (vTHX->Ilex_starts)
+#define PL_lex_state           (vTHX->Ilex_state)
+#define PL_lex_stuff           (vTHX->Ilex_stuff)
+#define PL_lineary             (vTHX->Ilineary)
+#define PL_linestart           (vTHX->Ilinestart)
+#define PL_linestr             (vTHX->Ilinestr)
+#define PL_localpatches                (vTHX->Ilocalpatches)
+#define PL_main_cv             (vTHX->Imain_cv)
+#define PL_main_root           (vTHX->Imain_root)
+#define PL_main_start          (vTHX->Imain_start)
+#define PL_malloc_mutex                (vTHX->Imalloc_mutex)
+#define PL_max_intro_pending   (vTHX->Imax_intro_pending)
+#define PL_maxo                        (vTHX->Imaxo)
+#define PL_maxsysfd            (vTHX->Imaxsysfd)
+#define PL_mess_sv             (vTHX->Imess_sv)
+#define PL_min_intro_pending   (vTHX->Imin_intro_pending)
+#define PL_minus_F             (vTHX->Iminus_F)
+#define PL_minus_a             (vTHX->Iminus_a)
+#define PL_minus_c             (vTHX->Iminus_c)
+#define PL_minus_l             (vTHX->Iminus_l)
+#define PL_minus_n             (vTHX->Iminus_n)
+#define PL_minus_p             (vTHX->Iminus_p)
+#define PL_modglobal           (vTHX->Imodglobal)
+#define PL_multi_close         (vTHX->Imulti_close)
+#define PL_multi_end           (vTHX->Imulti_end)
+#define PL_multi_open          (vTHX->Imulti_open)
+#define PL_multi_start         (vTHX->Imulti_start)
+#define PL_multiline           (vTHX->Imultiline)
+#define PL_mystrk              (vTHX->Imystrk)
+#define PL_nexttoke            (vTHX->Inexttoke)
+#define PL_nexttype            (vTHX->Inexttype)
+#define PL_nextval             (vTHX->Inextval)
+#define PL_nice_chunk          (vTHX->Inice_chunk)
+#define PL_nice_chunk_size     (vTHX->Inice_chunk_size)
+#define PL_nomemok             (vTHX->Inomemok)
+#define PL_nthreads            (vTHX->Inthreads)
+#define PL_nthreads_cond       (vTHX->Inthreads_cond)
+#define PL_numeric_local       (vTHX->Inumeric_local)
+#define PL_numeric_name                (vTHX->Inumeric_name)
+#define PL_numeric_radix       (vTHX->Inumeric_radix)
+#define PL_numeric_standard    (vTHX->Inumeric_standard)
+#define PL_ofmt                        (vTHX->Iofmt)
+#define PL_oldbufptr           (vTHX->Ioldbufptr)
+#define PL_oldlastpm           (vTHX->Ioldlastpm)
+#define PL_oldname             (vTHX->Ioldname)
+#define PL_oldoldbufptr                (vTHX->Ioldoldbufptr)
+#define PL_op_mask             (vTHX->Iop_mask)
+#define PL_op_seqmax           (vTHX->Iop_seqmax)
+#define PL_origalen            (vTHX->Iorigalen)
+#define PL_origargc            (vTHX->Iorigargc)
+#define PL_origargv            (vTHX->Iorigargv)
+#define PL_origenviron         (vTHX->Iorigenviron)
+#define PL_origfilename                (vTHX->Iorigfilename)
+#define PL_ors                 (vTHX->Iors)
+#define PL_orslen              (vTHX->Iorslen)
+#define PL_osname              (vTHX->Iosname)
+#define PL_pad_reset_pending   (vTHX->Ipad_reset_pending)
+#define PL_padix               (vTHX->Ipadix)
+#define PL_padix_floor         (vTHX->Ipadix_floor)
+#define PL_patchlevel          (vTHX->Ipatchlevel)
+#define PL_pending_ident       (vTHX->Ipending_ident)
+#define PL_perl_destruct_level (vTHX->Iperl_destruct_level)
+#define PL_perldb              (vTHX->Iperldb)
+#define PL_pidstatus           (vTHX->Ipidstatus)
+#define PL_preambleav          (vTHX->Ipreambleav)
+#define PL_preambled           (vTHX->Ipreambled)
+#define PL_preprocess          (vTHX->Ipreprocess)
+#define PL_profiledata         (vTHX->Iprofiledata)
+#define PL_replgv              (vTHX->Ireplgv)
+#define PL_rightgv             (vTHX->Irightgv)
+#define PL_rsfp                        (vTHX->Irsfp)
+#define PL_rsfp_filters                (vTHX->Irsfp_filters)
+#define PL_runops              (vTHX->Irunops)
+#define PL_sawampersand                (vTHX->Isawampersand)
+#define PL_sawstudy            (vTHX->Isawstudy)
+#define PL_sawvec              (vTHX->Isawvec)
+#define PL_sh_path             (vTHX->Ish_path)
+#define PL_siggv               (vTHX->Isiggv)
+#define PL_sighandlerp         (vTHX->Isighandlerp)
+#define PL_splitstr            (vTHX->Isplitstr)
+#define PL_srand_called                (vTHX->Isrand_called)
+#define PL_statusvalue         (vTHX->Istatusvalue)
+#define PL_statusvalue_vms     (vTHX->Istatusvalue_vms)
+#define PL_stderrgv            (vTHX->Istderrgv)
+#define PL_stdingv             (vTHX->Istdingv)
+#define PL_strchop             (vTHX->Istrchop)
+#define PL_strtab              (vTHX->Istrtab)
+#define PL_strtab_mutex                (vTHX->Istrtab_mutex)
+#define PL_sub_generation      (vTHX->Isub_generation)
+#define PL_sublex_info         (vTHX->Isublex_info)
+#define PL_subline             (vTHX->Isubline)
+#define PL_subname             (vTHX->Isubname)
+#define PL_sv_arenaroot                (vTHX->Isv_arenaroot)
+#define PL_sv_count            (vTHX->Isv_count)
+#define PL_sv_mutex            (vTHX->Isv_mutex)
+#define PL_sv_no               (vTHX->Isv_no)
+#define PL_sv_objcount         (vTHX->Isv_objcount)
+#define PL_sv_root             (vTHX->Isv_root)
+#define PL_sv_undef            (vTHX->Isv_undef)
+#define PL_sv_yes              (vTHX->Isv_yes)
+#define PL_svref_mutex         (vTHX->Isvref_mutex)
+#define PL_sys_intern          (vTHX->Isys_intern)
+#define PL_tainting            (vTHX->Itainting)
+#define PL_thisexpr            (vTHX->Ithisexpr)
+#define PL_thr_key             (vTHX->Ithr_key)
+#define PL_threadnum           (vTHX->Ithreadnum)
+#define PL_threads_mutex       (vTHX->Ithreads_mutex)
+#define PL_threadsv_names      (vTHX->Ithreadsv_names)
+#define PL_thrsv               (vTHX->Ithrsv)
+#define PL_tokenbuf            (vTHX->Itokenbuf)
+#define PL_uid                 (vTHX->Iuid)
+#define PL_unsafe              (vTHX->Iunsafe)
+#define PL_utf8_alnum          (vTHX->Iutf8_alnum)
+#define PL_utf8_alnumc         (vTHX->Iutf8_alnumc)
+#define PL_utf8_alpha          (vTHX->Iutf8_alpha)
+#define PL_utf8_ascii          (vTHX->Iutf8_ascii)
+#define PL_utf8_cntrl          (vTHX->Iutf8_cntrl)
+#define PL_utf8_digit          (vTHX->Iutf8_digit)
+#define PL_utf8_graph          (vTHX->Iutf8_graph)
+#define PL_utf8_lower          (vTHX->Iutf8_lower)
+#define PL_utf8_mark           (vTHX->Iutf8_mark)
+#define PL_utf8_print          (vTHX->Iutf8_print)
+#define PL_utf8_punct          (vTHX->Iutf8_punct)
+#define PL_utf8_space          (vTHX->Iutf8_space)
+#define PL_utf8_tolower                (vTHX->Iutf8_tolower)
+#define PL_utf8_totitle                (vTHX->Iutf8_totitle)
+#define PL_utf8_toupper                (vTHX->Iutf8_toupper)
+#define PL_utf8_upper          (vTHX->Iutf8_upper)
+#define PL_utf8_xdigit         (vTHX->Iutf8_xdigit)
+#define PL_uudmap              (vTHX->Iuudmap)
+#define PL_warnhook            (vTHX->Iwarnhook)
+#define PL_xiv_arenaroot       (vTHX->Ixiv_arenaroot)
+#define PL_xiv_root            (vTHX->Ixiv_root)
+#define PL_xnv_root            (vTHX->Ixnv_root)
+#define PL_xpv_root            (vTHX->Ixpv_root)
+#define PL_xpvav_root          (vTHX->Ixpvav_root)
+#define PL_xpvbm_root          (vTHX->Ixpvbm_root)
+#define PL_xpvcv_root          (vTHX->Ixpvcv_root)
+#define PL_xpvhv_root          (vTHX->Ixpvhv_root)
+#define PL_xpviv_root          (vTHX->Ixpviv_root)
+#define PL_xpvlv_root          (vTHX->Ixpvlv_root)
+#define PL_xpvmg_root          (vTHX->Ixpvmg_root)
+#define PL_xpvnv_root          (vTHX->Ixpvnv_root)
+#define PL_xrv_root            (vTHX->Ixrv_root)
+#define PL_yychar              (vTHX->Iyychar)
+#define PL_yydebug             (vTHX->Iyydebug)
+#define PL_yyerrflag           (vTHX->Iyyerrflag)
+#define PL_yylval              (vTHX->Iyylval)
+#define PL_yynerrs             (vTHX->Iyynerrs)
+#define PL_yyval               (vTHX->Iyyval)

 
 

-#define PL_Argv                        (PL_curinterp->IArgv)
-#define PL_Cmd                 (PL_curinterp->ICmd)
-#define PL_DBcv                        (PL_curinterp->IDBcv)
-#define PL_DBgv                        (PL_curinterp->IDBgv)
-#define PL_DBline              (PL_curinterp->IDBline)
-#define PL_DBsignal            (PL_curinterp->IDBsignal)
-#define PL_DBsingle            (PL_curinterp->IDBsingle)
-#define PL_DBsub               (PL_curinterp->IDBsub)
-#define PL_DBtrace             (PL_curinterp->IDBtrace)
-#define PL_amagic_generation   (PL_curinterp->Iamagic_generation)
-#define PL_ampergv             (PL_curinterp->Iampergv)
-#define PL_an                  (PL_curinterp->Ian)
-#define PL_archpat_auto                (PL_curinterp->Iarchpat_auto)
-#define PL_argvgv              (PL_curinterp->Iargvgv)
-#define PL_argvoutgv           (PL_curinterp->Iargvoutgv)
-#define PL_basetime            (PL_curinterp->Ibasetime)
-#define PL_beginav             (PL_curinterp->Ibeginav)
-#define PL_bitcount            (PL_curinterp->Ibitcount)
-#define PL_bufend              (PL_curinterp->Ibufend)
-#define PL_bufptr              (PL_curinterp->Ibufptr)
-#define PL_cddir               (PL_curinterp->Icddir)
-#define PL_collation_ix                (PL_curinterp->Icollation_ix)
-#define PL_collation_name      (PL_curinterp->Icollation_name)
-#define PL_collation_standard  (PL_curinterp->Icollation_standard)
-#define PL_collxfrm_base       (PL_curinterp->Icollxfrm_base)
-#define PL_collxfrm_mult       (PL_curinterp->Icollxfrm_mult)
-#define PL_compcv              (PL_curinterp->Icompcv)
-#define PL_compiling           (PL_curinterp->Icompiling)
-#define PL_comppad             (PL_curinterp->Icomppad)
-#define PL_comppad_name                (PL_curinterp->Icomppad_name)
-#define PL_comppad_name_fill   (PL_curinterp->Icomppad_name_fill)
-#define PL_comppad_name_floor  (PL_curinterp->Icomppad_name_floor)
-#define PL_cop_seqmax          (PL_curinterp->Icop_seqmax)
-#define PL_copline             (PL_curinterp->Icopline)
-#define PL_cred_mutex          (PL_curinterp->Icred_mutex)
-#define PL_cryptseen           (PL_curinterp->Icryptseen)
-#define PL_cshlen              (PL_curinterp->Icshlen)
-#define PL_cshname             (PL_curinterp->Icshname)
-#define PL_curcopdb            (PL_curinterp->Icurcopdb)
-#define PL_curstname           (PL_curinterp->Icurstname)
-#define PL_curthr              (PL_curinterp->Icurthr)
-#define PL_dbargs              (PL_curinterp->Idbargs)
-#define PL_debdelim            (PL_curinterp->Idebdelim)
-#define PL_debname             (PL_curinterp->Idebname)
-#define PL_debstash            (PL_curinterp->Idebstash)
-#define PL_debug               (PL_curinterp->Idebug)
-#define PL_defgv               (PL_curinterp->Idefgv)
-#define PL_diehook             (PL_curinterp->Idiehook)
-#define PL_dlevel              (PL_curinterp->Idlevel)
-#define PL_dlmax               (PL_curinterp->Idlmax)
-#define PL_doextract           (PL_curinterp->Idoextract)
-#define PL_doswitches          (PL_curinterp->Idoswitches)
-#define PL_dowarn              (PL_curinterp->Idowarn)
-#define PL_e_script            (PL_curinterp->Ie_script)
-#define PL_efloatbuf           (PL_curinterp->Iefloatbuf)
-#define PL_efloatsize          (PL_curinterp->Iefloatsize)
-#define PL_egid                        (PL_curinterp->Iegid)
-#define PL_endav               (PL_curinterp->Iendav)
-#define PL_envgv               (PL_curinterp->Ienvgv)
-#define PL_errgv               (PL_curinterp->Ierrgv)
-#define PL_error_count         (PL_curinterp->Ierror_count)
-#define PL_euid                        (PL_curinterp->Ieuid)
-#define PL_eval_cond           (PL_curinterp->Ieval_cond)
-#define PL_eval_mutex          (PL_curinterp->Ieval_mutex)
-#define PL_eval_owner          (PL_curinterp->Ieval_owner)
-#define PL_eval_root           (PL_curinterp->Ieval_root)
-#define PL_eval_start          (PL_curinterp->Ieval_start)
-#define PL_evalseq             (PL_curinterp->Ievalseq)
-#define PL_exitlist            (PL_curinterp->Iexitlist)
-#define PL_exitlistlen         (PL_curinterp->Iexitlistlen)
-#define PL_expect              (PL_curinterp->Iexpect)
-#define PL_fdpid               (PL_curinterp->Ifdpid)
-#define PL_filemode            (PL_curinterp->Ifilemode)
-#define PL_filter_debug                (PL_curinterp->Ifilter_debug)
-#define PL_forkprocess         (PL_curinterp->Iforkprocess)
-#define PL_formfeed            (PL_curinterp->Iformfeed)
-#define PL_generation          (PL_curinterp->Igeneration)
-#define PL_gensym              (PL_curinterp->Igensym)
-#define PL_gid                 (PL_curinterp->Igid)
-#define PL_glob_index          (PL_curinterp->Iglob_index)
-#define PL_globalstash         (PL_curinterp->Iglobalstash)
-#define PL_he_root             (PL_curinterp->Ihe_root)
-#define PL_hintgv              (PL_curinterp->Ihintgv)
-#define PL_hints               (PL_curinterp->Ihints)
-#define PL_in_clean_all                (PL_curinterp->Iin_clean_all)
-#define PL_in_clean_objs       (PL_curinterp->Iin_clean_objs)
-#define PL_in_my               (PL_curinterp->Iin_my)
-#define PL_in_my_stash         (PL_curinterp->Iin_my_stash)
-#define PL_incgv               (PL_curinterp->Iincgv)
-#define PL_initav              (PL_curinterp->Iinitav)
-#define PL_inplace             (PL_curinterp->Iinplace)
-#define PL_last_lop            (PL_curinterp->Ilast_lop)
-#define PL_last_lop_op         (PL_curinterp->Ilast_lop_op)
-#define PL_last_swash_hv       (PL_curinterp->Ilast_swash_hv)
-#define PL_last_swash_key      (PL_curinterp->Ilast_swash_key)
-#define PL_last_swash_klen     (PL_curinterp->Ilast_swash_klen)
-#define PL_last_swash_slen     (PL_curinterp->Ilast_swash_slen)
-#define PL_last_swash_tmps     (PL_curinterp->Ilast_swash_tmps)
-#define PL_last_uni            (PL_curinterp->Ilast_uni)
-#define PL_lastfd              (PL_curinterp->Ilastfd)
-#define PL_lastsize            (PL_curinterp->Ilastsize)
-#define PL_lastspbase          (PL_curinterp->Ilastspbase)
-#define PL_laststatval         (PL_curinterp->Ilaststatval)
-#define PL_laststype           (PL_curinterp->Ilaststype)
-#define PL_leftgv              (PL_curinterp->Ileftgv)
-#define PL_lex_brackets                (PL_curinterp->Ilex_brackets)
-#define PL_lex_brackstack      (PL_curinterp->Ilex_brackstack)
-#define PL_lex_casemods                (PL_curinterp->Ilex_casemods)
-#define PL_lex_casestack       (PL_curinterp->Ilex_casestack)
-#define PL_lex_defer           (PL_curinterp->Ilex_defer)
-#define PL_lex_dojoin          (PL_curinterp->Ilex_dojoin)
-#define PL_lex_expect          (PL_curinterp->Ilex_expect)
-#define PL_lex_fakebrack       (PL_curinterp->Ilex_fakebrack)
-#define PL_lex_formbrack       (PL_curinterp->Ilex_formbrack)
-#define PL_lex_inpat           (PL_curinterp->Ilex_inpat)
-#define PL_lex_inwhat          (PL_curinterp->Ilex_inwhat)
-#define PL_lex_op              (PL_curinterp->Ilex_op)
-#define PL_lex_repl            (PL_curinterp->Ilex_repl)
-#define PL_lex_starts          (PL_curinterp->Ilex_starts)
-#define PL_lex_state           (PL_curinterp->Ilex_state)
-#define PL_lex_stuff           (PL_curinterp->Ilex_stuff)
-#define PL_lineary             (PL_curinterp->Ilineary)
-#define PL_linestart           (PL_curinterp->Ilinestart)
-#define PL_linestr             (PL_curinterp->Ilinestr)
-#define PL_localpatches                (PL_curinterp->Ilocalpatches)
-#define PL_main_cv             (PL_curinterp->Imain_cv)
-#define PL_main_root           (PL_curinterp->Imain_root)
-#define PL_main_start          (PL_curinterp->Imain_start)
-#define PL_malloc_mutex                (PL_curinterp->Imalloc_mutex)
-#define PL_max_intro_pending   (PL_curinterp->Imax_intro_pending)
-#define PL_maxo                        (PL_curinterp->Imaxo)
-#define PL_maxsysfd            (PL_curinterp->Imaxsysfd)
-#define PL_mess_sv             (PL_curinterp->Imess_sv)
-#define PL_min_intro_pending   (PL_curinterp->Imin_intro_pending)
-#define PL_minus_F             (PL_curinterp->Iminus_F)
-#define PL_minus_a             (PL_curinterp->Iminus_a)
-#define PL_minus_c             (PL_curinterp->Iminus_c)
-#define PL_minus_l             (PL_curinterp->Iminus_l)
-#define PL_minus_n             (PL_curinterp->Iminus_n)
-#define PL_minus_p             (PL_curinterp->Iminus_p)
-#define PL_modglobal           (PL_curinterp->Imodglobal)
-#define PL_multi_close         (PL_curinterp->Imulti_close)
-#define PL_multi_end           (PL_curinterp->Imulti_end)
-#define PL_multi_open          (PL_curinterp->Imulti_open)
-#define PL_multi_start         (PL_curinterp->Imulti_start)
-#define PL_multiline           (PL_curinterp->Imultiline)
-#define PL_mystrk              (PL_curinterp->Imystrk)
-#define PL_nexttoke            (PL_curinterp->Inexttoke)
-#define PL_nexttype            (PL_curinterp->Inexttype)
-#define PL_nextval             (PL_curinterp->Inextval)
-#define PL_nice_chunk          (PL_curinterp->Inice_chunk)
-#define PL_nice_chunk_size     (PL_curinterp->Inice_chunk_size)
-#define PL_nomemok             (PL_curinterp->Inomemok)
-#define PL_nthreads            (PL_curinterp->Inthreads)
-#define PL_nthreads_cond       (PL_curinterp->Inthreads_cond)
-#define PL_numeric_local       (PL_curinterp->Inumeric_local)
-#define PL_numeric_name                (PL_curinterp->Inumeric_name)
-#define PL_numeric_radix       (PL_curinterp->Inumeric_radix)
-#define PL_numeric_standard    (PL_curinterp->Inumeric_standard)
-#define PL_ofmt                        (PL_curinterp->Iofmt)
-#define PL_oldbufptr           (PL_curinterp->Ioldbufptr)
-#define PL_oldlastpm           (PL_curinterp->Ioldlastpm)
-#define PL_oldname             (PL_curinterp->Ioldname)
-#define PL_oldoldbufptr                (PL_curinterp->Ioldoldbufptr)
-#define PL_op_mask             (PL_curinterp->Iop_mask)
-#define PL_op_seqmax           (PL_curinterp->Iop_seqmax)
-#define PL_origalen            (PL_curinterp->Iorigalen)
-#define PL_origargc            (PL_curinterp->Iorigargc)
-#define PL_origargv            (PL_curinterp->Iorigargv)
-#define PL_origenviron         (PL_curinterp->Iorigenviron)
-#define PL_origfilename                (PL_curinterp->Iorigfilename)
-#define PL_ors                 (PL_curinterp->Iors)
-#define PL_orslen              (PL_curinterp->Iorslen)
-#define PL_osname              (PL_curinterp->Iosname)
-#define PL_pad_reset_pending   (PL_curinterp->Ipad_reset_pending)
-#define PL_padix               (PL_curinterp->Ipadix)
-#define PL_padix_floor         (PL_curinterp->Ipadix_floor)
-#define PL_parsehook           (PL_curinterp->Iparsehook)
-#define PL_patchlevel          (PL_curinterp->Ipatchlevel)
-#define PL_pending_ident       (PL_curinterp->Ipending_ident)
-#define PL_perl_destruct_level (PL_curinterp->Iperl_destruct_level)
-#define PL_perldb              (PL_curinterp->Iperldb)
-#define PL_pidstatus           (PL_curinterp->Ipidstatus)
-#define PL_preambleav          (PL_curinterp->Ipreambleav)
-#define PL_preambled           (PL_curinterp->Ipreambled)
-#define PL_preprocess          (PL_curinterp->Ipreprocess)
-#define PL_profiledata         (PL_curinterp->Iprofiledata)
-#define PL_replgv              (PL_curinterp->Ireplgv)
-#define PL_rightgv             (PL_curinterp->Irightgv)
-#define PL_rsfp                        (PL_curinterp->Irsfp)
-#define PL_rsfp_filters                (PL_curinterp->Irsfp_filters)
-#define PL_runops              (PL_curinterp->Irunops)
-#define PL_sawampersand                (PL_curinterp->Isawampersand)
-#define PL_sawstudy            (PL_curinterp->Isawstudy)
-#define PL_sawvec              (PL_curinterp->Isawvec)
-#define PL_sh_path             (PL_curinterp->Ish_path)
-#define PL_siggv               (PL_curinterp->Isiggv)
-#define PL_sighandlerp         (PL_curinterp->Isighandlerp)
-#define PL_splitstr            (PL_curinterp->Isplitstr)
-#define PL_srand_called                (PL_curinterp->Isrand_called)
-#define PL_statusvalue         (PL_curinterp->Istatusvalue)
-#define PL_statusvalue_vms     (PL_curinterp->Istatusvalue_vms)
-#define PL_stdingv             (PL_curinterp->Istdingv)
-#define PL_strchop             (PL_curinterp->Istrchop)
-#define PL_strtab              (PL_curinterp->Istrtab)
-#define PL_strtab_mutex                (PL_curinterp->Istrtab_mutex)
-#define PL_sub_generation      (PL_curinterp->Isub_generation)
-#define PL_sublex_info         (PL_curinterp->Isublex_info)
-#define PL_subline             (PL_curinterp->Isubline)
-#define PL_subname             (PL_curinterp->Isubname)
-#define PL_sv_arenaroot                (PL_curinterp->Isv_arenaroot)
-#define PL_sv_count            (PL_curinterp->Isv_count)
-#define PL_sv_mutex            (PL_curinterp->Isv_mutex)
-#define PL_sv_no               (PL_curinterp->Isv_no)
-#define PL_sv_objcount         (PL_curinterp->Isv_objcount)
-#define PL_sv_root             (PL_curinterp->Isv_root)
-#define PL_sv_undef            (PL_curinterp->Isv_undef)
-#define PL_sv_yes              (PL_curinterp->Isv_yes)
-#define PL_svref_mutex         (PL_curinterp->Isvref_mutex)
-#define PL_sys_intern          (PL_curinterp->Isys_intern)
-#define PL_tainting            (PL_curinterp->Itainting)
-#define PL_thisexpr            (PL_curinterp->Ithisexpr)
-#define PL_thr_key             (PL_curinterp->Ithr_key)
-#define PL_threadnum           (PL_curinterp->Ithreadnum)
-#define PL_threads_mutex       (PL_curinterp->Ithreads_mutex)
-#define PL_threadsv_names      (PL_curinterp->Ithreadsv_names)
-#define PL_thrsv               (PL_curinterp->Ithrsv)
-#define PL_tokenbuf            (PL_curinterp->Itokenbuf)
-#define PL_uid                 (PL_curinterp->Iuid)
-#define PL_unsafe              (PL_curinterp->Iunsafe)
-#define PL_utf8_alnum          (PL_curinterp->Iutf8_alnum)
-#define PL_utf8_alpha          (PL_curinterp->Iutf8_alpha)
-#define PL_utf8_digit          (PL_curinterp->Iutf8_digit)
-#define PL_utf8_lower          (PL_curinterp->Iutf8_lower)
-#define PL_utf8_mark           (PL_curinterp->Iutf8_mark)
-#define PL_utf8_print          (PL_curinterp->Iutf8_print)
-#define PL_utf8_space          (PL_curinterp->Iutf8_space)
-#define PL_utf8_tolower                (PL_curinterp->Iutf8_tolower)
-#define PL_utf8_totitle                (PL_curinterp->Iutf8_totitle)
-#define PL_utf8_toupper                (PL_curinterp->Iutf8_toupper)
-#define PL_utf8_upper          (PL_curinterp->Iutf8_upper)
-#define PL_uudmap              (PL_curinterp->Iuudmap)
-#define PL_warnhook            (PL_curinterp->Iwarnhook)
-#define PL_xiv_arenaroot       (PL_curinterp->Ixiv_arenaroot)
-#define PL_xiv_root            (PL_curinterp->Ixiv_root)
-#define PL_xnv_root            (PL_curinterp->Ixnv_root)
-#define PL_xpv_root            (PL_curinterp->Ixpv_root)
-#define PL_xrv_root            (PL_curinterp->Ixrv_root)
-#define PL_yychar              (PL_curinterp->Iyychar)
-#define PL_yydebug             (PL_curinterp->Iyydebug)
-#define PL_yyerrflag           (PL_curinterp->Iyyerrflag)
-#define PL_yylval              (PL_curinterp->Iyylval)
-#define PL_yynerrs             (PL_curinterp->Iyynerrs)
-#define PL_yyval               (PL_curinterp->Iyyval)
+#  endif       /* USE_THREADS */

 
 #else  /* !MULTIPLICITY */
 
 #else  /* !MULTIPLICITY */

+/* cases 1, 4 and 6 above */

 
 #define PL_IArgv               PL_Argv
 #define PL_ICmd                        PL_Cmd
 
 #define PL_IArgv               PL_Argv
 #define PL_ICmd                        PL_Cmd


@@ -537,6 +736,13 @@
 #define PL_IDBsingle           PL_DBsingle
 #define PL_IDBsub              PL_DBsub
 #define PL_IDBtrace            PL_DBtrace
 #define PL_IDBsingle           PL_DBsingle
 #define PL_IDBsub              PL_DBsub
 #define PL_IDBtrace            PL_DBtrace

+#define PL_IDir                        PL_Dir
+#define PL_IEnv                        PL_Env
+#define PL_ILIO                        PL_LIO
+#define PL_IMem                        PL_Mem
+#define PL_IProc               PL_Proc
+#define PL_ISock               PL_Sock
+#define PL_IStdIO              PL_StdIO

 #define PL_Iamagic_generation  PL_amagic_generation
 #define PL_Iampergv            PL_ampergv
 #define PL_Ian                 PL_an
 #define PL_Iamagic_generation  PL_amagic_generation
 #define PL_Iampergv            PL_ampergv
 #define PL_Ian                 PL_an


@@ -582,8 +788,6 @@
 #define PL_Idoswitches         PL_doswitches
 #define PL_Idowarn             PL_dowarn
 #define PL_Ie_script           PL_e_script
 #define PL_Idoswitches         PL_doswitches
 #define PL_Idowarn             PL_dowarn
 #define PL_Ie_script           PL_e_script

-#define PL_Iefloatbuf          PL_efloatbuf
-#define PL_Iefloatsize         PL_efloatsize

 #define PL_Iegid               PL_egid
 #define PL_Iendav              PL_endav
 #define PL_Ienvgv              PL_envgv
 #define PL_Iegid               PL_egid
 #define PL_Iendav              PL_endav
 #define PL_Ienvgv              PL_envgv


@@ -705,7 +909,6 @@
 #define PL_Ipad_reset_pending  PL_pad_reset_pending
 #define PL_Ipadix              PL_padix
 #define PL_Ipadix_floor                PL_padix_floor
 #define PL_Ipad_reset_pending  PL_pad_reset_pending
 #define PL_Ipadix              PL_padix
 #define PL_Ipadix_floor                PL_padix_floor

-#define PL_Iparsehook          PL_parsehook

 #define PL_Ipatchlevel         PL_patchlevel
 #define PL_Ipending_ident      PL_pending_ident
 #define PL_Iperl_destruct_level        PL_perl_destruct_level
 #define PL_Ipatchlevel         PL_patchlevel
 #define PL_Ipending_ident      PL_pending_ident
 #define PL_Iperl_destruct_level        PL_perl_destruct_level


@@ -730,6 +933,7 @@
 #define PL_Isrand_called       PL_srand_called
 #define PL_Istatusvalue                PL_statusvalue
 #define PL_Istatusvalue_vms    PL_statusvalue_vms
 #define PL_Isrand_called       PL_srand_called
 #define PL_Istatusvalue                PL_statusvalue
 #define PL_Istatusvalue_vms    PL_statusvalue_vms

+#define PL_Istderrgv           PL_stderrgv

 #define PL_Istdingv            PL_stdingv
 #define PL_Istrchop            PL_strchop
 #define PL_Istrtab             PL_strtab
 #define PL_Istdingv            PL_stdingv
 #define PL_Istrchop            PL_strchop
 #define PL_Istrtab             PL_strtab


@@ -759,22 +963,36 @@
 #define PL_Iuid                        PL_uid
 #define PL_Iunsafe             PL_unsafe
 #define PL_Iutf8_alnum         PL_utf8_alnum
 #define PL_Iuid                        PL_uid
 #define PL_Iunsafe             PL_unsafe
 #define PL_Iutf8_alnum         PL_utf8_alnum

+#define PL_Iutf8_alnumc                PL_utf8_alnumc

 #define PL_Iutf8_alpha         PL_utf8_alpha
 #define PL_Iutf8_alpha         PL_utf8_alpha

+#define PL_Iutf8_ascii         PL_utf8_ascii
+#define PL_Iutf8_cntrl         PL_utf8_cntrl

 #define PL_Iutf8_digit         PL_utf8_digit
 #define PL_Iutf8_digit         PL_utf8_digit

+#define PL_Iutf8_graph         PL_utf8_graph

 #define PL_Iutf8_lower         PL_utf8_lower
 #define PL_Iutf8_mark          PL_utf8_mark
 #define PL_Iutf8_print         PL_utf8_print
 #define PL_Iutf8_lower         PL_utf8_lower
 #define PL_Iutf8_mark          PL_utf8_mark
 #define PL_Iutf8_print         PL_utf8_print

+#define PL_Iutf8_punct         PL_utf8_punct

 #define PL_Iutf8_space         PL_utf8_space
 #define PL_Iutf8_tolower       PL_utf8_tolower
 #define PL_Iutf8_totitle       PL_utf8_totitle
 #define PL_Iutf8_toupper       PL_utf8_toupper
 #define PL_Iutf8_upper         PL_utf8_upper
 #define PL_Iutf8_space         PL_utf8_space
 #define PL_Iutf8_tolower       PL_utf8_tolower
 #define PL_Iutf8_totitle       PL_utf8_totitle
 #define PL_Iutf8_toupper       PL_utf8_toupper
 #define PL_Iutf8_upper         PL_utf8_upper

+#define PL_Iutf8_xdigit                PL_utf8_xdigit

 #define PL_Iuudmap             PL_uudmap
 #define PL_Iwarnhook           PL_warnhook
 #define PL_Ixiv_arenaroot      PL_xiv_arenaroot
 #define PL_Ixiv_root           PL_xiv_root
 #define PL_Ixnv_root           PL_xnv_root
 #define PL_Ixpv_root           PL_xpv_root
 #define PL_Iuudmap             PL_uudmap
 #define PL_Iwarnhook           PL_warnhook
 #define PL_Ixiv_arenaroot      PL_xiv_arenaroot
 #define PL_Ixiv_root           PL_xiv_root
 #define PL_Ixnv_root           PL_xnv_root
 #define PL_Ixpv_root           PL_xpv_root

+#define PL_Ixpvav_root         PL_xpvav_root
+#define PL_Ixpvbm_root         PL_xpvbm_root
+#define PL_Ixpvcv_root         PL_xpvcv_root
+#define PL_Ixpvhv_root         PL_xpvhv_root
+#define PL_Ixpviv_root         PL_xpviv_root
+#define PL_Ixpvlv_root         PL_xpvlv_root
+#define PL_Ixpvmg_root         PL_xpvmg_root
+#define PL_Ixpvnv_root         PL_xpvnv_root

 #define PL_Ixrv_root           PL_xrv_root
 #define PL_Iyychar             PL_yychar
 #define PL_Iyydebug            PL_yydebug
 #define PL_Ixrv_root           PL_xrv_root
 #define PL_Iyychar             PL_yychar
 #define PL_Iyydebug            PL_yydebug


@@ -783,7 +1001,145 @@
 #define PL_Iyynerrs            PL_yynerrs
 #define PL_Iyyval              PL_yyval
 
 #define PL_Iyynerrs            PL_yynerrs
 #define PL_Iyyval              PL_yyval
 

-#ifndef USE_THREADS
+#  if defined(USE_THREADS)
+/* case 4 above */
+
+#define PL_Sv                  (aTHX->TSv)
+#define PL_Xpv                 (aTHX->TXpv)
+#define PL_av_fetch_sv         (aTHX->Tav_fetch_sv)
+#define PL_bodytarget          (aTHX->Tbodytarget)
+#define PL_bostr               (aTHX->Tbostr)
+#define PL_chopset             (aTHX->Tchopset)
+#define PL_colors              (aTHX->Tcolors)
+#define PL_colorset            (aTHX->Tcolorset)
+#define PL_curcop              (aTHX->Tcurcop)
+#define PL_curpad              (aTHX->Tcurpad)
+#define PL_curpm               (aTHX->Tcurpm)
+#define PL_curstack            (aTHX->Tcurstack)
+#define PL_curstackinfo                (aTHX->Tcurstackinfo)
+#define PL_curstash            (aTHX->Tcurstash)
+#define PL_defoutgv            (aTHX->Tdefoutgv)
+#define PL_defstash            (aTHX->Tdefstash)
+#define PL_delaymagic          (aTHX->Tdelaymagic)
+#define PL_dirty               (aTHX->Tdirty)
+#define PL_dumpindent          (aTHX->Tdumpindent)
+#define PL_efloatbuf           (aTHX->Tefloatbuf)
+#define PL_efloatsize          (aTHX->Tefloatsize)
+#define PL_errors              (aTHX->Terrors)
+#define PL_extralen            (aTHX->Textralen)
+#define PL_firstgv             (aTHX->Tfirstgv)
+#define PL_formtarget          (aTHX->Tformtarget)
+#define PL_hv_fetch_ent_mh     (aTHX->Thv_fetch_ent_mh)
+#define PL_hv_fetch_sv         (aTHX->Thv_fetch_sv)
+#define PL_in_eval             (aTHX->Tin_eval)
+#define PL_last_in_gv          (aTHX->Tlast_in_gv)
+#define PL_lastgotoprobe       (aTHX->Tlastgotoprobe)
+#define PL_lastscream          (aTHX->Tlastscream)
+#define PL_localizing          (aTHX->Tlocalizing)
+#define PL_mainstack           (aTHX->Tmainstack)
+#define PL_markstack           (aTHX->Tmarkstack)
+#define PL_markstack_max       (aTHX->Tmarkstack_max)
+#define PL_markstack_ptr       (aTHX->Tmarkstack_ptr)
+#define PL_maxscream           (aTHX->Tmaxscream)
+#define PL_modcount            (aTHX->Tmodcount)
+#define PL_na                  (aTHX->Tna)
+#define PL_nrs                 (aTHX->Tnrs)
+#define PL_ofs                 (aTHX->Tofs)
+#define PL_ofslen              (aTHX->Tofslen)
+#define PL_op                  (aTHX->Top)
+#define PL_opsave              (aTHX->Topsave)
+#define PL_protect             (aTHX->Tprotect)
+#define PL_reg_call_cc         (aTHX->Treg_call_cc)
+#define PL_reg_curpm           (aTHX->Treg_curpm)
+#define PL_reg_eval_set                (aTHX->Treg_eval_set)
+#define PL_reg_flags           (aTHX->Treg_flags)
+#define PL_reg_ganch           (aTHX->Treg_ganch)
+#define PL_reg_leftiter                (aTHX->Treg_leftiter)
+#define PL_reg_magic           (aTHX->Treg_magic)
+#define PL_reg_maxiter         (aTHX->Treg_maxiter)
+#define PL_reg_oldcurpm                (aTHX->Treg_oldcurpm)
+#define PL_reg_oldpos          (aTHX->Treg_oldpos)
+#define PL_reg_oldsaved                (aTHX->Treg_oldsaved)
+#define PL_reg_oldsavedlen     (aTHX->Treg_oldsavedlen)
+#define PL_reg_poscache                (aTHX->Treg_poscache)
+#define PL_reg_poscache_size   (aTHX->Treg_poscache_size)
+#define PL_reg_re              (aTHX->Treg_re)
+#define PL_reg_start_tmp       (aTHX->Treg_start_tmp)
+#define PL_reg_start_tmpl      (aTHX->Treg_start_tmpl)
+#define PL_reg_starttry                (aTHX->Treg_starttry)
+#define PL_reg_sv              (aTHX->Treg_sv)
+#define PL_reg_whilem_seen     (aTHX->Treg_whilem_seen)
+#define PL_regbol              (aTHX->Tregbol)
+#define PL_regcc               (aTHX->Tregcc)
+#define PL_regcode             (aTHX->Tregcode)
+#define PL_regcomp_parse       (aTHX->Tregcomp_parse)
+#define PL_regcomp_rx          (aTHX->Tregcomp_rx)
+#define PL_regcompp            (aTHX->Tregcompp)
+#define PL_regdata             (aTHX->Tregdata)
+#define PL_regdummy            (aTHX->Tregdummy)
+#define PL_regendp             (aTHX->Tregendp)
+#define PL_regeol              (aTHX->Tregeol)
+#define PL_regexecp            (aTHX->Tregexecp)
+#define PL_regflags            (aTHX->Tregflags)
+#define PL_regfree             (aTHX->Tregfree)
+#define PL_regindent           (aTHX->Tregindent)
+#define PL_reginput            (aTHX->Treginput)
+#define PL_regint_start                (aTHX->Tregint_start)
+#define PL_regint_string       (aTHX->Tregint_string)
+#define PL_reginterp_cnt       (aTHX->Treginterp_cnt)
+#define PL_reglastparen                (aTHX->Treglastparen)
+#define PL_regnarrate          (aTHX->Tregnarrate)
+#define PL_regnaughty          (aTHX->Tregnaughty)
+#define PL_regnpar             (aTHX->Tregnpar)
+#define PL_regprecomp          (aTHX->Tregprecomp)
+#define PL_regprev             (aTHX->Tregprev)
+#define PL_regprogram          (aTHX->Tregprogram)
+#define PL_regsawback          (aTHX->Tregsawback)
+#define PL_regseen             (aTHX->Tregseen)
+#define PL_regsize             (aTHX->Tregsize)
+#define PL_regstartp           (aTHX->Tregstartp)
+#define PL_regtill             (aTHX->Tregtill)
+#define PL_regxend             (aTHX->Tregxend)
+#define PL_restartop           (aTHX->Trestartop)
+#define PL_retstack            (aTHX->Tretstack)
+#define PL_retstack_ix         (aTHX->Tretstack_ix)
+#define PL_retstack_max                (aTHX->Tretstack_max)
+#define PL_rs                  (aTHX->Trs)
+#define PL_savestack           (aTHX->Tsavestack)
+#define PL_savestack_ix                (aTHX->Tsavestack_ix)
+#define PL_savestack_max       (aTHX->Tsavestack_max)
+#define PL_scopestack          (aTHX->Tscopestack)
+#define PL_scopestack_ix       (aTHX->Tscopestack_ix)
+#define PL_scopestack_max      (aTHX->Tscopestack_max)
+#define PL_screamfirst         (aTHX->Tscreamfirst)
+#define PL_screamnext          (aTHX->Tscreamnext)
+#define PL_secondgv            (aTHX->Tsecondgv)
+#define PL_seen_evals          (aTHX->Tseen_evals)
+#define PL_seen_zerolen                (aTHX->Tseen_zerolen)
+#define PL_sortcop             (aTHX->Tsortcop)
+#define PL_sortcxix            (aTHX->Tsortcxix)
+#define PL_sortstash           (aTHX->Tsortstash)
+#define PL_stack_base          (aTHX->Tstack_base)
+#define PL_stack_max           (aTHX->Tstack_max)
+#define PL_stack_sp            (aTHX->Tstack_sp)
+#define PL_start_env           (aTHX->Tstart_env)
+#define PL_statbuf             (aTHX->Tstatbuf)
+#define PL_statcache           (aTHX->Tstatcache)
+#define PL_statgv              (aTHX->Tstatgv)
+#define PL_statname            (aTHX->Tstatname)
+#define PL_tainted             (aTHX->Ttainted)
+#define PL_timesbuf            (aTHX->Ttimesbuf)
+#define PL_tmps_floor          (aTHX->Ttmps_floor)
+#define PL_tmps_ix             (aTHX->Ttmps_ix)
+#define PL_tmps_max            (aTHX->Ttmps_max)
+#define PL_tmps_stack          (aTHX->Ttmps_stack)
+#define PL_top_env             (aTHX->Ttop_env)
+#define PL_toptarget           (aTHX->Ttoptarget)
+#define PL_watchaddr           (aTHX->Twatchaddr)
+#define PL_watchok             (aTHX->Twatchok)
+
+#  else                /* !USE_THREADS */
+/* cases 1 and 6 above */

 
 #define PL_TSv                 PL_Sv
 #define PL_TXpv                        PL_Xpv
 
 #define PL_TSv                 PL_Sv
 #define PL_TXpv                        PL_Xpv


@@ -804,6 +1160,9 @@
 #define PL_Tdelaymagic         PL_delaymagic
 #define PL_Tdirty              PL_dirty
 #define PL_Tdumpindent         PL_dumpindent
 #define PL_Tdelaymagic         PL_delaymagic
 #define PL_Tdirty              PL_dirty
 #define PL_Tdumpindent         PL_dumpindent

+#define PL_Tefloatbuf          PL_efloatbuf
+#define PL_Tefloatsize         PL_efloatsize
+#define PL_Terrors             PL_errors

 #define PL_Textralen           PL_extralen
 #define PL_Tfirstgv            PL_firstgv
 #define PL_Tformtarget         PL_formtarget
 #define PL_Textralen           PL_extralen
 #define PL_Tfirstgv            PL_firstgv
 #define PL_Tformtarget         PL_formtarget


@@ -832,16 +1191,21 @@
 #define PL_Treg_eval_set       PL_reg_eval_set
 #define PL_Treg_flags          PL_reg_flags
 #define PL_Treg_ganch          PL_reg_ganch
 #define PL_Treg_eval_set       PL_reg_eval_set
 #define PL_Treg_flags          PL_reg_flags
 #define PL_Treg_ganch          PL_reg_ganch

+#define PL_Treg_leftiter       PL_reg_leftiter

 #define PL_Treg_magic          PL_reg_magic
 #define PL_Treg_magic          PL_reg_magic

+#define PL_Treg_maxiter                PL_reg_maxiter

 #define PL_Treg_oldcurpm       PL_reg_oldcurpm
 #define PL_Treg_oldpos         PL_reg_oldpos
 #define PL_Treg_oldsaved       PL_reg_oldsaved
 #define PL_Treg_oldsavedlen    PL_reg_oldsavedlen
 #define PL_Treg_oldcurpm       PL_reg_oldcurpm
 #define PL_Treg_oldpos         PL_reg_oldpos
 #define PL_Treg_oldsaved       PL_reg_oldsaved
 #define PL_Treg_oldsavedlen    PL_reg_oldsavedlen

+#define PL_Treg_poscache       PL_reg_poscache
+#define PL_Treg_poscache_size  PL_reg_poscache_size

 #define PL_Treg_re             PL_reg_re
 #define PL_Treg_start_tmp      PL_reg_start_tmp
 #define PL_Treg_start_tmpl     PL_reg_start_tmpl
 #define PL_Treg_starttry       PL_reg_starttry
 #define PL_Treg_sv             PL_reg_sv
 #define PL_Treg_re             PL_reg_re
 #define PL_Treg_start_tmp      PL_reg_start_tmp
 #define PL_Treg_start_tmpl     PL_reg_start_tmpl
 #define PL_Treg_starttry       PL_reg_starttry
 #define PL_Treg_sv             PL_reg_sv

+#define PL_Treg_whilem_seen    PL_reg_whilem_seen

 #define PL_Tregbol             PL_regbol
 #define PL_Tregcc              PL_regcc
 #define PL_Tregcode            PL_regcode
 #define PL_Tregbol             PL_regbol
 #define PL_Tregcc              PL_regcc
 #define PL_Tregcode            PL_regcode


@@ -854,8 +1218,11 @@
 #define PL_Tregeol             PL_regeol
 #define PL_Tregexecp           PL_regexecp
 #define PL_Tregflags           PL_regflags
 #define PL_Tregeol             PL_regeol
 #define PL_Tregexecp           PL_regexecp
 #define PL_Tregflags           PL_regflags

+#define PL_Tregfree            PL_regfree

 #define PL_Tregindent          PL_regindent
 #define PL_Treginput           PL_reginput
 #define PL_Tregindent          PL_regindent
 #define PL_Treginput           PL_reginput

+#define PL_Tregint_start       PL_regint_start
+#define PL_Tregint_string      PL_regint_string

 #define PL_Treginterp_cnt      PL_reginterp_cnt
 #define PL_Treglastparen       PL_reglastparen
 #define PL_Tregnarrate         PL_regnarrate
 #define PL_Treginterp_cnt      PL_reginterp_cnt
 #define PL_Treglastparen       PL_reglastparen
 #define PL_Tregnarrate         PL_regnarrate


@@ -908,147 +1275,10 @@
 #define PL_Twatchaddr          PL_watchaddr
 #define PL_Twatchok            PL_watchok
 
 #define PL_Twatchaddr          PL_watchaddr
 #define PL_Twatchok            PL_watchok
 

-#endif /* USE_THREADS */
-
-/* Hide what would have been interpreter-specific symbols? */
-
-
-#ifndef USE_THREADS
-
+#  endif       /* USE_THREADS */
+#endif /* MULTIPLICITY */

 
 

-#endif /* USE_THREADS */
-#endif /* MULTIPLICITY */
-
-/* Now same trickey for per-thread variables */
-
-#ifdef USE_THREADS
-
-#define PL_Sv                  (thr->TSv)
-#define PL_Xpv                 (thr->TXpv)
-#define PL_av_fetch_sv         (thr->Tav_fetch_sv)
-#define PL_bodytarget          (thr->Tbodytarget)
-#define PL_bostr               (thr->Tbostr)
-#define PL_chopset             (thr->Tchopset)
-#define PL_colors              (thr->Tcolors)
-#define PL_colorset            (thr->Tcolorset)
-#define PL_curcop              (thr->Tcurcop)
-#define PL_curpad              (thr->Tcurpad)
-#define PL_curpm               (thr->Tcurpm)
-#define PL_curstack            (thr->Tcurstack)
-#define PL_curstackinfo                (thr->Tcurstackinfo)
-#define PL_curstash            (thr->Tcurstash)
-#define PL_defoutgv            (thr->Tdefoutgv)
-#define PL_defstash            (thr->Tdefstash)
-#define PL_delaymagic          (thr->Tdelaymagic)
-#define PL_dirty               (thr->Tdirty)
-#define PL_dumpindent          (thr->Tdumpindent)
-#define PL_extralen            (thr->Textralen)
-#define PL_firstgv             (thr->Tfirstgv)
-#define PL_formtarget          (thr->Tformtarget)
-#define PL_hv_fetch_ent_mh     (thr->Thv_fetch_ent_mh)
-#define PL_hv_fetch_sv         (thr->Thv_fetch_sv)
-#define PL_in_eval             (thr->Tin_eval)
-#define PL_last_in_gv          (thr->Tlast_in_gv)
-#define PL_lastgotoprobe       (thr->Tlastgotoprobe)
-#define PL_lastscream          (thr->Tlastscream)
-#define PL_localizing          (thr->Tlocalizing)
-#define PL_mainstack           (thr->Tmainstack)
-#define PL_markstack           (thr->Tmarkstack)
-#define PL_markstack_max       (thr->Tmarkstack_max)
-#define PL_markstack_ptr       (thr->Tmarkstack_ptr)
-#define PL_maxscream           (thr->Tmaxscream)
-#define PL_modcount            (thr->Tmodcount)
-#define PL_na                  (thr->Tna)
-#define PL_nrs                 (thr->Tnrs)
-#define PL_ofs                 (thr->Tofs)
-#define PL_ofslen              (thr->Tofslen)
-#define PL_op                  (thr->Top)
-#define PL_opsave              (thr->Topsave)
-#define PL_protect             (thr->Tprotect)
-#define PL_reg_call_cc         (thr->Treg_call_cc)
-#define PL_reg_curpm           (thr->Treg_curpm)
-#define PL_reg_eval_set                (thr->Treg_eval_set)
-#define PL_reg_flags           (thr->Treg_flags)
-#define PL_reg_ganch           (thr->Treg_ganch)
-#define PL_reg_magic           (thr->Treg_magic)
-#define PL_reg_oldcurpm                (thr->Treg_oldcurpm)
-#define PL_reg_oldpos          (thr->Treg_oldpos)
-#define PL_reg_oldsaved                (thr->Treg_oldsaved)
-#define PL_reg_oldsavedlen     (thr->Treg_oldsavedlen)
-#define PL_reg_re              (thr->Treg_re)
-#define PL_reg_start_tmp       (thr->Treg_start_tmp)
-#define PL_reg_start_tmpl      (thr->Treg_start_tmpl)
-#define PL_reg_starttry                (thr->Treg_starttry)
-#define PL_reg_sv              (thr->Treg_sv)
-#define PL_regbol              (thr->Tregbol)
-#define PL_regcc               (thr->Tregcc)
-#define PL_regcode             (thr->Tregcode)
-#define PL_regcomp_parse       (thr->Tregcomp_parse)
-#define PL_regcomp_rx          (thr->Tregcomp_rx)
-#define PL_regcompp            (thr->Tregcompp)
-#define PL_regdata             (thr->Tregdata)
-#define PL_regdummy            (thr->Tregdummy)
-#define PL_regendp             (thr->Tregendp)
-#define PL_regeol              (thr->Tregeol)
-#define PL_regexecp            (thr->Tregexecp)
-#define PL_regflags            (thr->Tregflags)
-#define PL_regindent           (thr->Tregindent)
-#define PL_reginput            (thr->Treginput)
-#define PL_reginterp_cnt       (thr->Treginterp_cnt)
-#define PL_reglastparen                (thr->Treglastparen)
-#define PL_regnarrate          (thr->Tregnarrate)
-#define PL_regnaughty          (thr->Tregnaughty)
-#define PL_regnpar             (thr->Tregnpar)
-#define PL_regprecomp          (thr->Tregprecomp)
-#define PL_regprev             (thr->Tregprev)
-#define PL_regprogram          (thr->Tregprogram)
-#define PL_regsawback          (thr->Tregsawback)
-#define PL_regseen             (thr->Tregseen)
-#define PL_regsize             (thr->Tregsize)
-#define PL_regstartp           (thr->Tregstartp)
-#define PL_regtill             (thr->Tregtill)
-#define PL_regxend             (thr->Tregxend)
-#define PL_restartop           (thr->Trestartop)
-#define PL_retstack            (thr->Tretstack)
-#define PL_retstack_ix         (thr->Tretstack_ix)
-#define PL_retstack_max                (thr->Tretstack_max)
-#define PL_rs                  (thr->Trs)
-#define PL_savestack           (thr->Tsavestack)
-#define PL_savestack_ix                (thr->Tsavestack_ix)
-#define PL_savestack_max       (thr->Tsavestack_max)
-#define PL_scopestack          (thr->Tscopestack)
-#define PL_scopestack_ix       (thr->Tscopestack_ix)
-#define PL_scopestack_max      (thr->Tscopestack_max)
-#define PL_screamfirst         (thr->Tscreamfirst)
-#define PL_screamnext          (thr->Tscreamnext)
-#define PL_secondgv            (thr->Tsecondgv)
-#define PL_seen_evals          (thr->Tseen_evals)
-#define PL_seen_zerolen                (thr->Tseen_zerolen)
-#define PL_sortcop             (thr->Tsortcop)
-#define PL_sortcxix            (thr->Tsortcxix)
-#define PL_sortstash           (thr->Tsortstash)
-#define PL_stack_base          (thr->Tstack_base)
-#define PL_stack_max           (thr->Tstack_max)
-#define PL_stack_sp            (thr->Tstack_sp)
-#define PL_start_env           (thr->Tstart_env)
-#define PL_statbuf             (thr->Tstatbuf)
-#define PL_statcache           (thr->Tstatcache)
-#define PL_statgv              (thr->Tstatgv)
-#define PL_statname            (thr->Tstatname)
-#define PL_tainted             (thr->Ttainted)
-#define PL_timesbuf            (thr->Ttimesbuf)
-#define PL_tmps_floor          (thr->Ttmps_floor)
-#define PL_tmps_ix             (thr->Ttmps_ix)
-#define PL_tmps_max            (thr->Ttmps_max)
-#define PL_tmps_stack          (thr->Ttmps_stack)
-#define PL_top_env             (thr->Ttop_env)
-#define PL_toptarget           (thr->Ttoptarget)
-#define PL_watchaddr           (thr->Twatchaddr)
-#define PL_watchok             (thr->Twatchok)
-
-#endif /* USE_THREADS */
-
-#ifdef PERL_GLOBAL_STRUCT
+#if defined(PERL_GLOBAL_STRUCT)

 
 #define PL_No                  (PL_Vars.GNo)
 #define PL_Yes                 (PL_Vars.GYes)
 
 #define PL_No                  (PL_Vars.GNo)
 #define PL_Yes                 (PL_Vars.GYes)


@@ -1066,10 +1296,8 @@
 #define PL_Ghexdigit           PL_hexdigit
 #define PL_Gpatleave           PL_patleave
 
 #define PL_Ghexdigit           PL_hexdigit
 #define PL_Gpatleave           PL_patleave
 

-

 #endif /* PERL_GLOBAL_STRUCT */
 
 #endif /* PERL_GLOBAL_STRUCT */
 

-

 #ifdef PERL_POLLUTE            /* disabled by default in 5.006 */
 
 #define DBsingle               PL_DBsingle
 #ifdef PERL_POLLUTE            /* disabled by default in 5.006 */
 
 #define DBsingle               PL_DBsingle