PL_ prefix to all perlvars, part1

   Builds and passes all tests at one limit i.e. -DPERL_GLOBAL_STRUCT

p4raw-id: //depot/ansiperl@1532

1 files changed, 784 insertions, 1123 deletions

diff --git a/embedvar.h b/embedvar.h
index 6d2dbe412a..ae37202410 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -20,481 +20,481 @@
 #ifndef USE_THREADS
 /* If we do not have threads then per-thread vars are per-interpreter */
 
-#define Sv			(curinterp->TSv)
-#define Xpv			(curinterp->TXpv)
-#define av_fetch_sv		(curinterp->Tav_fetch_sv)
-#define bodytarget		(curinterp->Tbodytarget)
-#define bostr			(curinterp->Tbostr)
-#define chopset			(curinterp->Tchopset)
-#define colors			(curinterp->Tcolors)
-#define colorset		(curinterp->Tcolorset)
-#define curcop			(curinterp->Tcurcop)
-#define curpad			(curinterp->Tcurpad)
-#define curpm			(curinterp->Tcurpm)
-#define curstack		(curinterp->Tcurstack)
-#define curstackinfo		(curinterp->Tcurstackinfo)
-#define curstash		(curinterp->Tcurstash)
-#define defoutgv		(curinterp->Tdefoutgv)
-#define defstash		(curinterp->Tdefstash)
-#define delaymagic		(curinterp->Tdelaymagic)
-#define dirty			(curinterp->Tdirty)
-#define extralen		(curinterp->Textralen)
-#define firstgv			(curinterp->Tfirstgv)
-#define formtarget		(curinterp->Tformtarget)
-#define hv_fetch_ent_mh		(curinterp->Thv_fetch_ent_mh)
-#define hv_fetch_sv		(curinterp->Thv_fetch_sv)
-#define in_eval			(curinterp->Tin_eval)
-#define last_in_gv		(curinterp->Tlast_in_gv)
-#define lastgotoprobe		(curinterp->Tlastgotoprobe)
-#define lastscream		(curinterp->Tlastscream)
-#define localizing		(curinterp->Tlocalizing)
-#define mainstack		(curinterp->Tmainstack)
-#define markstack		(curinterp->Tmarkstack)
-#define markstack_max		(curinterp->Tmarkstack_max)
-#define markstack_ptr		(curinterp->Tmarkstack_ptr)
-#define maxscream		(curinterp->Tmaxscream)
-#define modcount		(curinterp->Tmodcount)
-#define nrs			(curinterp->Tnrs)
-#define ofs			(curinterp->Tofs)
-#define ofslen			(curinterp->Tofslen)
-#define op			(curinterp->Top)
-#define opsave			(curinterp->Topsave)
-#define reg_eval_set		(curinterp->Treg_eval_set)
-#define reg_flags		(curinterp->Treg_flags)
-#define reg_start_tmp		(curinterp->Treg_start_tmp)
-#define reg_start_tmpl		(curinterp->Treg_start_tmpl)
-#define regbol			(curinterp->Tregbol)
-#define regcc			(curinterp->Tregcc)
-#define regcode			(curinterp->Tregcode)
-#define regcomp_parse		(curinterp->Tregcomp_parse)
-#define regcomp_rx		(curinterp->Tregcomp_rx)
-#define regcompp		(curinterp->Tregcompp)
-#define regdata			(curinterp->Tregdata)
-#define regdummy		(curinterp->Tregdummy)
-#define regendp			(curinterp->Tregendp)
-#define regeol			(curinterp->Tregeol)
-#define regexecp		(curinterp->Tregexecp)
-#define regflags		(curinterp->Tregflags)
-#define regindent		(curinterp->Tregindent)
-#define reginput		(curinterp->Treginput)
-#define reginterp_cnt		(curinterp->Treginterp_cnt)
-#define reglastparen		(curinterp->Treglastparen)
-#define regnarrate		(curinterp->Tregnarrate)
-#define regnaughty		(curinterp->Tregnaughty)
-#define regnpar			(curinterp->Tregnpar)
-#define regprecomp		(curinterp->Tregprecomp)
-#define regprev			(curinterp->Tregprev)
-#define regprogram		(curinterp->Tregprogram)
-#define regsawback		(curinterp->Tregsawback)
-#define regseen			(curinterp->Tregseen)
-#define regsize			(curinterp->Tregsize)
-#define regstartp		(curinterp->Tregstartp)
-#define regtill			(curinterp->Tregtill)
-#define regxend			(curinterp->Tregxend)
-#define restartop		(curinterp->Trestartop)
-#define retstack		(curinterp->Tretstack)
-#define retstack_ix		(curinterp->Tretstack_ix)
-#define retstack_max		(curinterp->Tretstack_max)
-#define rs			(curinterp->Trs)
-#define savestack		(curinterp->Tsavestack)
-#define savestack_ix		(curinterp->Tsavestack_ix)
-#define savestack_max		(curinterp->Tsavestack_max)
-#define scopestack		(curinterp->Tscopestack)
-#define scopestack_ix		(curinterp->Tscopestack_ix)
-#define scopestack_max		(curinterp->Tscopestack_max)
-#define screamfirst		(curinterp->Tscreamfirst)
-#define screamnext		(curinterp->Tscreamnext)
-#define secondgv		(curinterp->Tsecondgv)
-#define seen_evals		(curinterp->Tseen_evals)
-#define seen_zerolen		(curinterp->Tseen_zerolen)
-#define sortcop			(curinterp->Tsortcop)
-#define sortcxix		(curinterp->Tsortcxix)
-#define sortstash		(curinterp->Tsortstash)
-#define stack_base		(curinterp->Tstack_base)
-#define stack_max		(curinterp->Tstack_max)
-#define stack_sp		(curinterp->Tstack_sp)
-#define start_env		(curinterp->Tstart_env)
-#define statbuf			(curinterp->Tstatbuf)
-#define statcache		(curinterp->Tstatcache)
-#define statgv			(curinterp->Tstatgv)
-#define statname		(curinterp->Tstatname)
-#define tainted			(curinterp->Ttainted)
-#define timesbuf		(curinterp->Ttimesbuf)
-#define tmps_floor		(curinterp->Ttmps_floor)
-#define tmps_ix			(curinterp->Ttmps_ix)
-#define tmps_max		(curinterp->Ttmps_max)
-#define tmps_stack		(curinterp->Ttmps_stack)
-#define top_env			(curinterp->Ttop_env)
-#define toptarget		(curinterp->Ttoptarget)
+#define PL_Sv			(curinterp->TSv)
+#define PL_Xpv			(curinterp->TXpv)
+#define PL_av_fetch_sv		(curinterp->Tav_fetch_sv)
+#define PL_bodytarget		(curinterp->Tbodytarget)
+#define PL_bostr		(curinterp->Tbostr)
+#define PL_chopset		(curinterp->Tchopset)
+#define PL_colors		(curinterp->Tcolors)
+#define PL_colorset		(curinterp->Tcolorset)
+#define PL_curcop		(curinterp->Tcurcop)
+#define PL_curpad		(curinterp->Tcurpad)
+#define PL_curpm		(curinterp->Tcurpm)
+#define PL_curstack		(curinterp->Tcurstack)
+#define PL_curstackinfo		(curinterp->Tcurstackinfo)
+#define PL_curstash		(curinterp->Tcurstash)
+#define PL_defoutgv		(curinterp->Tdefoutgv)
+#define PL_defstash		(curinterp->Tdefstash)
+#define PL_delaymagic		(curinterp->Tdelaymagic)
+#define PL_dirty		(curinterp->Tdirty)
+#define PL_extralen		(curinterp->Textralen)
+#define PL_firstgv		(curinterp->Tfirstgv)
+#define PL_formtarget		(curinterp->Tformtarget)
+#define PL_hv_fetch_ent_mh	(curinterp->Thv_fetch_ent_mh)
+#define PL_hv_fetch_sv		(curinterp->Thv_fetch_sv)
+#define PL_in_eval		(curinterp->Tin_eval)
+#define PL_last_in_gv		(curinterp->Tlast_in_gv)
+#define PL_lastgotoprobe	(curinterp->Tlastgotoprobe)
+#define PL_lastscream		(curinterp->Tlastscream)
+#define PL_localizing		(curinterp->Tlocalizing)
+#define PL_mainstack		(curinterp->Tmainstack)
+#define PL_markstack		(curinterp->Tmarkstack)
+#define PL_markstack_max	(curinterp->Tmarkstack_max)
+#define PL_markstack_ptr	(curinterp->Tmarkstack_ptr)
+#define PL_maxscream		(curinterp->Tmaxscream)
+#define PL_modcount		(curinterp->Tmodcount)
+#define PL_nrs			(curinterp->Tnrs)
+#define PL_ofs			(curinterp->Tofs)
+#define PL_ofslen		(curinterp->Tofslen)
+#define PL_op			(curinterp->Top)
+#define PL_opsave		(curinterp->Topsave)
+#define PL_reg_eval_set		(curinterp->Treg_eval_set)
+#define PL_reg_flags		(curinterp->Treg_flags)
+#define PL_reg_start_tmp	(curinterp->Treg_start_tmp)
+#define PL_reg_start_tmpl	(curinterp->Treg_start_tmpl)
+#define PL_regbol		(curinterp->Tregbol)
+#define PL_regcc		(curinterp->Tregcc)
+#define PL_regcode		(curinterp->Tregcode)
+#define PL_regcomp_parse	(curinterp->Tregcomp_parse)
+#define PL_regcomp_rx		(curinterp->Tregcomp_rx)
+#define PL_regcompp		(curinterp->Tregcompp)
+#define PL_regdata		(curinterp->Tregdata)
+#define PL_regdummy		(curinterp->Tregdummy)
+#define PL_regendp		(curinterp->Tregendp)
+#define PL_regeol		(curinterp->Tregeol)
+#define PL_regexecp		(curinterp->Tregexecp)
+#define PL_regflags		(curinterp->Tregflags)
+#define PL_regindent		(curinterp->Tregindent)
+#define PL_reginput		(curinterp->Treginput)
+#define PL_reginterp_cnt	(curinterp->Treginterp_cnt)
+#define PL_reglastparen		(curinterp->Treglastparen)
+#define PL_regnarrate		(curinterp->Tregnarrate)
+#define PL_regnaughty		(curinterp->Tregnaughty)
+#define PL_regnpar		(curinterp->Tregnpar)
+#define PL_regprecomp		(curinterp->Tregprecomp)
+#define PL_regprev		(curinterp->Tregprev)
+#define PL_regprogram		(curinterp->Tregprogram)
+#define PL_regsawback		(curinterp->Tregsawback)
+#define PL_regseen		(curinterp->Tregseen)
+#define PL_regsize		(curinterp->Tregsize)
+#define PL_regstartp		(curinterp->Tregstartp)
+#define PL_regtill		(curinterp->Tregtill)
+#define PL_regxend		(curinterp->Tregxend)
+#define PL_restartop		(curinterp->Trestartop)
+#define PL_retstack		(curinterp->Tretstack)
+#define PL_retstack_ix		(curinterp->Tretstack_ix)
+#define PL_retstack_max		(curinterp->Tretstack_max)
+#define PL_rs			(curinterp->Trs)
+#define PL_savestack		(curinterp->Tsavestack)
+#define PL_savestack_ix		(curinterp->Tsavestack_ix)
+#define PL_savestack_max	(curinterp->Tsavestack_max)
+#define PL_scopestack		(curinterp->Tscopestack)
+#define PL_scopestack_ix	(curinterp->Tscopestack_ix)
+#define PL_scopestack_max	(curinterp->Tscopestack_max)
+#define PL_screamfirst		(curinterp->Tscreamfirst)
+#define PL_screamnext		(curinterp->Tscreamnext)
+#define PL_secondgv		(curinterp->Tsecondgv)
+#define PL_seen_evals		(curinterp->Tseen_evals)
+#define PL_seen_zerolen		(curinterp->Tseen_zerolen)
+#define PL_sortcop		(curinterp->Tsortcop)
+#define PL_sortcxix		(curinterp->Tsortcxix)
+#define PL_sortstash		(curinterp->Tsortstash)
+#define PL_stack_base		(curinterp->Tstack_base)
+#define PL_stack_max		(curinterp->Tstack_max)
+#define PL_stack_sp		(curinterp->Tstack_sp)
+#define PL_start_env		(curinterp->Tstart_env)
+#define PL_statbuf		(curinterp->Tstatbuf)
+#define PL_statcache		(curinterp->Tstatcache)
+#define PL_statgv		(curinterp->Tstatgv)
+#define PL_statname		(curinterp->Tstatname)
+#define PL_tainted		(curinterp->Ttainted)
+#define PL_timesbuf		(curinterp->Ttimesbuf)
+#define PL_tmps_floor		(curinterp->Ttmps_floor)
+#define PL_tmps_ix		(curinterp->Ttmps_ix)
+#define PL_tmps_max		(curinterp->Ttmps_max)
+#define PL_tmps_stack		(curinterp->Ttmps_stack)
+#define PL_top_env		(curinterp->Ttop_env)
+#define PL_toptarget		(curinterp->Ttoptarget)
 
 #endif /* !USE_THREADS */
 
 /* These are always per-interpreter if there is more than one */
 
-#define Argv			(curinterp->IArgv)
-#define Cmd			(curinterp->ICmd)
-#define DBcv			(curinterp->IDBcv)
-#define DBgv			(curinterp->IDBgv)
-#define DBline			(curinterp->IDBline)
-#define DBsignal		(curinterp->IDBsignal)
-#define DBsingle		(curinterp->IDBsingle)
-#define DBsub			(curinterp->IDBsub)
-#define DBtrace			(curinterp->IDBtrace)
-#define ampergv			(curinterp->Iampergv)
-#define archpat_auto		(curinterp->Iarchpat_auto)
-#define argvgv			(curinterp->Iargvgv)
-#define argvoutgv		(curinterp->Iargvoutgv)
-#define basetime		(curinterp->Ibasetime)
-#define beginav			(curinterp->Ibeginav)
-#define cddir			(curinterp->Icddir)
-#define compcv			(curinterp->Icompcv)
-#define compiling		(curinterp->Icompiling)
-#define comppad			(curinterp->Icomppad)
-#define comppad_name		(curinterp->Icomppad_name)
-#define comppad_name_fill	(curinterp->Icomppad_name_fill)
-#define comppad_name_floor	(curinterp->Icomppad_name_floor)
-#define copline			(curinterp->Icopline)
-#define curcopdb		(curinterp->Icurcopdb)
-#define curstname		(curinterp->Icurstname)
-#define dbargs			(curinterp->Idbargs)
-#define debdelim		(curinterp->Idebdelim)
-#define debname			(curinterp->Idebname)
-#define debstash		(curinterp->Idebstash)
-#define defgv			(curinterp->Idefgv)
-#define diehook			(curinterp->Idiehook)
-#define dlevel			(curinterp->Idlevel)
-#define dlmax			(curinterp->Idlmax)
-#define doextract		(curinterp->Idoextract)
-#define doswitches		(curinterp->Idoswitches)
-#define dowarn			(curinterp->Idowarn)
-#define dumplvl			(curinterp->Idumplvl)
-#define e_script		(curinterp->Ie_script)
-#define endav			(curinterp->Iendav)
-#define envgv			(curinterp->Ienvgv)
-#define errgv			(curinterp->Ierrgv)
-#define eval_root		(curinterp->Ieval_root)
-#define eval_start		(curinterp->Ieval_start)
-#define exitlist		(curinterp->Iexitlist)
-#define exitlistlen		(curinterp->Iexitlistlen)
-#define fdpid			(curinterp->Ifdpid)
-#define filemode		(curinterp->Ifilemode)
-#define forkprocess		(curinterp->Iforkprocess)
-#define formfeed		(curinterp->Iformfeed)
-#define generation		(curinterp->Igeneration)
-#define gensym			(curinterp->Igensym)
-#define globalstash		(curinterp->Iglobalstash)
-#define hintgv			(curinterp->Ihintgv)
-#define in_clean_all		(curinterp->Iin_clean_all)
-#define in_clean_objs		(curinterp->Iin_clean_objs)
-#define incgv			(curinterp->Iincgv)
-#define initav			(curinterp->Iinitav)
-#define inplace			(curinterp->Iinplace)
-#define last_proto		(curinterp->Ilast_proto)
-#define lastfd			(curinterp->Ilastfd)
-#define lastsize		(curinterp->Ilastsize)
-#define lastspbase		(curinterp->Ilastspbase)
-#define laststatval		(curinterp->Ilaststatval)
-#define laststype		(curinterp->Ilaststype)
-#define leftgv			(curinterp->Ileftgv)
-#define lineary			(curinterp->Ilineary)
-#define linestart		(curinterp->Ilinestart)
-#define localpatches		(curinterp->Ilocalpatches)
-#define main_cv			(curinterp->Imain_cv)
-#define main_root		(curinterp->Imain_root)
-#define main_start		(curinterp->Imain_start)
-#define maxsysfd		(curinterp->Imaxsysfd)
-#define mess_sv			(curinterp->Imess_sv)
-#define minus_F			(curinterp->Iminus_F)
-#define minus_a			(curinterp->Iminus_a)
-#define minus_c			(curinterp->Iminus_c)
-#define minus_l			(curinterp->Iminus_l)
-#define minus_n			(curinterp->Iminus_n)
-#define minus_p			(curinterp->Iminus_p)
-#define modglobal		(curinterp->Imodglobal)
-#define multiline		(curinterp->Imultiline)
-#define mystrk			(curinterp->Imystrk)
-#define ofmt			(curinterp->Iofmt)
-#define oldlastpm		(curinterp->Ioldlastpm)
-#define oldname			(curinterp->Ioldname)
-#define op_mask			(curinterp->Iop_mask)
-#define origargc		(curinterp->Iorigargc)
-#define origargv		(curinterp->Iorigargv)
-#define origfilename		(curinterp->Iorigfilename)
-#define ors			(curinterp->Iors)
-#define orslen			(curinterp->Iorslen)
-#define parsehook		(curinterp->Iparsehook)
-#define patchlevel		(curinterp->Ipatchlevel)
-#define pending_ident		(curinterp->Ipending_ident)
-#define perl_destruct_level	(curinterp->Iperl_destruct_level)
-#define perldb			(curinterp->Iperldb)
-#define preambleav		(curinterp->Ipreambleav)
-#define preambled		(curinterp->Ipreambled)
-#define preprocess		(curinterp->Ipreprocess)
-#define profiledata		(curinterp->Iprofiledata)
-#define replgv			(curinterp->Ireplgv)
-#define rightgv			(curinterp->Irightgv)
-#define rsfp			(curinterp->Irsfp)
-#define rsfp_filters		(curinterp->Irsfp_filters)
-#define sawampersand		(curinterp->Isawampersand)
-#define sawstudy		(curinterp->Isawstudy)
-#define sawvec			(curinterp->Isawvec)
-#define siggv			(curinterp->Isiggv)
-#define splitstr		(curinterp->Isplitstr)
-#define statusvalue		(curinterp->Istatusvalue)
-#define statusvalue_vms		(curinterp->Istatusvalue_vms)
-#define stdingv			(curinterp->Istdingv)
-#define strchop			(curinterp->Istrchop)
-#define strtab			(curinterp->Istrtab)
-#define sub_generation		(curinterp->Isub_generation)
-#define sublex_info		(curinterp->Isublex_info)
-#define sv_arenaroot		(curinterp->Isv_arenaroot)
-#define sv_count		(curinterp->Isv_count)
-#define sv_objcount		(curinterp->Isv_objcount)
-#define sv_root			(curinterp->Isv_root)
-#define sys_intern		(curinterp->Isys_intern)
-#define tainting		(curinterp->Itainting)
-#define threadnum		(curinterp->Ithreadnum)
-#define thrsv			(curinterp->Ithrsv)
-#define unsafe			(curinterp->Iunsafe)
-#define warnhook		(curinterp->Iwarnhook)
+#define PL_Argv			(curinterp->IArgv)
+#define PL_Cmd			(curinterp->ICmd)
+#define PL_DBcv			(curinterp->IDBcv)
+#define PL_DBgv			(curinterp->IDBgv)
+#define PL_DBline		(curinterp->IDBline)
+#define PL_DBsignal		(curinterp->IDBsignal)
+#define PL_DBsingle		(curinterp->IDBsingle)
+#define PL_DBsub		(curinterp->IDBsub)
+#define PL_DBtrace		(curinterp->IDBtrace)
+#define PL_ampergv		(curinterp->Iampergv)
+#define PL_archpat_auto		(curinterp->Iarchpat_auto)
+#define PL_argvgv		(curinterp->Iargvgv)
+#define PL_argvoutgv		(curinterp->Iargvoutgv)
+#define PL_basetime		(curinterp->Ibasetime)
+#define PL_beginav		(curinterp->Ibeginav)
+#define PL_cddir		(curinterp->Icddir)
+#define PL_compcv		(curinterp->Icompcv)
+#define PL_compiling		(curinterp->Icompiling)
+#define PL_comppad		(curinterp->Icomppad)
+#define PL_comppad_name		(curinterp->Icomppad_name)
+#define PL_comppad_name_fill	(curinterp->Icomppad_name_fill)
+#define PL_comppad_name_floor	(curinterp->Icomppad_name_floor)
+#define PL_copline		(curinterp->Icopline)
+#define PL_curcopdb		(curinterp->Icurcopdb)
+#define PL_curstname		(curinterp->Icurstname)
+#define PL_dbargs		(curinterp->Idbargs)
+#define PL_debdelim		(curinterp->Idebdelim)
+#define PL_debname		(curinterp->Idebname)
+#define PL_debstash		(curinterp->Idebstash)
+#define PL_defgv		(curinterp->Idefgv)
+#define PL_diehook		(curinterp->Idiehook)
+#define PL_dlevel		(curinterp->Idlevel)
+#define PL_dlmax		(curinterp->Idlmax)
+#define PL_doextract		(curinterp->Idoextract)
+#define PL_doswitches		(curinterp->Idoswitches)
+#define PL_dowarn		(curinterp->Idowarn)
+#define PL_dumplvl		(curinterp->Idumplvl)
+#define PL_e_script		(curinterp->Ie_script)
+#define PL_endav		(curinterp->Iendav)
+#define PL_envgv		(curinterp->Ienvgv)
+#define PL_errgv		(curinterp->Ierrgv)
+#define PL_eval_root		(curinterp->Ieval_root)
+#define PL_eval_start		(curinterp->Ieval_start)
+#define PL_exitlist		(curinterp->Iexitlist)
+#define PL_exitlistlen		(curinterp->Iexitlistlen)
+#define PL_fdpid		(curinterp->Ifdpid)
+#define PL_filemode		(curinterp->Ifilemode)
+#define PL_forkprocess		(curinterp->Iforkprocess)
+#define PL_formfeed		(curinterp->Iformfeed)
+#define PL_generation		(curinterp->Igeneration)
+#define PL_gensym		(curinterp->Igensym)
+#define PL_globalstash		(curinterp->Iglobalstash)
+#define PL_hintgv		(curinterp->Ihintgv)
+#define PL_in_clean_all		(curinterp->Iin_clean_all)
+#define PL_in_clean_objs	(curinterp->Iin_clean_objs)
+#define PL_incgv		(curinterp->Iincgv)
+#define PL_initav		(curinterp->Iinitav)
+#define PL_inplace		(curinterp->Iinplace)
+#define PL_last_proto		(curinterp->Ilast_proto)
+#define PL_lastfd		(curinterp->Ilastfd)
+#define PL_lastsize		(curinterp->Ilastsize)
+#define PL_lastspbase		(curinterp->Ilastspbase)
+#define PL_laststatval		(curinterp->Ilaststatval)
+#define PL_laststype		(curinterp->Ilaststype)
+#define PL_leftgv		(curinterp->Ileftgv)
+#define PL_lineary		(curinterp->Ilineary)
+#define PL_linestart		(curinterp->Ilinestart)
+#define PL_localpatches		(curinterp->Ilocalpatches)
+#define PL_main_cv		(curinterp->Imain_cv)
+#define PL_main_root		(curinterp->Imain_root)
+#define PL_main_start		(curinterp->Imain_start)
+#define PL_maxsysfd		(curinterp->Imaxsysfd)
+#define PL_mess_sv		(curinterp->Imess_sv)
+#define PL_minus_F		(curinterp->Iminus_F)
+#define PL_minus_a		(curinterp->Iminus_a)
+#define PL_minus_c		(curinterp->Iminus_c)
+#define PL_minus_l		(curinterp->Iminus_l)
+#define PL_minus_n		(curinterp->Iminus_n)
+#define PL_minus_p		(curinterp->Iminus_p)
+#define PL_modglobal		(curinterp->Imodglobal)
+#define PL_multiline		(curinterp->Imultiline)
+#define PL_mystrk		(curinterp->Imystrk)
+#define PL_ofmt			(curinterp->Iofmt)
+#define PL_oldlastpm		(curinterp->Ioldlastpm)
+#define PL_oldname		(curinterp->Ioldname)
+#define PL_op_mask		(curinterp->Iop_mask)
+#define PL_origargc		(curinterp->Iorigargc)
+#define PL_origargv		(curinterp->Iorigargv)
+#define PL_origfilename		(curinterp->Iorigfilename)
+#define PL_ors			(curinterp->Iors)
+#define PL_orslen		(curinterp->Iorslen)
+#define PL_parsehook		(curinterp->Iparsehook)
+#define PL_patchlevel		(curinterp->Ipatchlevel)
+#define PL_pending_ident	(curinterp->Ipending_ident)
+#define PL_perl_destruct_level	(curinterp->Iperl_destruct_level)
+#define PL_perldb		(curinterp->Iperldb)
+#define PL_preambleav		(curinterp->Ipreambleav)
+#define PL_preambled		(curinterp->Ipreambled)
+#define PL_preprocess		(curinterp->Ipreprocess)
+#define PL_profiledata		(curinterp->Iprofiledata)
+#define PL_replgv		(curinterp->Ireplgv)
+#define PL_rightgv		(curinterp->Irightgv)
+#define PL_rsfp			(curinterp->Irsfp)
+#define PL_rsfp_filters		(curinterp->Irsfp_filters)
+#define PL_sawampersand		(curinterp->Isawampersand)
+#define PL_sawstudy		(curinterp->Isawstudy)
+#define PL_sawvec		(curinterp->Isawvec)
+#define PL_siggv		(curinterp->Isiggv)
+#define PL_splitstr		(curinterp->Isplitstr)
+#define PL_statusvalue		(curinterp->Istatusvalue)
+#define PL_statusvalue_vms	(curinterp->Istatusvalue_vms)
+#define PL_stdingv		(curinterp->Istdingv)
+#define PL_strchop		(curinterp->Istrchop)
+#define PL_strtab		(curinterp->Istrtab)
+#define PL_sub_generation	(curinterp->Isub_generation)
+#define PL_sublex_info		(curinterp->Isublex_info)
+#define PL_sv_arenaroot		(curinterp->Isv_arenaroot)
+#define PL_sv_count		(curinterp->Isv_count)
+#define PL_sv_objcount		(curinterp->Isv_objcount)
+#define PL_sv_root		(curinterp->Isv_root)
+#define PL_sys_intern		(curinterp->Isys_intern)
+#define PL_tainting		(curinterp->Itainting)
+#define PL_threadnum		(curinterp->Ithreadnum)
+#define PL_thrsv		(curinterp->Ithrsv)
+#define PL_unsafe		(curinterp->Iunsafe)
+#define PL_warnhook		(curinterp->Iwarnhook)
 
 #else	/* !MULTIPLICITY */
 
-#define IArgv			Argv
-#define ICmd			Cmd
-#define IDBcv			DBcv
-#define IDBgv			DBgv
-#define IDBline			DBline
-#define IDBsignal		DBsignal
-#define IDBsingle		DBsingle
-#define IDBsub			DBsub
-#define IDBtrace		DBtrace
-#define Iampergv		ampergv
-#define Iarchpat_auto		archpat_auto
-#define Iargvgv			argvgv
-#define Iargvoutgv		argvoutgv
-#define Ibasetime		basetime
-#define Ibeginav		beginav
-#define Icddir			cddir
-#define Icompcv			compcv
-#define Icompiling		compiling
-#define Icomppad		comppad
-#define Icomppad_name		comppad_name
-#define Icomppad_name_fill	comppad_name_fill
-#define Icomppad_name_floor	comppad_name_floor
-#define Icopline		copline
-#define Icurcopdb		curcopdb
-#define Icurstname		curstname
-#define Idbargs			dbargs
-#define Idebdelim		debdelim
-#define Idebname		debname
-#define Idebstash		debstash
-#define Idefgv			defgv
-#define Idiehook		diehook
-#define Idlevel			dlevel
-#define Idlmax			dlmax
-#define Idoextract		doextract
-#define Idoswitches		doswitches
-#define Idowarn			dowarn
-#define Idumplvl		dumplvl
-#define Ie_script		e_script
-#define Iendav			endav
-#define Ienvgv			envgv
-#define Ierrgv			errgv
-#define Ieval_root		eval_root
-#define Ieval_start		eval_start
-#define Iexitlist		exitlist
-#define Iexitlistlen		exitlistlen
-#define Ifdpid			fdpid
-#define Ifilemode		filemode
-#define Iforkprocess		forkprocess
-#define Iformfeed		formfeed
-#define Igeneration		generation
-#define Igensym			gensym
-#define Iglobalstash		globalstash
-#define Ihintgv			hintgv
-#define Iin_clean_all		in_clean_all
-#define Iin_clean_objs		in_clean_objs
-#define Iincgv			incgv
-#define Iinitav			initav
-#define Iinplace		inplace
-#define Ilast_proto		last_proto
-#define Ilastfd			lastfd
-#define Ilastsize		lastsize
-#define Ilastspbase		lastspbase
-#define Ilaststatval		laststatval
-#define Ilaststype		laststype
-#define Ileftgv			leftgv
-#define Ilineary		lineary
-#define Ilinestart		linestart
-#define Ilocalpatches		localpatches
-#define Imain_cv		main_cv
-#define Imain_root		main_root
-#define Imain_start		main_start
-#define Imaxsysfd		maxsysfd
-#define Imess_sv		mess_sv
-#define Iminus_F		minus_F
-#define Iminus_a		minus_a
-#define Iminus_c		minus_c
-#define Iminus_l		minus_l
-#define Iminus_n		minus_n
-#define Iminus_p		minus_p
-#define Imodglobal		modglobal
-#define Imultiline		multiline
-#define Imystrk			mystrk
-#define Iofmt			ofmt
-#define Ioldlastpm		oldlastpm
-#define Ioldname		oldname
-#define Iop_mask		op_mask
-#define Iorigargc		origargc
-#define Iorigargv		origargv
-#define Iorigfilename		origfilename
-#define Iors			ors
-#define Iorslen			orslen
-#define Iparsehook		parsehook
-#define Ipatchlevel		patchlevel
-#define Ipending_ident		pending_ident
-#define Iperl_destruct_level	perl_destruct_level
-#define Iperldb			perldb
-#define Ipreambleav		preambleav
-#define Ipreambled		preambled
-#define Ipreprocess		preprocess
-#define Iprofiledata		profiledata
-#define Ireplgv			replgv
-#define Irightgv		rightgv
-#define Irsfp			rsfp
-#define Irsfp_filters		rsfp_filters
-#define Isawampersand		sawampersand
-#define Isawstudy		sawstudy
-#define Isawvec			sawvec
-#define Isiggv			siggv
-#define Isplitstr		splitstr
-#define Istatusvalue		statusvalue
-#define Istatusvalue_vms	statusvalue_vms
-#define Istdingv		stdingv
-#define Istrchop		strchop
-#define Istrtab			strtab
-#define Isub_generation		sub_generation
-#define Isublex_info		sublex_info
-#define Isv_arenaroot		sv_arenaroot
-#define Isv_count		sv_count
-#define Isv_objcount		sv_objcount
-#define Isv_root		sv_root
-#define Isys_intern		sys_intern
-#define Itainting		tainting
-#define Ithreadnum		threadnum
-#define Ithrsv			thrsv
-#define Iunsafe			unsafe
-#define Iwarnhook		warnhook
+#define IArgv			PL_Argv
+#define ICmd			PL_Cmd
+#define IDBcv			PL_DBcv
+#define IDBgv			PL_DBgv
+#define IDBline			PL_DBline
+#define IDBsignal		PL_DBsignal
+#define IDBsingle		PL_DBsingle
+#define IDBsub			PL_DBsub
+#define IDBtrace		PL_DBtrace
+#define Iampergv		PL_ampergv
+#define Iarchpat_auto		PL_archpat_auto
+#define Iargvgv			PL_argvgv
+#define Iargvoutgv		PL_argvoutgv
+#define Ibasetime		PL_basetime
+#define Ibeginav		PL_beginav
+#define Icddir			PL_cddir
+#define Icompcv			PL_compcv
+#define Icompiling		PL_compiling
+#define Icomppad		PL_comppad
+#define Icomppad_name		PL_comppad_name
+#define Icomppad_name_fill	PL_comppad_name_fill
+#define Icomppad_name_floor	PL_comppad_name_floor
+#define Icopline		PL_copline
+#define Icurcopdb		PL_curcopdb
+#define Icurstname		PL_curstname
+#define Idbargs			PL_dbargs
+#define Idebdelim		PL_debdelim
+#define Idebname		PL_debname
+#define Idebstash		PL_debstash
+#define Idefgv			PL_defgv
+#define Idiehook		PL_diehook
+#define Idlevel			PL_dlevel
+#define Idlmax			PL_dlmax
+#define Idoextract		PL_doextract
+#define Idoswitches		PL_doswitches
+#define Idowarn			PL_dowarn
+#define Idumplvl		PL_dumplvl
+#define Ie_script		PL_e_script
+#define Iendav			PL_endav
+#define Ienvgv			PL_envgv
+#define Ierrgv			PL_errgv
+#define Ieval_root		PL_eval_root
+#define Ieval_start		PL_eval_start
+#define Iexitlist		PL_exitlist
+#define Iexitlistlen		PL_exitlistlen
+#define Ifdpid			PL_fdpid
+#define Ifilemode		PL_filemode
+#define Iforkprocess		PL_forkprocess
+#define Iformfeed		PL_formfeed
+#define Igeneration		PL_generation
+#define Igensym			PL_gensym
+#define Iglobalstash		PL_globalstash
+#define Ihintgv			PL_hintgv
+#define Iin_clean_all		PL_in_clean_all
+#define Iin_clean_objs		PL_in_clean_objs
+#define Iincgv			PL_incgv
+#define Iinitav			PL_initav
+#define Iinplace		PL_inplace
+#define Ilast_proto		PL_last_proto
+#define Ilastfd			PL_lastfd
+#define Ilastsize		PL_lastsize
+#define Ilastspbase		PL_lastspbase
+#define Ilaststatval		PL_laststatval
+#define Ilaststype		PL_laststype
+#define Ileftgv			PL_leftgv
+#define Ilineary		PL_lineary
+#define Ilinestart		PL_linestart
+#define Ilocalpatches		PL_localpatches
+#define Imain_cv		PL_main_cv
+#define Imain_root		PL_main_root
+#define Imain_start		PL_main_start
+#define Imaxsysfd		PL_maxsysfd
+#define Imess_sv		PL_mess_sv
+#define Iminus_F		PL_minus_F
+#define Iminus_a		PL_minus_a
+#define Iminus_c		PL_minus_c
+#define Iminus_l		PL_minus_l
+#define Iminus_n		PL_minus_n
+#define Iminus_p		PL_minus_p
+#define Imodglobal		PL_modglobal
+#define Imultiline		PL_multiline
+#define Imystrk			PL_mystrk
+#define Iofmt			PL_ofmt
+#define Ioldlastpm		PL_oldlastpm
+#define Ioldname		PL_oldname
+#define Iop_mask		PL_op_mask
+#define Iorigargc		PL_origargc
+#define Iorigargv		PL_origargv
+#define Iorigfilename		PL_origfilename
+#define Iors			PL_ors
+#define Iorslen			PL_orslen
+#define Iparsehook		PL_parsehook
+#define Ipatchlevel		PL_patchlevel
+#define Ipending_ident		PL_pending_ident
+#define Iperl_destruct_level	PL_perl_destruct_level
+#define Iperldb			PL_perldb
+#define Ipreambleav		PL_preambleav
+#define Ipreambled		PL_preambled
+#define Ipreprocess		PL_preprocess
+#define Iprofiledata		PL_profiledata
+#define Ireplgv			PL_replgv
+#define Irightgv		PL_rightgv
+#define Irsfp			PL_rsfp
+#define Irsfp_filters		PL_rsfp_filters
+#define Isawampersand		PL_sawampersand
+#define Isawstudy		PL_sawstudy
+#define Isawvec			PL_sawvec
+#define Isiggv			PL_siggv
+#define Isplitstr		PL_splitstr
+#define Istatusvalue		PL_statusvalue
+#define Istatusvalue_vms	PL_statusvalue_vms
+#define Istdingv		PL_stdingv
+#define Istrchop		PL_strchop
+#define Istrtab			PL_strtab
+#define Isub_generation		PL_sub_generation
+#define Isublex_info		PL_sublex_info
+#define Isv_arenaroot		PL_sv_arenaroot
+#define Isv_count		PL_sv_count
+#define Isv_objcount		PL_sv_objcount
+#define Isv_root		PL_sv_root
+#define Isys_intern		PL_sys_intern
+#define Itainting		PL_tainting
+#define Ithreadnum		PL_threadnum
+#define Ithrsv			PL_thrsv
+#define Iunsafe			PL_unsafe
+#define Iwarnhook		PL_warnhook
 
 #ifndef USE_THREADS
 
-#define TSv			Sv
-#define TXpv			Xpv
-#define Tav_fetch_sv		av_fetch_sv
-#define Tbodytarget		bodytarget
-#define Tbostr			bostr
-#define Tchopset		chopset
-#define Tcolors			colors
-#define Tcolorset		colorset
-#define Tcurcop			curcop
-#define Tcurpad			curpad
-#define Tcurpm			curpm
-#define Tcurstack		curstack
-#define Tcurstackinfo		curstackinfo
-#define Tcurstash		curstash
-#define Tdefoutgv		defoutgv
-#define Tdefstash		defstash
-#define Tdelaymagic		delaymagic
-#define Tdirty			dirty
-#define Textralen		extralen
-#define Tfirstgv		firstgv
-#define Tformtarget		formtarget
-#define Thv_fetch_ent_mh	hv_fetch_ent_mh
-#define Thv_fetch_sv		hv_fetch_sv
-#define Tin_eval		in_eval
-#define Tlast_in_gv		last_in_gv
-#define Tlastgotoprobe		lastgotoprobe
-#define Tlastscream		lastscream
-#define Tlocalizing		localizing
-#define Tmainstack		mainstack
-#define Tmarkstack		markstack
-#define Tmarkstack_max		markstack_max
-#define Tmarkstack_ptr		markstack_ptr
-#define Tmaxscream		maxscream
-#define Tmodcount		modcount
-#define Tnrs			nrs
-#define Tofs			ofs
-#define Tofslen			ofslen
-#define Top			op
-#define Topsave			opsave
-#define Treg_eval_set		reg_eval_set
-#define Treg_flags		reg_flags
-#define Treg_start_tmp		reg_start_tmp
-#define Treg_start_tmpl		reg_start_tmpl
-#define Tregbol			regbol
-#define Tregcc			regcc
-#define Tregcode		regcode
-#define Tregcomp_parse		regcomp_parse
-#define Tregcomp_rx		regcomp_rx
-#define Tregcompp		regcompp
-#define Tregdata		regdata
-#define Tregdummy		regdummy
-#define Tregendp		regendp
-#define Tregeol			regeol
-#define Tregexecp		regexecp
-#define Tregflags		regflags
-#define Tregindent		regindent
-#define Treginput		reginput
-#define Treginterp_cnt		reginterp_cnt
-#define Treglastparen		reglastparen
-#define Tregnarrate		regnarrate
-#define Tregnaughty		regnaughty
-#define Tregnpar		regnpar
-#define Tregprecomp		regprecomp
-#define Tregprev		regprev
-#define Tregprogram		regprogram
-#define Tregsawback		regsawback
-#define Tregseen		regseen
-#define Tregsize		regsize
-#define Tregstartp		regstartp
-#define Tregtill		regtill
-#define Tregxend		regxend
-#define Trestartop		restartop
-#define Tretstack		retstack
-#define Tretstack_ix		retstack_ix
-#define Tretstack_max		retstack_max
-#define Trs			rs
-#define Tsavestack		savestack
-#define Tsavestack_ix		savestack_ix
-#define Tsavestack_max		savestack_max
-#define Tscopestack		scopestack
-#define Tscopestack_ix		scopestack_ix
-#define Tscopestack_max		scopestack_max
-#define Tscreamfirst		screamfirst
-#define Tscreamnext		screamnext
-#define Tsecondgv		secondgv
-#define Tseen_evals		seen_evals
-#define Tseen_zerolen		seen_zerolen
-#define Tsortcop		sortcop
-#define Tsortcxix		sortcxix
-#define Tsortstash		sortstash
-#define Tstack_base		stack_base
-#define Tstack_max		stack_max
-#define Tstack_sp		stack_sp
-#define Tstart_env		start_env
-#define Tstatbuf		statbuf
-#define Tstatcache		statcache
-#define Tstatgv			statgv
-#define Tstatname		statname
-#define Ttainted		tainted
-#define Ttimesbuf		timesbuf
-#define Ttmps_floor		tmps_floor
-#define Ttmps_ix		tmps_ix
-#define Ttmps_max		tmps_max
-#define Ttmps_stack		tmps_stack
-#define Ttop_env		top_env
-#define Ttoptarget		toptarget
+#define TSv			PL_Sv
+#define TXpv			PL_Xpv
+#define Tav_fetch_sv		PL_av_fetch_sv
+#define Tbodytarget		PL_bodytarget
+#define Tbostr			PL_bostr
+#define Tchopset		PL_chopset
+#define Tcolors			PL_colors
+#define Tcolorset		PL_colorset
+#define Tcurcop			PL_curcop
+#define Tcurpad			PL_curpad
+#define Tcurpm			PL_curpm
+#define Tcurstack		PL_curstack
+#define Tcurstackinfo		PL_curstackinfo
+#define Tcurstash		PL_curstash
+#define Tdefoutgv		PL_defoutgv
+#define Tdefstash		PL_defstash
+#define Tdelaymagic		PL_delaymagic
+#define Tdirty			PL_dirty
+#define Textralen		PL_extralen
+#define Tfirstgv		PL_firstgv
+#define Tformtarget		PL_formtarget
+#define Thv_fetch_ent_mh	PL_hv_fetch_ent_mh
+#define Thv_fetch_sv		PL_hv_fetch_sv
+#define Tin_eval		PL_in_eval
+#define Tlast_in_gv		PL_last_in_gv
+#define Tlastgotoprobe		PL_lastgotoprobe
+#define Tlastscream		PL_lastscream
+#define Tlocalizing		PL_localizing
+#define Tmainstack		PL_mainstack
+#define Tmarkstack		PL_markstack
+#define Tmarkstack_max		PL_markstack_max
+#define Tmarkstack_ptr		PL_markstack_ptr
+#define Tmaxscream		PL_maxscream
+#define Tmodcount		PL_modcount
+#define Tnrs			PL_nrs
+#define Tofs			PL_ofs
+#define Tofslen			PL_ofslen
+#define Top			PL_op
+#define Topsave			PL_opsave
+#define Treg_eval_set		PL_reg_eval_set
+#define Treg_flags		PL_reg_flags
+#define Treg_start_tmp		PL_reg_start_tmp
+#define Treg_start_tmpl		PL_reg_start_tmpl
+#define Tregbol			PL_regbol
+#define Tregcc			PL_regcc
+#define Tregcode		PL_regcode
+#define Tregcomp_parse		PL_regcomp_parse
+#define Tregcomp_rx		PL_regcomp_rx
+#define Tregcompp		PL_regcompp
+#define Tregdata		PL_regdata
+#define Tregdummy		PL_regdummy
+#define Tregendp		PL_regendp
+#define Tregeol			PL_regeol
+#define Tregexecp		PL_regexecp
+#define Tregflags		PL_regflags
+#define Tregindent		PL_regindent
+#define Treginput		PL_reginput
+#define Treginterp_cnt		PL_reginterp_cnt
+#define Treglastparen		PL_reglastparen
+#define Tregnarrate		PL_regnarrate
+#define Tregnaughty		PL_regnaughty
+#define Tregnpar		PL_regnpar
+#define Tregprecomp		PL_regprecomp
+#define Tregprev		PL_regprev
+#define Tregprogram		PL_regprogram
+#define Tregsawback		PL_regsawback
+#define Tregseen		PL_regseen
+#define Tregsize		PL_regsize
+#define Tregstartp		PL_regstartp
+#define Tregtill		PL_regtill
+#define Tregxend		PL_regxend
+#define Trestartop		PL_restartop
+#define Tretstack		PL_retstack
+#define Tretstack_ix		PL_retstack_ix
+#define Tretstack_max		PL_retstack_max
+#define Trs			PL_rs
+#define Tsavestack		PL_savestack
+#define Tsavestack_ix		PL_savestack_ix
+#define Tsavestack_max		PL_savestack_max
+#define Tscopestack		PL_scopestack
+#define Tscopestack_ix		PL_scopestack_ix
+#define Tscopestack_max		PL_scopestack_max
+#define Tscreamfirst		PL_screamfirst
+#define Tscreamnext		PL_screamnext
+#define Tsecondgv		PL_secondgv
+#define Tseen_evals		PL_seen_evals
+#define Tseen_zerolen		PL_seen_zerolen
+#define Tsortcop		PL_sortcop
+#define Tsortcxix		PL_sortcxix
+#define Tsortstash		PL_sortstash
+#define Tstack_base		PL_stack_base
+#define Tstack_max		PL_stack_max
+#define Tstack_sp		PL_stack_sp
+#define Tstart_env		PL_start_env
+#define Tstatbuf		PL_statbuf
+#define Tstatcache		PL_statcache
+#define Tstatgv			PL_statgv
+#define Tstatname		PL_statname
+#define Ttainted		PL_tainted
+#define Ttimesbuf		PL_timesbuf
+#define Ttmps_floor		PL_tmps_floor
+#define Ttmps_ix		PL_tmps_ix
+#define Ttmps_max		PL_tmps_max
+#define Ttmps_stack		PL_tmps_stack
+#define Ttop_env		PL_top_env
+#define Ttoptarget		PL_toptarget
 
 #endif /* USE_THREADS */
 
@@ -502,241 +502,9 @@
 
 #ifdef EMBED
 
-#define Argv			Perl_Argv
-#define Cmd			Perl_Cmd
-#define DBcv			Perl_DBcv
-#define DBgv			Perl_DBgv
-#define DBline			Perl_DBline
-#define DBsignal		Perl_DBsignal
-#define DBsingle		Perl_DBsingle
-#define DBsub			Perl_DBsub
-#define DBtrace			Perl_DBtrace
-#define ampergv			Perl_ampergv
-#define archpat_auto		Perl_archpat_auto
-#define argvgv			Perl_argvgv
-#define argvoutgv		Perl_argvoutgv
-#define basetime		Perl_basetime
-#define beginav			Perl_beginav
-#define cddir			Perl_cddir
-#define compcv			Perl_compcv
-#define compiling		Perl_compiling
-#define comppad			Perl_comppad
-#define comppad_name		Perl_comppad_name
-#define comppad_name_fill	Perl_comppad_name_fill
-#define comppad_name_floor	Perl_comppad_name_floor
-#define copline			Perl_copline
-#define curcopdb		Perl_curcopdb
-#define curstname		Perl_curstname
-#define dbargs			Perl_dbargs
-#define debdelim		Perl_debdelim
-#define debname			Perl_debname
-#define debstash		Perl_debstash
-#define defgv			Perl_defgv
-#define diehook			Perl_diehook
-#define dlevel			Perl_dlevel
-#define dlmax			Perl_dlmax
-#define doextract		Perl_doextract
-#define doswitches		Perl_doswitches
-#define dowarn			Perl_dowarn
-#define dumplvl			Perl_dumplvl
-#define e_script		Perl_e_script
-#define endav			Perl_endav
-#define envgv			Perl_envgv
-#define errgv			Perl_errgv
-#define eval_root		Perl_eval_root
-#define eval_start		Perl_eval_start
-#define exitlist		Perl_exitlist
-#define exitlistlen		Perl_exitlistlen
-#define fdpid			Perl_fdpid
-#define filemode		Perl_filemode
-#define forkprocess		Perl_forkprocess
-#define formfeed		Perl_formfeed
-#define generation		Perl_generation
-#define gensym			Perl_gensym
-#define globalstash		Perl_globalstash
-#define hintgv			Perl_hintgv
-#define in_clean_all		Perl_in_clean_all
-#define in_clean_objs		Perl_in_clean_objs
-#define incgv			Perl_incgv
-#define initav			Perl_initav
-#define inplace			Perl_inplace
-#define last_proto		Perl_last_proto
-#define lastfd			Perl_lastfd
-#define lastsize		Perl_lastsize
-#define lastspbase		Perl_lastspbase
-#define laststatval		Perl_laststatval
-#define laststype		Perl_laststype
-#define leftgv			Perl_leftgv
-#define lineary			Perl_lineary
-#define linestart		Perl_linestart
-#define localpatches		Perl_localpatches
-#define main_cv			Perl_main_cv
-#define main_root		Perl_main_root
-#define main_start		Perl_main_start
-#define maxsysfd		Perl_maxsysfd
-#define mess_sv			Perl_mess_sv
-#define minus_F			Perl_minus_F
-#define minus_a			Perl_minus_a
-#define minus_c			Perl_minus_c
-#define minus_l			Perl_minus_l
-#define minus_n			Perl_minus_n
-#define minus_p			Perl_minus_p
-#define modglobal		Perl_modglobal
-#define multiline		Perl_multiline
-#define mystrk			Perl_mystrk
-#define ofmt			Perl_ofmt
-#define oldlastpm		Perl_oldlastpm
-#define oldname			Perl_oldname
-#define op_mask			Perl_op_mask
-#define origargc		Perl_origargc
-#define origargv		Perl_origargv
-#define origfilename		Perl_origfilename
-#define ors			Perl_ors
-#define orslen			Perl_orslen
-#define parsehook		Perl_parsehook
-#define patchlevel		Perl_patchlevel
-#define pending_ident		Perl_pending_ident
-#define perl_destruct_level	Perl_perl_destruct_level
-#define perldb			Perl_perldb
-#define preambleav		Perl_preambleav
-#define preambled		Perl_preambled
-#define preprocess		Perl_preprocess
-#define profiledata		Perl_profiledata
-#define replgv			Perl_replgv
-#define rightgv			Perl_rightgv
-#define rsfp			Perl_rsfp
-#define rsfp_filters		Perl_rsfp_filters
-#define sawampersand		Perl_sawampersand
-#define sawstudy		Perl_sawstudy
-#define sawvec			Perl_sawvec
-#define siggv			Perl_siggv
-#define splitstr		Perl_splitstr
-#define statusvalue		Perl_statusvalue
-#define statusvalue_vms		Perl_statusvalue_vms
-#define stdingv			Perl_stdingv
-#define strchop			Perl_strchop
-#define strtab			Perl_strtab
-#define sub_generation		Perl_sub_generation
-#define sublex_info		Perl_sublex_info
-#define sv_arenaroot		Perl_sv_arenaroot
-#define sv_count		Perl_sv_count
-#define sv_objcount		Perl_sv_objcount
-#define sv_root			Perl_sv_root
-#define sys_intern		Perl_sys_intern
-#define tainting		Perl_tainting
-#define threadnum		Perl_threadnum
-#define thrsv			Perl_thrsv
-#define unsafe			Perl_unsafe
-#define warnhook		Perl_warnhook
 
 #ifndef USE_THREADS
 
-#define Sv			Perl_Sv
-#define Xpv			Perl_Xpv
-#define av_fetch_sv		Perl_av_fetch_sv
-#define bodytarget		Perl_bodytarget
-#define bostr			Perl_bostr
-#define chopset			Perl_chopset
-#define colors			Perl_colors
-#define colorset		Perl_colorset
-#define curcop			Perl_curcop
-#define curpad			Perl_curpad
-#define curpm			Perl_curpm
-#define curstack		Perl_curstack
-#define curstackinfo		Perl_curstackinfo
-#define curstash		Perl_curstash
-#define defoutgv		Perl_defoutgv
-#define defstash		Perl_defstash
-#define delaymagic		Perl_delaymagic
-#define dirty			Perl_dirty
-#define extralen		Perl_extralen
-#define firstgv			Perl_firstgv
-#define formtarget		Perl_formtarget
-#define hv_fetch_ent_mh		Perl_hv_fetch_ent_mh
-#define hv_fetch_sv		Perl_hv_fetch_sv
-#define in_eval			Perl_in_eval
-#define last_in_gv		Perl_last_in_gv
-#define lastgotoprobe		Perl_lastgotoprobe
-#define lastscream		Perl_lastscream
-#define localizing		Perl_localizing
-#define mainstack		Perl_mainstack
-#define markstack		Perl_markstack
-#define markstack_max		Perl_markstack_max
-#define markstack_ptr		Perl_markstack_ptr
-#define maxscream		Perl_maxscream
-#define modcount		Perl_modcount
-#define nrs			Perl_nrs
-#define ofs			Perl_ofs
-#define ofslen			Perl_ofslen
-#define op			Perl_op
-#define opsave			Perl_opsave
-#define reg_eval_set		Perl_reg_eval_set
-#define reg_flags		Perl_reg_flags
-#define reg_start_tmp		Perl_reg_start_tmp
-#define reg_start_tmpl		Perl_reg_start_tmpl
-#define regbol			Perl_regbol
-#define regcc			Perl_regcc
-#define regcode			Perl_regcode
-#define regcomp_parse		Perl_regcomp_parse
-#define regcomp_rx		Perl_regcomp_rx
-#define regcompp		Perl_regcompp
-#define regdata			Perl_regdata
-#define regdummy		Perl_regdummy
-#define regendp			Perl_regendp
-#define regeol			Perl_regeol
-#define regexecp		Perl_regexecp
-#define regflags		Perl_regflags
-#define regindent		Perl_regindent
-#define reginput		Perl_reginput
-#define reginterp_cnt		Perl_reginterp_cnt
-#define reglastparen		Perl_reglastparen
-#define regnarrate		Perl_regnarrate
-#define regnaughty		Perl_regnaughty
-#define regnpar			Perl_regnpar
-#define regprecomp		Perl_regprecomp
-#define regprev			Perl_regprev
-#define regprogram		Perl_regprogram
-#define regsawback		Perl_regsawback
-#define regseen			Perl_regseen
-#define regsize			Perl_regsize
-#define regstartp		Perl_regstartp
-#define regtill			Perl_regtill
-#define regxend			Perl_regxend
-#define restartop		Perl_restartop
-#define retstack		Perl_retstack
-#define retstack_ix		Perl_retstack_ix
-#define retstack_max		Perl_retstack_max
-#define rs			Perl_rs
-#define savestack		Perl_savestack
-#define savestack_ix		Perl_savestack_ix
-#define savestack_max		Perl_savestack_max
-#define scopestack		Perl_scopestack
-#define scopestack_ix		Perl_scopestack_ix
-#define scopestack_max		Perl_scopestack_max
-#define screamfirst		Perl_screamfirst
-#define screamnext		Perl_screamnext
-#define secondgv		Perl_secondgv
-#define seen_evals		Perl_seen_evals
-#define seen_zerolen		Perl_seen_zerolen
-#define sortcop			Perl_sortcop
-#define sortcxix		Perl_sortcxix
-#define sortstash		Perl_sortstash
-#define stack_base		Perl_stack_base
-#define stack_max		Perl_stack_max
-#define stack_sp		Perl_stack_sp
-#define start_env		Perl_start_env
-#define statbuf			Perl_statbuf
-#define statcache		Perl_statcache
-#define statgv			Perl_statgv
-#define statname		Perl_statname
-#define tainted			Perl_tainted
-#define timesbuf		Perl_timesbuf
-#define tmps_floor		Perl_tmps_floor
-#define tmps_ix			Perl_tmps_ix
-#define tmps_max		Perl_tmps_max
-#define tmps_stack		Perl_tmps_stack
-#define top_env			Perl_top_env
-#define toptarget		Perl_toptarget
 
 #endif /* USE_THREADS */
 #endif /* EMBED */
@@ -746,444 +514,337 @@
 
 #ifdef USE_THREADS
 
-#define Sv			(thr->TSv)
-#define Xpv			(thr->TXpv)
-#define av_fetch_sv		(thr->Tav_fetch_sv)
-#define bodytarget		(thr->Tbodytarget)
-#define bostr			(thr->Tbostr)
-#define chopset			(thr->Tchopset)
-#define colors			(thr->Tcolors)
-#define colorset		(thr->Tcolorset)
-#define curcop			(thr->Tcurcop)
-#define curpad			(thr->Tcurpad)
-#define curpm			(thr->Tcurpm)
-#define curstack		(thr->Tcurstack)
-#define curstackinfo		(thr->Tcurstackinfo)
-#define curstash		(thr->Tcurstash)
-#define defoutgv		(thr->Tdefoutgv)
-#define defstash		(thr->Tdefstash)
-#define delaymagic		(thr->Tdelaymagic)
-#define dirty			(thr->Tdirty)
-#define extralen		(thr->Textralen)
-#define firstgv			(thr->Tfirstgv)
-#define formtarget		(thr->Tformtarget)
-#define hv_fetch_ent_mh		(thr->Thv_fetch_ent_mh)
-#define hv_fetch_sv		(thr->Thv_fetch_sv)
-#define in_eval			(thr->Tin_eval)
-#define last_in_gv		(thr->Tlast_in_gv)
-#define lastgotoprobe		(thr->Tlastgotoprobe)
-#define lastscream		(thr->Tlastscream)
-#define localizing		(thr->Tlocalizing)
-#define mainstack		(thr->Tmainstack)
-#define markstack		(thr->Tmarkstack)
-#define markstack_max		(thr->Tmarkstack_max)
-#define markstack_ptr		(thr->Tmarkstack_ptr)
-#define maxscream		(thr->Tmaxscream)
-#define modcount		(thr->Tmodcount)
-#define nrs			(thr->Tnrs)
-#define ofs			(thr->Tofs)
-#define ofslen			(thr->Tofslen)
-#define op			(thr->Top)
-#define opsave			(thr->Topsave)
-#define reg_eval_set		(thr->Treg_eval_set)
-#define reg_flags		(thr->Treg_flags)
-#define reg_start_tmp		(thr->Treg_start_tmp)
-#define reg_start_tmpl		(thr->Treg_start_tmpl)
-#define regbol			(thr->Tregbol)
-#define regcc			(thr->Tregcc)
-#define regcode			(thr->Tregcode)
-#define regcomp_parse		(thr->Tregcomp_parse)
-#define regcomp_rx		(thr->Tregcomp_rx)
-#define regcompp		(thr->Tregcompp)
-#define regdata			(thr->Tregdata)
-#define regdummy		(thr->Tregdummy)
-#define regendp			(thr->Tregendp)
-#define regeol			(thr->Tregeol)
-#define regexecp		(thr->Tregexecp)
-#define regflags		(thr->Tregflags)
-#define regindent		(thr->Tregindent)
-#define reginput		(thr->Treginput)
-#define reginterp_cnt		(thr->Treginterp_cnt)
-#define reglastparen		(thr->Treglastparen)
-#define regnarrate		(thr->Tregnarrate)
-#define regnaughty		(thr->Tregnaughty)
-#define regnpar			(thr->Tregnpar)
-#define regprecomp		(thr->Tregprecomp)
-#define regprev			(thr->Tregprev)
-#define regprogram		(thr->Tregprogram)
-#define regsawback		(thr->Tregsawback)
-#define regseen			(thr->Tregseen)
-#define regsize			(thr->Tregsize)
-#define regstartp		(thr->Tregstartp)
-#define regtill			(thr->Tregtill)
-#define regxend			(thr->Tregxend)
-#define restartop		(thr->Trestartop)
-#define retstack		(thr->Tretstack)
-#define retstack_ix		(thr->Tretstack_ix)
-#define retstack_max		(thr->Tretstack_max)
-#define rs			(thr->Trs)
-#define savestack		(thr->Tsavestack)
-#define savestack_ix		(thr->Tsavestack_ix)
-#define savestack_max		(thr->Tsavestack_max)
-#define scopestack		(thr->Tscopestack)
-#define scopestack_ix		(thr->Tscopestack_ix)
-#define scopestack_max		(thr->Tscopestack_max)
-#define screamfirst		(thr->Tscreamfirst)
-#define screamnext		(thr->Tscreamnext)
-#define secondgv		(thr->Tsecondgv)
-#define seen_evals		(thr->Tseen_evals)
-#define seen_zerolen		(thr->Tseen_zerolen)
-#define sortcop			(thr->Tsortcop)
-#define sortcxix		(thr->Tsortcxix)
-#define sortstash		(thr->Tsortstash)
-#define stack_base		(thr->Tstack_base)
-#define stack_max		(thr->Tstack_max)
-#define stack_sp		(thr->Tstack_sp)
-#define start_env		(thr->Tstart_env)
-#define statbuf			(thr->Tstatbuf)
-#define statcache		(thr->Tstatcache)
-#define statgv			(thr->Tstatgv)
-#define statname		(thr->Tstatname)
-#define tainted			(thr->Ttainted)
-#define timesbuf		(thr->Ttimesbuf)
-#define tmps_floor		(thr->Ttmps_floor)
-#define tmps_ix			(thr->Ttmps_ix)
-#define tmps_max		(thr->Ttmps_max)
-#define tmps_stack		(thr->Ttmps_stack)
-#define top_env			(thr->Ttop_env)
-#define toptarget		(thr->Ttoptarget)
+#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_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_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_reg_eval_set		(thr->Treg_eval_set)
+#define PL_reg_flags		(thr->Treg_flags)
+#define PL_reg_start_tmp	(thr->Treg_start_tmp)
+#define PL_reg_start_tmpl	(thr->Treg_start_tmpl)
+#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)
 
 #endif /* USE_THREADS */
 
 #ifdef PERL_GLOBAL_STRUCT
 
-#define No			(Perl_Vars.GNo)
-#define Yes			(Perl_Vars.GYes)
-#define amagic_generation	(Perl_Vars.Gamagic_generation)
-#define an			(Perl_Vars.Gan)
-#define bufend			(Perl_Vars.Gbufend)
-#define bufptr			(Perl_Vars.Gbufptr)
-#define collation_ix		(Perl_Vars.Gcollation_ix)
-#define collation_name		(Perl_Vars.Gcollation_name)
-#define collation_standard	(Perl_Vars.Gcollation_standard)
-#define collxfrm_base		(Perl_Vars.Gcollxfrm_base)
-#define collxfrm_mult		(Perl_Vars.Gcollxfrm_mult)
-#define cop_seqmax		(Perl_Vars.Gcop_seqmax)
-#define cryptseen		(Perl_Vars.Gcryptseen)
-#define cshlen			(Perl_Vars.Gcshlen)
-#define cshname			(Perl_Vars.Gcshname)
-#define curinterp		(Perl_Vars.Gcurinterp)
-#define curthr			(Perl_Vars.Gcurthr)
-#define debug			(Perl_Vars.Gdebug)
-#define do_undump		(Perl_Vars.Gdo_undump)
-#define egid			(Perl_Vars.Gegid)
-#define error_count		(Perl_Vars.Gerror_count)
-#define euid			(Perl_Vars.Geuid)
-#define eval_cond		(Perl_Vars.Geval_cond)
-#define eval_mutex		(Perl_Vars.Geval_mutex)
-#define eval_owner		(Perl_Vars.Geval_owner)
-#define evalseq			(Perl_Vars.Gevalseq)
-#define expect			(Perl_Vars.Gexpect)
-#define gid			(Perl_Vars.Ggid)
-#define he_root			(Perl_Vars.Ghe_root)
-#define hexdigit		(Perl_Vars.Ghexdigit)
-#define hints			(Perl_Vars.Ghints)
-#define in_my			(Perl_Vars.Gin_my)
-#define in_my_stash		(Perl_Vars.Gin_my_stash)
-#define last_lop		(Perl_Vars.Glast_lop)
-#define last_lop_op		(Perl_Vars.Glast_lop_op)
-#define last_uni		(Perl_Vars.Glast_uni)
-#define lex_brackets		(Perl_Vars.Glex_brackets)
-#define lex_brackstack		(Perl_Vars.Glex_brackstack)
-#define lex_casemods		(Perl_Vars.Glex_casemods)
-#define lex_casestack		(Perl_Vars.Glex_casestack)
-#define lex_defer		(Perl_Vars.Glex_defer)
-#define lex_dojoin		(Perl_Vars.Glex_dojoin)
-#define lex_expect		(Perl_Vars.Glex_expect)
-#define lex_fakebrack		(Perl_Vars.Glex_fakebrack)
-#define lex_formbrack		(Perl_Vars.Glex_formbrack)
-#define lex_inpat		(Perl_Vars.Glex_inpat)
-#define lex_inwhat		(Perl_Vars.Glex_inwhat)
-#define lex_op			(Perl_Vars.Glex_op)
-#define lex_repl		(Perl_Vars.Glex_repl)
-#define lex_starts		(Perl_Vars.Glex_starts)
-#define lex_state		(Perl_Vars.Glex_state)
-#define lex_stuff		(Perl_Vars.Glex_stuff)
-#define linestr			(Perl_Vars.Glinestr)
-#define malloc_mutex		(Perl_Vars.Gmalloc_mutex)
-#define max_intro_pending	(Perl_Vars.Gmax_intro_pending)
-#define maxo			(Perl_Vars.Gmaxo)
-#define min_intro_pending	(Perl_Vars.Gmin_intro_pending)
-#define multi_close		(Perl_Vars.Gmulti_close)
-#define multi_end		(Perl_Vars.Gmulti_end)
-#define multi_open		(Perl_Vars.Gmulti_open)
-#define multi_start		(Perl_Vars.Gmulti_start)
-#define na			(Perl_Vars.Gna)
-#define nexttoke		(Perl_Vars.Gnexttoke)
-#define nexttype		(Perl_Vars.Gnexttype)
-#define nextval			(Perl_Vars.Gnextval)
-#define nice_chunk		(Perl_Vars.Gnice_chunk)
-#define nice_chunk_size		(Perl_Vars.Gnice_chunk_size)
-#define ninterps		(Perl_Vars.Gninterps)
-#define nomemok			(Perl_Vars.Gnomemok)
-#define nthreads		(Perl_Vars.Gnthreads)
-#define nthreads_cond		(Perl_Vars.Gnthreads_cond)
-#define numeric_local		(Perl_Vars.Gnumeric_local)
-#define numeric_name		(Perl_Vars.Gnumeric_name)
-#define numeric_standard	(Perl_Vars.Gnumeric_standard)
-#define oldbufptr		(Perl_Vars.Goldbufptr)
-#define oldoldbufptr		(Perl_Vars.Goldoldbufptr)
-#define op_seqmax		(Perl_Vars.Gop_seqmax)
-#define origalen		(Perl_Vars.Gorigalen)
-#define origenviron		(Perl_Vars.Gorigenviron)
-#define osname			(Perl_Vars.Gosname)
-#define pad_reset_pending	(Perl_Vars.Gpad_reset_pending)
-#define padix			(Perl_Vars.Gpadix)
-#define padix_floor		(Perl_Vars.Gpadix_floor)
-#define patleave		(Perl_Vars.Gpatleave)
-#define pidstatus		(Perl_Vars.Gpidstatus)
-#define runops			(Perl_Vars.Grunops)
-#define sh_path			(Perl_Vars.Gsh_path)
-#define sighandlerp		(Perl_Vars.Gsighandlerp)
-#define specialsv_list		(Perl_Vars.Gspecialsv_list)
-#define subline			(Perl_Vars.Gsubline)
-#define subname			(Perl_Vars.Gsubname)
-#define sv_mutex		(Perl_Vars.Gsv_mutex)
-#define sv_no			(Perl_Vars.Gsv_no)
-#define sv_undef		(Perl_Vars.Gsv_undef)
-#define sv_yes			(Perl_Vars.Gsv_yes)
-#define svref_mutex		(Perl_Vars.Gsvref_mutex)
-#define thisexpr		(Perl_Vars.Gthisexpr)
-#define thr_key			(Perl_Vars.Gthr_key)
-#define threads_mutex		(Perl_Vars.Gthreads_mutex)
-#define threadsv_names		(Perl_Vars.Gthreadsv_names)
-#define tokenbuf		(Perl_Vars.Gtokenbuf)
-#define uid			(Perl_Vars.Guid)
-#define xiv_arenaroot		(Perl_Vars.Gxiv_arenaroot)
-#define xiv_root		(Perl_Vars.Gxiv_root)
-#define xnv_root		(Perl_Vars.Gxnv_root)
-#define xpv_root		(Perl_Vars.Gxpv_root)
-#define xrv_root		(Perl_Vars.Gxrv_root)
+#define PL_No			(Perl_Vars.GNo)
+#define PL_Yes			(Perl_Vars.GYes)
+#define PL_amagic_generation	(Perl_Vars.Gamagic_generation)
+#define PL_an			(Perl_Vars.Gan)
+#define PL_bufend		(Perl_Vars.Gbufend)
+#define PL_bufptr		(Perl_Vars.Gbufptr)
+#define PL_collation_ix		(Perl_Vars.Gcollation_ix)
+#define PL_collation_name	(Perl_Vars.Gcollation_name)
+#define PL_collation_standard	(Perl_Vars.Gcollation_standard)
+#define PL_collxfrm_base	(Perl_Vars.Gcollxfrm_base)
+#define PL_collxfrm_mult	(Perl_Vars.Gcollxfrm_mult)
+#define PL_cop_seqmax		(Perl_Vars.Gcop_seqmax)
+#define PL_cryptseen		(Perl_Vars.Gcryptseen)
+#define PL_cshlen		(Perl_Vars.Gcshlen)
+#define PL_cshname		(Perl_Vars.Gcshname)
+#define PL_curinterp		(Perl_Vars.Gcurinterp)
+#define PL_curthr		(Perl_Vars.Gcurthr)
+#define PL_debug		(Perl_Vars.Gdebug)
+#define PL_do_undump		(Perl_Vars.Gdo_undump)
+#define PL_egid			(Perl_Vars.Gegid)
+#define PL_error_count		(Perl_Vars.Gerror_count)
+#define PL_euid			(Perl_Vars.Geuid)
+#define PL_eval_cond		(Perl_Vars.Geval_cond)
+#define PL_eval_mutex		(Perl_Vars.Geval_mutex)
+#define PL_eval_owner		(Perl_Vars.Geval_owner)
+#define PL_evalseq		(Perl_Vars.Gevalseq)
+#define PL_expect		(Perl_Vars.Gexpect)
+#define PL_gid			(Perl_Vars.Ggid)
+#define PL_he_root		(Perl_Vars.Ghe_root)
+#define PL_hexdigit		(Perl_Vars.Ghexdigit)
+#define PL_hints		(Perl_Vars.Ghints)
+#define PL_in_my		(Perl_Vars.Gin_my)
+#define PL_in_my_stash		(Perl_Vars.Gin_my_stash)
+#define PL_last_lop		(Perl_Vars.Glast_lop)
+#define PL_last_lop_op		(Perl_Vars.Glast_lop_op)
+#define PL_last_uni		(Perl_Vars.Glast_uni)
+#define PL_lex_brackets		(Perl_Vars.Glex_brackets)
+#define PL_lex_brackstack	(Perl_Vars.Glex_brackstack)
+#define PL_lex_casemods		(Perl_Vars.Glex_casemods)
+#define PL_lex_casestack	(Perl_Vars.Glex_casestack)
+#define PL_lex_defer		(Perl_Vars.Glex_defer)
+#define PL_lex_dojoin		(Perl_Vars.Glex_dojoin)
+#define PL_lex_expect		(Perl_Vars.Glex_expect)
+#define PL_lex_fakebrack	(Perl_Vars.Glex_fakebrack)
+#define PL_lex_formbrack	(Perl_Vars.Glex_formbrack)
+#define PL_lex_inpat		(Perl_Vars.Glex_inpat)
+#define PL_lex_inwhat		(Perl_Vars.Glex_inwhat)
+#define PL_lex_op		(Perl_Vars.Glex_op)
+#define PL_lex_repl		(Perl_Vars.Glex_repl)
+#define PL_lex_starts		(Perl_Vars.Glex_starts)
+#define PL_lex_state		(Perl_Vars.Glex_state)
+#define PL_lex_stuff		(Perl_Vars.Glex_stuff)
+#define PL_linestr		(Perl_Vars.Glinestr)
+#define PL_malloc_mutex		(Perl_Vars.Gmalloc_mutex)
+#define PL_max_intro_pending	(Perl_Vars.Gmax_intro_pending)
+#define PL_maxo			(Perl_Vars.Gmaxo)
+#define PL_min_intro_pending	(Perl_Vars.Gmin_intro_pending)
+#define PL_multi_close		(Perl_Vars.Gmulti_close)
+#define PL_multi_end		(Perl_Vars.Gmulti_end)
+#define PL_multi_open		(Perl_Vars.Gmulti_open)
+#define PL_multi_start		(Perl_Vars.Gmulti_start)
+#define PL_na			(Perl_Vars.Gna)
+#define PL_nexttoke		(Perl_Vars.Gnexttoke)
+#define PL_nexttype		(Perl_Vars.Gnexttype)
+#define PL_nextval		(Perl_Vars.Gnextval)
+#define PL_nice_chunk		(Perl_Vars.Gnice_chunk)
+#define PL_nice_chunk_size	(Perl_Vars.Gnice_chunk_size)
+#define PL_ninterps		(Perl_Vars.Gninterps)
+#define PL_nomemok		(Perl_Vars.Gnomemok)
+#define PL_nthreads		(Perl_Vars.Gnthreads)
+#define PL_nthreads_cond	(Perl_Vars.Gnthreads_cond)
+#define PL_numeric_local	(Perl_Vars.Gnumeric_local)
+#define PL_numeric_name		(Perl_Vars.Gnumeric_name)
+#define PL_numeric_standard	(Perl_Vars.Gnumeric_standard)
+#define PL_oldbufptr		(Perl_Vars.Goldbufptr)
+#define PL_oldoldbufptr		(Perl_Vars.Goldoldbufptr)
+#define PL_op_seqmax		(Perl_Vars.Gop_seqmax)
+#define PL_origalen		(Perl_Vars.Gorigalen)
+#define PL_origenviron		(Perl_Vars.Gorigenviron)
+#define PL_osname		(Perl_Vars.Gosname)
+#define PL_pad_reset_pending	(Perl_Vars.Gpad_reset_pending)
+#define PL_padix		(Perl_Vars.Gpadix)
+#define PL_padix_floor		(Perl_Vars.Gpadix_floor)
+#define PL_patleave		(Perl_Vars.Gpatleave)
+#define PL_pidstatus		(Perl_Vars.Gpidstatus)
+#define PL_runops		(Perl_Vars.Grunops)
+#define PL_sh_path		(Perl_Vars.Gsh_path)
+#define PL_sighandlerp		(Perl_Vars.Gsighandlerp)
+#define PL_specialsv_list	(Perl_Vars.Gspecialsv_list)
+#define PL_subline		(Perl_Vars.Gsubline)
+#define PL_subname		(Perl_Vars.Gsubname)
+#define PL_sv_mutex		(Perl_Vars.Gsv_mutex)
+#define PL_sv_no		(Perl_Vars.Gsv_no)
+#define PL_sv_undef		(Perl_Vars.Gsv_undef)
+#define PL_sv_yes		(Perl_Vars.Gsv_yes)
+#define PL_svref_mutex		(Perl_Vars.Gsvref_mutex)
+#define PL_thisexpr		(Perl_Vars.Gthisexpr)
+#define PL_thr_key		(Perl_Vars.Gthr_key)
+#define PL_threads_mutex	(Perl_Vars.Gthreads_mutex)
+#define PL_threadsv_names	(Perl_Vars.Gthreadsv_names)
+#define PL_tokenbuf		(Perl_Vars.Gtokenbuf)
+#define PL_uid			(Perl_Vars.Guid)
+#define PL_xiv_arenaroot	(Perl_Vars.Gxiv_arenaroot)
+#define PL_xiv_root		(Perl_Vars.Gxiv_root)
+#define PL_xnv_root		(Perl_Vars.Gxnv_root)
+#define PL_xpv_root		(Perl_Vars.Gxpv_root)
+#define PL_xrv_root		(Perl_Vars.Gxrv_root)
 
 #else /* !PERL_GLOBAL_STRUCT */
 
-#define GNo			No
-#define GYes			Yes
-#define Gamagic_generation	amagic_generation
-#define Gan			an
-#define Gbufend			bufend
-#define Gbufptr			bufptr
-#define Gcollation_ix		collation_ix
-#define Gcollation_name		collation_name
-#define Gcollation_standard	collation_standard
-#define Gcollxfrm_base		collxfrm_base
-#define Gcollxfrm_mult		collxfrm_mult
-#define Gcop_seqmax		cop_seqmax
-#define Gcryptseen		cryptseen
-#define Gcshlen			cshlen
-#define Gcshname		cshname
-#define Gcurinterp		curinterp
-#define Gcurthr			curthr
-#define Gdebug			debug
-#define Gdo_undump		do_undump
-#define Gegid			egid
-#define Gerror_count		error_count
-#define Geuid			euid
-#define Geval_cond		eval_cond
-#define Geval_mutex		eval_mutex
-#define Geval_owner		eval_owner
-#define Gevalseq		evalseq
-#define Gexpect			expect
-#define Ggid			gid
-#define Ghe_root		he_root
-#define Ghexdigit		hexdigit
-#define Ghints			hints
-#define Gin_my			in_my
-#define Gin_my_stash		in_my_stash
-#define Glast_lop		last_lop
-#define Glast_lop_op		last_lop_op
-#define Glast_uni		last_uni
-#define Glex_brackets		lex_brackets
-#define Glex_brackstack		lex_brackstack
-#define Glex_casemods		lex_casemods
-#define Glex_casestack		lex_casestack
-#define Glex_defer		lex_defer
-#define Glex_dojoin		lex_dojoin
-#define Glex_expect		lex_expect
-#define Glex_fakebrack		lex_fakebrack
-#define Glex_formbrack		lex_formbrack
-#define Glex_inpat		lex_inpat
-#define Glex_inwhat		lex_inwhat
-#define Glex_op			lex_op
-#define Glex_repl		lex_repl
-#define Glex_starts		lex_starts
-#define Glex_state		lex_state
-#define Glex_stuff		lex_stuff
-#define Glinestr		linestr
-#define Gmalloc_mutex		malloc_mutex
-#define Gmax_intro_pending	max_intro_pending
-#define Gmaxo			maxo
-#define Gmin_intro_pending	min_intro_pending
-#define Gmulti_close		multi_close
-#define Gmulti_end		multi_end
-#define Gmulti_open		multi_open
-#define Gmulti_start		multi_start
-#define Gna			na
-#define Gnexttoke		nexttoke
-#define Gnexttype		nexttype
-#define Gnextval		nextval
-#define Gnice_chunk		nice_chunk
-#define Gnice_chunk_size	nice_chunk_size
-#define Gninterps		ninterps
-#define Gnomemok		nomemok
-#define Gnthreads		nthreads
-#define Gnthreads_cond		nthreads_cond
-#define Gnumeric_local		numeric_local
-#define Gnumeric_name		numeric_name
-#define Gnumeric_standard	numeric_standard
-#define Goldbufptr		oldbufptr
-#define Goldoldbufptr		oldoldbufptr
-#define Gop_seqmax		op_seqmax
-#define Gorigalen		origalen
-#define Gorigenviron		origenviron
-#define Gosname			osname
-#define Gpad_reset_pending	pad_reset_pending
-#define Gpadix			padix
-#define Gpadix_floor		padix_floor
-#define Gpatleave		patleave
-#define Gpidstatus		pidstatus
-#define Grunops			runops
-#define Gsh_path		sh_path
-#define Gsighandlerp		sighandlerp
-#define Gspecialsv_list		specialsv_list
-#define Gsubline		subline
-#define Gsubname		subname
-#define Gsv_mutex		sv_mutex
-#define Gsv_no			sv_no
-#define Gsv_undef		sv_undef
-#define Gsv_yes			sv_yes
-#define Gsvref_mutex		svref_mutex
-#define Gthisexpr		thisexpr
-#define Gthr_key		thr_key
-#define Gthreads_mutex		threads_mutex
-#define Gthreadsv_names		threadsv_names
-#define Gtokenbuf		tokenbuf
-#define Guid			uid
-#define Gxiv_arenaroot		xiv_arenaroot
-#define Gxiv_root		xiv_root
-#define Gxnv_root		xnv_root
-#define Gxpv_root		xpv_root
-#define Gxrv_root		xrv_root
+#define GNo			PL_No
+#define GYes			PL_Yes
+#define Gamagic_generation	PL_amagic_generation
+#define Gan			PL_an
+#define Gbufend			PL_bufend
+#define Gbufptr			PL_bufptr
+#define Gcollation_ix		PL_collation_ix
+#define Gcollation_name		PL_collation_name
+#define Gcollation_standard	PL_collation_standard
+#define Gcollxfrm_base		PL_collxfrm_base
+#define Gcollxfrm_mult		PL_collxfrm_mult
+#define Gcop_seqmax		PL_cop_seqmax
+#define Gcryptseen		PL_cryptseen
+#define Gcshlen			PL_cshlen
+#define Gcshname		PL_cshname
+#define Gcurinterp		PL_curinterp
+#define Gcurthr			PL_curthr
+#define Gdebug			PL_debug
+#define Gdo_undump		PL_do_undump
+#define Gegid			PL_egid
+#define Gerror_count		PL_error_count
+#define Geuid			PL_euid
+#define Geval_cond		PL_eval_cond
+#define Geval_mutex		PL_eval_mutex
+#define Geval_owner		PL_eval_owner
+#define Gevalseq		PL_evalseq
+#define Gexpect			PL_expect
+#define Ggid			PL_gid
+#define Ghe_root		PL_he_root
+#define Ghexdigit		PL_hexdigit
+#define Ghints			PL_hints
+#define Gin_my			PL_in_my
+#define Gin_my_stash		PL_in_my_stash
+#define Glast_lop		PL_last_lop
+#define Glast_lop_op		PL_last_lop_op
+#define Glast_uni		PL_last_uni
+#define Glex_brackets		PL_lex_brackets
+#define Glex_brackstack		PL_lex_brackstack
+#define Glex_casemods		PL_lex_casemods
+#define Glex_casestack		PL_lex_casestack
+#define Glex_defer		PL_lex_defer
+#define Glex_dojoin		PL_lex_dojoin
+#define Glex_expect		PL_lex_expect
+#define Glex_fakebrack		PL_lex_fakebrack
+#define Glex_formbrack		PL_lex_formbrack
+#define Glex_inpat		PL_lex_inpat
+#define Glex_inwhat		PL_lex_inwhat
+#define Glex_op			PL_lex_op
+#define Glex_repl		PL_lex_repl
+#define Glex_starts		PL_lex_starts
+#define Glex_state		PL_lex_state
+#define Glex_stuff		PL_lex_stuff
+#define Glinestr		PL_linestr
+#define Gmalloc_mutex		PL_malloc_mutex
+#define Gmax_intro_pending	PL_max_intro_pending
+#define Gmaxo			PL_maxo
+#define Gmin_intro_pending	PL_min_intro_pending
+#define Gmulti_close		PL_multi_close
+#define Gmulti_end		PL_multi_end
+#define Gmulti_open		PL_multi_open
+#define Gmulti_start		PL_multi_start
+#define Gna			PL_na
+#define Gnexttoke		PL_nexttoke
+#define Gnexttype		PL_nexttype
+#define Gnextval		PL_nextval
+#define Gnice_chunk		PL_nice_chunk
+#define Gnice_chunk_size	PL_nice_chunk_size
+#define Gninterps		PL_ninterps
+#define Gnomemok		PL_nomemok
+#define Gnthreads		PL_nthreads
+#define Gnthreads_cond		PL_nthreads_cond
+#define Gnumeric_local		PL_numeric_local
+#define Gnumeric_name		PL_numeric_name
+#define Gnumeric_standard	PL_numeric_standard
+#define Goldbufptr		PL_oldbufptr
+#define Goldoldbufptr		PL_oldoldbufptr
+#define Gop_seqmax		PL_op_seqmax
+#define Gorigalen		PL_origalen
+#define Gorigenviron		PL_origenviron
+#define Gosname			PL_osname
+#define Gpad_reset_pending	PL_pad_reset_pending
+#define Gpadix			PL_padix
+#define Gpadix_floor		PL_padix_floor
+#define Gpatleave		PL_patleave
+#define Gpidstatus		PL_pidstatus
+#define Grunops			PL_runops
+#define Gsh_path		PL_sh_path
+#define Gsighandlerp		PL_sighandlerp
+#define Gspecialsv_list		PL_specialsv_list
+#define Gsubline		PL_subline
+#define Gsubname		PL_subname
+#define Gsv_mutex		PL_sv_mutex
+#define Gsv_no			PL_sv_no
+#define Gsv_undef		PL_sv_undef
+#define Gsv_yes			PL_sv_yes
+#define Gsvref_mutex		PL_svref_mutex
+#define Gthisexpr		PL_thisexpr
+#define Gthr_key		PL_thr_key
+#define Gthreads_mutex		PL_threads_mutex
+#define Gthreadsv_names		PL_threadsv_names
+#define Gtokenbuf		PL_tokenbuf
+#define Guid			PL_uid
+#define Gxiv_arenaroot		PL_xiv_arenaroot
+#define Gxiv_root		PL_xiv_root
+#define Gxnv_root		PL_xnv_root
+#define Gxpv_root		PL_xpv_root
+#define Gxrv_root		PL_xrv_root
 
 #ifdef EMBED
 
-#define No			Perl_No
-#define Yes			Perl_Yes
-#define amagic_generation	Perl_amagic_generation
-#define an			Perl_an
-#define bufend			Perl_bufend
-#define bufptr			Perl_bufptr
-#define collation_ix		Perl_collation_ix
-#define collation_name		Perl_collation_name
-#define collation_standard	Perl_collation_standard
-#define collxfrm_base		Perl_collxfrm_base
-#define collxfrm_mult		Perl_collxfrm_mult
-#define cop_seqmax		Perl_cop_seqmax
-#define cryptseen		Perl_cryptseen
-#define cshlen			Perl_cshlen
-#define cshname			Perl_cshname
-#define curinterp		Perl_curinterp
-#define curthr			Perl_curthr
-#define debug			Perl_debug
-#define do_undump		Perl_do_undump
-#define egid			Perl_egid
-#define error_count		Perl_error_count
-#define euid			Perl_euid
-#define eval_cond		Perl_eval_cond
-#define eval_mutex		Perl_eval_mutex
-#define eval_owner		Perl_eval_owner
-#define evalseq			Perl_evalseq
-#define expect			Perl_expect
-#define gid			Perl_gid
-#define he_root			Perl_he_root
-#define hexdigit		Perl_hexdigit
-#define hints			Perl_hints
-#define in_my			Perl_in_my
-#define in_my_stash		Perl_in_my_stash
-#define last_lop		Perl_last_lop
-#define last_lop_op		Perl_last_lop_op
-#define last_uni		Perl_last_uni
-#define lex_brackets		Perl_lex_brackets
-#define lex_brackstack		Perl_lex_brackstack
-#define lex_casemods		Perl_lex_casemods
-#define lex_casestack		Perl_lex_casestack
-#define lex_defer		Perl_lex_defer
-#define lex_dojoin		Perl_lex_dojoin
-#define lex_expect		Perl_lex_expect
-#define lex_fakebrack		Perl_lex_fakebrack
-#define lex_formbrack		Perl_lex_formbrack
-#define lex_inpat		Perl_lex_inpat
-#define lex_inwhat		Perl_lex_inwhat
-#define lex_op			Perl_lex_op
-#define lex_repl		Perl_lex_repl
-#define lex_starts		Perl_lex_starts
-#define lex_state		Perl_lex_state
-#define lex_stuff		Perl_lex_stuff
-#define linestr			Perl_linestr
-#define malloc_mutex		Perl_malloc_mutex
-#define max_intro_pending	Perl_max_intro_pending
-#define maxo			Perl_maxo
-#define min_intro_pending	Perl_min_intro_pending
-#define multi_close		Perl_multi_close
-#define multi_end		Perl_multi_end
-#define multi_open		Perl_multi_open
-#define multi_start		Perl_multi_start
-#define na			Perl_na
-#define nexttoke		Perl_nexttoke
-#define nexttype		Perl_nexttype
-#define nextval			Perl_nextval
-#define nice_chunk		Perl_nice_chunk
-#define nice_chunk_size		Perl_nice_chunk_size
-#define ninterps		Perl_ninterps
-#define nomemok			Perl_nomemok
-#define nthreads		Perl_nthreads
-#define nthreads_cond		Perl_nthreads_cond
-#define numeric_local		Perl_numeric_local
-#define numeric_name		Perl_numeric_name
-#define numeric_standard	Perl_numeric_standard
-#define oldbufptr		Perl_oldbufptr
-#define oldoldbufptr		Perl_oldoldbufptr
-#define op_seqmax		Perl_op_seqmax
-#define origalen		Perl_origalen
-#define origenviron		Perl_origenviron
-#define osname			Perl_osname
-#define pad_reset_pending	Perl_pad_reset_pending
-#define padix			Perl_padix
-#define padix_floor		Perl_padix_floor
-#define patleave		Perl_patleave
-#define pidstatus		Perl_pidstatus
-#define runops			Perl_runops
-#define sh_path			Perl_sh_path
-#define sighandlerp		Perl_sighandlerp
-#define specialsv_list		Perl_specialsv_list
-#define subline			Perl_subline
-#define subname			Perl_subname
-#define sv_mutex		Perl_sv_mutex
-#define sv_no			Perl_sv_no
-#define sv_undef		Perl_sv_undef
-#define sv_yes			Perl_sv_yes
-#define svref_mutex		Perl_svref_mutex
-#define thisexpr		Perl_thisexpr
-#define thr_key			Perl_thr_key
-#define threads_mutex		Perl_threads_mutex
-#define threadsv_names		Perl_threadsv_names
-#define tokenbuf		Perl_tokenbuf
-#define uid			Perl_uid
-#define xiv_arenaroot		Perl_xiv_arenaroot
-#define xiv_root		Perl_xiv_root
-#define xnv_root		Perl_xnv_root
-#define xpv_root		Perl_xpv_root
-#define xrv_root		Perl_xrv_root
 
 #endif /* EMBED */
 #endif /* PERL_GLOBAL_STRUCT */