delete thrdvar.h and move its contents to intrpvar.h

p4raw-id: //depot/perl@31245

1 files changed, 157 insertions, 160 deletions

diff --git a/embedvar.h b/embedvar.h
index 99f0864527..adbfa1d7ab 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -10,7 +10,7 @@
  *
  * !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
  * This file is built by embed.pl from data in embed.fnc, embed.pl,
- * pp.sym, intrpvar.h, perlvars.h and thrdvar.h.
+ * pp.sym, intrpvar.h, and perlvars.h.
  * Any changes made here will be lost!
  *
  * Edit those files and run 'make regen_headers' to effect changes.
@@ -40,87 +40,6 @@
 #    define vTHX	PERL_GET_INTERP
 #  endif
 
-#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_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_delayedisa		(vTHX->Tdelayedisa)
-#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_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_ofs_sv		(vTHX->Tofs_sv)
-#define PL_op			(vTHX->Top)
-#define PL_opsave		(vTHX->Topsave)
-#define PL_peepp		(vTHX->Tpeepp)
-#define PL_reg_state		(vTHX->Treg_state)
-#define PL_regdummy		(vTHX->Tregdummy)
-#define PL_reginterp_cnt	(vTHX->Treginterp_cnt)
-#define PL_regmatch_slab	(vTHX->Tregmatch_slab)
-#define PL_regmatch_state	(vTHX->Tregmatch_state)
-#define PL_restartop		(vTHX->Trestartop)
-#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_sortcop		(vTHX->Tsortcop)
-#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)
-
-/* cases 2 and 3 above */
-
 #define PL_Argv			(vTHX->IArgv)
 #define PL_Cmd			(vTHX->ICmd)
 #define PL_DBassertion		(vTHX->IDBassertion)
@@ -143,25 +62,32 @@
 #define PL_Proc			(vTHX->IProc)
 #define PL_Sock			(vTHX->ISock)
 #define PL_StdIO		(vTHX->IStdIO)
+#define PL_Sv			(vTHX->ISv)
+#define PL_Xpv			(vTHX->IXpv)
 #define PL_amagic_generation	(vTHX->Iamagic_generation)
 #define PL_an			(vTHX->Ian)
 #define PL_argvgv		(vTHX->Iargvgv)
 #define PL_argvout_stack	(vTHX->Iargvout_stack)
 #define PL_argvoutgv		(vTHX->Iargvoutgv)
+#define PL_av_fetch_sv		(vTHX->Iav_fetch_sv)
 #define PL_basetime		(vTHX->Ibasetime)
 #define PL_beginav		(vTHX->Ibeginav)
 #define PL_beginav_save		(vTHX->Ibeginav_save)
 #define PL_bitcount		(vTHX->Ibitcount)
 #define PL_body_arenas		(vTHX->Ibody_arenas)
 #define PL_body_roots		(vTHX->Ibody_roots)
+#define PL_bodytarget		(vTHX->Ibodytarget)
 #define PL_checkav		(vTHX->Icheckav)
 #define PL_checkav_save		(vTHX->Icheckav_save)
+#define PL_chopset		(vTHX->Ichopset)
 #define PL_clocktick		(vTHX->Iclocktick)
 #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_colors		(vTHX->Icolors)
+#define PL_colorset		(vTHX->Icolorset)
 #define PL_compcv		(vTHX->Icompcv)
 #define PL_compiling		(vTHX->Icompiling)
 #define PL_comppad		(vTHX->Icomppad)
@@ -172,7 +98,13 @@
 #define PL_cryptseen		(vTHX->Icryptseen)
 #define PL_cshlen		(vTHX->Icshlen)
 #define PL_cshname		(vTHX->Icshname)
+#define PL_curcop		(vTHX->Icurcop)
 #define PL_curcopdb		(vTHX->Icurcopdb)
+#define PL_curpad		(vTHX->Icurpad)
+#define PL_curpm		(vTHX->Icurpm)
+#define PL_curstack		(vTHX->Icurstack)
+#define PL_curstackinfo		(vTHX->Icurstackinfo)
+#define PL_curstash		(vTHX->Icurstash)
 #define PL_curstname		(vTHX->Icurstname)
 #define PL_custom_op_descs	(vTHX->Icustom_op_descs)
 #define PL_custom_op_names	(vTHX->Icustom_op_names)
@@ -183,18 +115,27 @@
 #define PL_debug_pad		(vTHX->Idebug_pad)
 #define PL_def_layerlist	(vTHX->Idef_layerlist)
 #define PL_defgv		(vTHX->Idefgv)
+#define PL_defoutgv		(vTHX->Idefoutgv)
+#define PL_defstash		(vTHX->Idefstash)
+#define PL_delayedisa		(vTHX->Idelayedisa)
+#define PL_delaymagic		(vTHX->Idelaymagic)
 #define PL_diehook		(vTHX->Idiehook)
+#define PL_dirty		(vTHX->Idirty)
 #define PL_doextract		(vTHX->Idoextract)
 #define PL_doswitches		(vTHX->Idoswitches)
 #define PL_dowarn		(vTHX->Idowarn)
 #define PL_dumper_fd		(vTHX->Idumper_fd)
+#define PL_dumpindent		(vTHX->Idumpindent)
 #define PL_e_script		(vTHX->Ie_script)
+#define PL_efloatbuf		(vTHX->Iefloatbuf)
+#define PL_efloatsize		(vTHX->Iefloatsize)
 #define PL_egid			(vTHX->Iegid)
 #define PL_encoding		(vTHX->Iencoding)
 #define PL_endav		(vTHX->Iendav)
 #define PL_envgv		(vTHX->Ienvgv)
 #define PL_errgv		(vTHX->Ierrgv)
 #define PL_error_count		(vTHX->Ierror_count)
+#define PL_errors		(vTHX->Ierrors)
 #define PL_euid			(vTHX->Ieuid)
 #define PL_eval_root		(vTHX->Ieval_root)
 #define PL_eval_start		(vTHX->Ieval_start)
@@ -204,8 +145,10 @@
 #define PL_exitlistlen		(vTHX->Iexitlistlen)
 #define PL_fdpid		(vTHX->Ifdpid)
 #define PL_filemode		(vTHX->Ifilemode)
+#define PL_firstgv		(vTHX->Ifirstgv)
 #define PL_forkprocess		(vTHX->Iforkprocess)
 #define PL_formfeed		(vTHX->Iformfeed)
+#define PL_formtarget		(vTHX->Iformtarget)
 #define PL_generation		(vTHX->Igeneration)
 #define PL_gensym		(vTHX->Igensym)
 #define PL_gid			(vTHX->Igid)
@@ -215,31 +158,43 @@
 #define PL_hash_seed_set	(vTHX->Ihash_seed_set)
 #define PL_hintgv		(vTHX->Ihintgv)
 #define PL_hints		(vTHX->Ihints)
+#define PL_hv_fetch_ent_mh	(vTHX->Ihv_fetch_ent_mh)
+#define PL_hv_fetch_sv		(vTHX->Ihv_fetch_sv)
 #define PL_in_clean_all		(vTHX->Iin_clean_all)
 #define PL_in_clean_objs	(vTHX->Iin_clean_objs)
+#define PL_in_eval		(vTHX->Iin_eval)
 #define PL_in_load_module	(vTHX->Iin_load_module)
 #define PL_incgv		(vTHX->Iincgv)
 #define PL_initav		(vTHX->Iinitav)
 #define PL_inplace		(vTHX->Iinplace)
 #define PL_isarev		(vTHX->Iisarev)
 #define PL_known_layers		(vTHX->Iknown_layers)
+#define PL_last_in_gv		(vTHX->Ilast_in_gv)
 #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_lastfd		(vTHX->Ilastfd)
+#define PL_lastgotoprobe	(vTHX->Ilastgotoprobe)
+#define PL_lastscream		(vTHX->Ilastscream)
 #define PL_laststatval		(vTHX->Ilaststatval)
 #define PL_laststype		(vTHX->Ilaststype)
 #define PL_lineary		(vTHX->Ilineary)
+#define PL_localizing		(vTHX->Ilocalizing)
 #define PL_localpatches		(vTHX->Ilocalpatches)
 #define PL_lockhook		(vTHX->Ilockhook)
 #define PL_madskills		(vTHX->Imadskills)
 #define PL_main_cv		(vTHX->Imain_cv)
 #define PL_main_root		(vTHX->Imain_root)
 #define PL_main_start		(vTHX->Imain_start)
+#define PL_mainstack		(vTHX->Imainstack)
+#define PL_markstack		(vTHX->Imarkstack)
+#define PL_markstack_max	(vTHX->Imarkstack_max)
+#define PL_markstack_ptr	(vTHX->Imarkstack_ptr)
 #define PL_max_intro_pending	(vTHX->Imax_intro_pending)
 #define PL_maxo			(vTHX->Imaxo)
+#define PL_maxscream		(vTHX->Imaxscream)
 #define PL_maxsysfd		(vTHX->Imaxsysfd)
 #define PL_memory_debug_header	(vTHX->Imemory_debug_header)
 #define PL_mess_sv		(vTHX->Imess_sv)
@@ -251,11 +206,13 @@
 #define PL_minus_l		(vTHX->Iminus_l)
 #define PL_minus_n		(vTHX->Iminus_n)
 #define PL_minus_p		(vTHX->Iminus_p)
+#define PL_modcount		(vTHX->Imodcount)
 #define PL_modglobal		(vTHX->Imodglobal)
 #define PL_multi_end		(vTHX->Imulti_end)
 #define PL_my_cxt_keys		(vTHX->Imy_cxt_keys)
 #define PL_my_cxt_list		(vTHX->Imy_cxt_list)
 #define PL_my_cxt_size		(vTHX->Imy_cxt_size)
+#define PL_na			(vTHX->Ina)
 #define PL_nice_chunk		(vTHX->Inice_chunk)
 #define PL_nice_chunk_size	(vTHX->Inice_chunk_size)
 #define PL_nomemok		(vTHX->Inomemok)
@@ -263,8 +220,11 @@
 #define PL_numeric_name		(vTHX->Inumeric_name)
 #define PL_numeric_radix_sv	(vTHX->Inumeric_radix_sv)
 #define PL_numeric_standard	(vTHX->Inumeric_standard)
+#define PL_ofs_sv		(vTHX->Iofs_sv)
 #define PL_oldname		(vTHX->Ioldname)
+#define PL_op			(vTHX->Iop)
 #define PL_op_mask		(vTHX->Iop_mask)
+#define PL_opsave		(vTHX->Iopsave)
 #define PL_origalen		(vTHX->Iorigalen)
 #define PL_origargc		(vTHX->Iorigargc)
 #define PL_origargv		(vTHX->Iorigargv)
@@ -277,6 +237,7 @@
 #define PL_padix_floor		(vTHX->Ipadix_floor)
 #define PL_parser		(vTHX->Iparser)
 #define PL_patchlevel		(vTHX->Ipatchlevel)
+#define PL_peepp		(vTHX->Ipeepp)
 #define PL_perl_destruct_level	(vTHX->Iperl_destruct_level)
 #define PL_perldb		(vTHX->Iperldb)
 #define PL_perlio		(vTHX->Iperlio)
@@ -291,16 +252,32 @@
 #define PL_ptr_table		(vTHX->Iptr_table)
 #define PL_reentrant_buffer	(vTHX->Ireentrant_buffer)
 #define PL_reentrant_retint	(vTHX->Ireentrant_retint)
+#define PL_reg_state		(vTHX->Ireg_state)
+#define PL_regdummy		(vTHX->Iregdummy)
 #define PL_regex_pad		(vTHX->Iregex_pad)
 #define PL_regex_padav		(vTHX->Iregex_padav)
+#define PL_reginterp_cnt	(vTHX->Ireginterp_cnt)
+#define PL_regmatch_slab	(vTHX->Iregmatch_slab)
+#define PL_regmatch_state	(vTHX->Iregmatch_state)
 #define PL_rehash_seed		(vTHX->Irehash_seed)
 #define PL_rehash_seed_set	(vTHX->Irehash_seed_set)
 #define PL_replgv		(vTHX->Ireplgv)
+#define PL_restartop		(vTHX->Irestartop)
+#define PL_rs			(vTHX->Irs)
 #define PL_runops		(vTHX->Irunops)
 #define PL_runops_dbg		(vTHX->Irunops_dbg)
 #define PL_runops_std		(vTHX->Irunops_std)
 #define PL_savebegin		(vTHX->Isavebegin)
+#define PL_savestack		(vTHX->Isavestack)
+#define PL_savestack_ix		(vTHX->Isavestack_ix)
+#define PL_savestack_max	(vTHX->Isavestack_max)
 #define PL_sawampersand		(vTHX->Isawampersand)
+#define PL_scopestack		(vTHX->Iscopestack)
+#define PL_scopestack_ix	(vTHX->Iscopestack_ix)
+#define PL_scopestack_max	(vTHX->Iscopestack_max)
+#define PL_screamfirst		(vTHX->Iscreamfirst)
+#define PL_screamnext		(vTHX->Iscreamnext)
+#define PL_secondgv		(vTHX->Isecondgv)
 #define PL_sharehook		(vTHX->Isharehook)
 #define PL_sig_pending		(vTHX->Isig_pending)
 #define PL_sighandlerp		(vTHX->Isighandlerp)
@@ -308,9 +285,19 @@
 #define PL_slab_count		(vTHX->Islab_count)
 #define PL_slabs		(vTHX->Islabs)
 #define PL_sort_RealCmp		(vTHX->Isort_RealCmp)
+#define PL_sortcop		(vTHX->Isortcop)
+#define PL_sortstash		(vTHX->Isortstash)
 #define PL_splitstr		(vTHX->Isplitstr)
 #define PL_srand_called		(vTHX->Isrand_called)
+#define PL_stack_base		(vTHX->Istack_base)
+#define PL_stack_max		(vTHX->Istack_max)
+#define PL_stack_sp		(vTHX->Istack_sp)
+#define PL_start_env		(vTHX->Istart_env)
 #define PL_stashcache		(vTHX->Istashcache)
+#define PL_statbuf		(vTHX->Istatbuf)
+#define PL_statcache		(vTHX->Istatcache)
+#define PL_statgv		(vTHX->Istatgv)
+#define PL_statname		(vTHX->Istatname)
 #define PL_statusvalue		(vTHX->Istatusvalue)
 #define PL_statusvalue_posix	(vTHX->Istatusvalue_posix)
 #define PL_statusvalue_vms	(vTHX->Istatusvalue_vms)
@@ -329,9 +316,17 @@
 #define PL_sv_yes		(vTHX->Isv_yes)
 #define PL_sys_intern		(vTHX->Isys_intern)
 #define PL_taint_warn		(vTHX->Itaint_warn)
+#define PL_tainted		(vTHX->Itainted)
 #define PL_tainting		(vTHX->Itainting)
 #define PL_threadhook		(vTHX->Ithreadhook)
+#define PL_timesbuf		(vTHX->Itimesbuf)
+#define PL_tmps_floor		(vTHX->Itmps_floor)
+#define PL_tmps_ix		(vTHX->Itmps_ix)
+#define PL_tmps_max		(vTHX->Itmps_max)
+#define PL_tmps_stack		(vTHX->Itmps_stack)
 #define PL_tokenbuf		(vTHX->Itokenbuf)
+#define PL_top_env		(vTHX->Itop_env)
+#define PL_toptarget		(vTHX->Itoptarget)
 #define PL_uid			(vTHX->Iuid)
 #define PL_unicode		(vTHX->Iunicode)
 #define PL_unitcheckav		(vTHX->Iunitcheckav)
@@ -361,6 +356,8 @@
 #define PL_utf8cache		(vTHX->Iutf8cache)
 #define PL_utf8locale		(vTHX->Iutf8locale)
 #define PL_warnhook		(vTHX->Iwarnhook)
+#define PL_watchaddr		(vTHX->Iwatchaddr)
+#define PL_watchok		(vTHX->Iwatchok)
 #define PL_xmlfp		(vTHX->Ixmlfp)
 
 #else	/* !MULTIPLICITY */
@@ -389,25 +386,32 @@
 #define PL_IProc		PL_Proc
 #define PL_ISock		PL_Sock
 #define PL_IStdIO		PL_StdIO
+#define PL_ISv			PL_Sv
+#define PL_IXpv			PL_Xpv
 #define PL_Iamagic_generation	PL_amagic_generation
 #define PL_Ian			PL_an
 #define PL_Iargvgv		PL_argvgv
 #define PL_Iargvout_stack	PL_argvout_stack
 #define PL_Iargvoutgv		PL_argvoutgv
+#define PL_Iav_fetch_sv		PL_av_fetch_sv
 #define PL_Ibasetime		PL_basetime
 #define PL_Ibeginav		PL_beginav
 #define PL_Ibeginav_save	PL_beginav_save
 #define PL_Ibitcount		PL_bitcount
 #define PL_Ibody_arenas		PL_body_arenas
 #define PL_Ibody_roots		PL_body_roots
+#define PL_Ibodytarget		PL_bodytarget
 #define PL_Icheckav		PL_checkav
 #define PL_Icheckav_save	PL_checkav_save
+#define PL_Ichopset		PL_chopset
 #define PL_Iclocktick		PL_clocktick
 #define PL_Icollation_ix	PL_collation_ix
 #define PL_Icollation_name	PL_collation_name
 #define PL_Icollation_standard	PL_collation_standard
 #define PL_Icollxfrm_base	PL_collxfrm_base
 #define PL_Icollxfrm_mult	PL_collxfrm_mult
+#define PL_Icolors		PL_colors
+#define PL_Icolorset		PL_colorset
 #define PL_Icompcv		PL_compcv
 #define PL_Icompiling		PL_compiling
 #define PL_Icomppad		PL_comppad
@@ -418,7 +422,13 @@
 #define PL_Icryptseen		PL_cryptseen
 #define PL_Icshlen		PL_cshlen
 #define PL_Icshname		PL_cshname
+#define PL_Icurcop		PL_curcop
 #define PL_Icurcopdb		PL_curcopdb
+#define PL_Icurpad		PL_curpad
+#define PL_Icurpm		PL_curpm
+#define PL_Icurstack		PL_curstack
+#define PL_Icurstackinfo	PL_curstackinfo
+#define PL_Icurstash		PL_curstash
 #define PL_Icurstname		PL_curstname
 #define PL_Icustom_op_descs	PL_custom_op_descs
 #define PL_Icustom_op_names	PL_custom_op_names
@@ -429,18 +439,27 @@
 #define PL_Idebug_pad		PL_debug_pad
 #define PL_Idef_layerlist	PL_def_layerlist
 #define PL_Idefgv		PL_defgv
+#define PL_Idefoutgv		PL_defoutgv
+#define PL_Idefstash		PL_defstash
+#define PL_Idelayedisa		PL_delayedisa
+#define PL_Idelaymagic		PL_delaymagic
 #define PL_Idiehook		PL_diehook
+#define PL_Idirty		PL_dirty
 #define PL_Idoextract		PL_doextract
 #define PL_Idoswitches		PL_doswitches
 #define PL_Idowarn		PL_dowarn
 #define PL_Idumper_fd		PL_dumper_fd
+#define PL_Idumpindent		PL_dumpindent
 #define PL_Ie_script		PL_e_script
+#define PL_Iefloatbuf		PL_efloatbuf
+#define PL_Iefloatsize		PL_efloatsize
 #define PL_Iegid		PL_egid
 #define PL_Iencoding		PL_encoding
 #define PL_Iendav		PL_endav
 #define PL_Ienvgv		PL_envgv
 #define PL_Ierrgv		PL_errgv
 #define PL_Ierror_count		PL_error_count
+#define PL_Ierrors		PL_errors
 #define PL_Ieuid		PL_euid
 #define PL_Ieval_root		PL_eval_root
 #define PL_Ieval_start		PL_eval_start
@@ -450,8 +469,10 @@
 #define PL_Iexitlistlen		PL_exitlistlen
 #define PL_Ifdpid		PL_fdpid
 #define PL_Ifilemode		PL_filemode
+#define PL_Ifirstgv		PL_firstgv
 #define PL_Iforkprocess		PL_forkprocess
 #define PL_Iformfeed		PL_formfeed
+#define PL_Iformtarget		PL_formtarget
 #define PL_Igeneration		PL_generation
 #define PL_Igensym		PL_gensym
 #define PL_Igid			PL_gid
@@ -461,31 +482,43 @@
 #define PL_Ihash_seed_set	PL_hash_seed_set
 #define PL_Ihintgv		PL_hintgv
 #define PL_Ihints		PL_hints
+#define PL_Ihv_fetch_ent_mh	PL_hv_fetch_ent_mh
+#define PL_Ihv_fetch_sv		PL_hv_fetch_sv
 #define PL_Iin_clean_all	PL_in_clean_all
 #define PL_Iin_clean_objs	PL_in_clean_objs
+#define PL_Iin_eval		PL_in_eval
 #define PL_Iin_load_module	PL_in_load_module
 #define PL_Iincgv		PL_incgv
 #define PL_Iinitav		PL_initav
 #define PL_Iinplace		PL_inplace
 #define PL_Iisarev		PL_isarev
 #define PL_Iknown_layers	PL_known_layers
+#define PL_Ilast_in_gv		PL_last_in_gv
 #define PL_Ilast_swash_hv	PL_last_swash_hv
 #define PL_Ilast_swash_key	PL_last_swash_key
 #define PL_Ilast_swash_klen	PL_last_swash_klen
 #define PL_Ilast_swash_slen	PL_last_swash_slen
 #define PL_Ilast_swash_tmps	PL_last_swash_tmps
 #define PL_Ilastfd		PL_lastfd
+#define PL_Ilastgotoprobe	PL_lastgotoprobe
+#define PL_Ilastscream		PL_lastscream
 #define PL_Ilaststatval		PL_laststatval
 #define PL_Ilaststype		PL_laststype
 #define PL_Ilineary		PL_lineary
+#define PL_Ilocalizing		PL_localizing
 #define PL_Ilocalpatches	PL_localpatches
 #define PL_Ilockhook		PL_lockhook
 #define PL_Imadskills		PL_madskills
 #define PL_Imain_cv		PL_main_cv
 #define PL_Imain_root		PL_main_root
 #define PL_Imain_start		PL_main_start
+#define PL_Imainstack		PL_mainstack
+#define PL_Imarkstack		PL_markstack
+#define PL_Imarkstack_max	PL_markstack_max
+#define PL_Imarkstack_ptr	PL_markstack_ptr
 #define PL_Imax_intro_pending	PL_max_intro_pending
 #define PL_Imaxo		PL_maxo
+#define PL_Imaxscream		PL_maxscream
 #define PL_Imaxsysfd		PL_maxsysfd
 #define PL_Imemory_debug_header	PL_memory_debug_header
 #define PL_Imess_sv		PL_mess_sv
@@ -497,11 +530,13 @@
 #define PL_Iminus_l		PL_minus_l
 #define PL_Iminus_n		PL_minus_n
 #define PL_Iminus_p		PL_minus_p
+#define PL_Imodcount		PL_modcount
 #define PL_Imodglobal		PL_modglobal
 #define PL_Imulti_end		PL_multi_end
 #define PL_Imy_cxt_keys		PL_my_cxt_keys
 #define PL_Imy_cxt_list		PL_my_cxt_list
 #define PL_Imy_cxt_size		PL_my_cxt_size
+#define PL_Ina			PL_na
 #define PL_Inice_chunk		PL_nice_chunk
 #define PL_Inice_chunk_size	PL_nice_chunk_size
 #define PL_Inomemok		PL_nomemok
@@ -509,8 +544,11 @@
 #define PL_Inumeric_name	PL_numeric_name
 #define PL_Inumeric_radix_sv	PL_numeric_radix_sv
 #define PL_Inumeric_standard	PL_numeric_standard
+#define PL_Iofs_sv		PL_ofs_sv
 #define PL_Ioldname		PL_oldname
+#define PL_Iop			PL_op
 #define PL_Iop_mask		PL_op_mask
+#define PL_Iopsave		PL_opsave
 #define PL_Iorigalen		PL_origalen
 #define PL_Iorigargc		PL_origargc
 #define PL_Iorigargv		PL_origargv
@@ -523,6 +561,7 @@
 #define PL_Ipadix_floor		PL_padix_floor
 #define PL_Iparser		PL_parser
 #define PL_Ipatchlevel		PL_patchlevel
+#define PL_Ipeepp		PL_peepp
 #define PL_Iperl_destruct_level	PL_perl_destruct_level
 #define PL_Iperldb		PL_perldb
 #define PL_Iperlio		PL_perlio
@@ -537,16 +576,32 @@
 #define PL_Iptr_table		PL_ptr_table
 #define PL_Ireentrant_buffer	PL_reentrant_buffer
 #define PL_Ireentrant_retint	PL_reentrant_retint
+#define PL_Ireg_state		PL_reg_state
+#define PL_Iregdummy		PL_regdummy
 #define PL_Iregex_pad		PL_regex_pad
 #define PL_Iregex_padav		PL_regex_padav
+#define PL_Ireginterp_cnt	PL_reginterp_cnt
+#define PL_Iregmatch_slab	PL_regmatch_slab
+#define PL_Iregmatch_state	PL_regmatch_state
 #define PL_Irehash_seed		PL_rehash_seed
 #define PL_Irehash_seed_set	PL_rehash_seed_set
 #define PL_Ireplgv		PL_replgv
+#define PL_Irestartop		PL_restartop
+#define PL_Irs			PL_rs
 #define PL_Irunops		PL_runops
 #define PL_Irunops_dbg		PL_runops_dbg
 #define PL_Irunops_std		PL_runops_std
 #define PL_Isavebegin		PL_savebegin
+#define PL_Isavestack		PL_savestack
+#define PL_Isavestack_ix	PL_savestack_ix
+#define PL_Isavestack_max	PL_savestack_max
 #define PL_Isawampersand	PL_sawampersand
+#define PL_Iscopestack		PL_scopestack
+#define PL_Iscopestack_ix	PL_scopestack_ix
+#define PL_Iscopestack_max	PL_scopestack_max
+#define PL_Iscreamfirst		PL_screamfirst
+#define PL_Iscreamnext		PL_screamnext
+#define PL_Isecondgv		PL_secondgv
 #define PL_Isharehook		PL_sharehook
 #define PL_Isig_pending		PL_sig_pending
 #define PL_Isighandlerp		PL_sighandlerp
@@ -554,9 +609,19 @@
 #define PL_Islab_count		PL_slab_count
 #define PL_Islabs		PL_slabs
 #define PL_Isort_RealCmp	PL_sort_RealCmp
+#define PL_Isortcop		PL_sortcop
+#define PL_Isortstash		PL_sortstash
 #define PL_Isplitstr		PL_splitstr
 #define PL_Isrand_called	PL_srand_called
+#define PL_Istack_base		PL_stack_base
+#define PL_Istack_max		PL_stack_max
+#define PL_Istack_sp		PL_stack_sp
+#define PL_Istart_env		PL_start_env
 #define PL_Istashcache		PL_stashcache
+#define PL_Istatbuf		PL_statbuf
+#define PL_Istatcache		PL_statcache
+#define PL_Istatgv		PL_statgv
+#define PL_Istatname		PL_statname
 #define PL_Istatusvalue		PL_statusvalue
 #define PL_Istatusvalue_posix	PL_statusvalue_posix
 #define PL_Istatusvalue_vms	PL_statusvalue_vms
@@ -575,9 +640,17 @@
 #define PL_Isv_yes		PL_sv_yes
 #define PL_Isys_intern		PL_sys_intern
 #define PL_Itaint_warn		PL_taint_warn
+#define PL_Itainted		PL_tainted
 #define PL_Itainting		PL_tainting
 #define PL_Ithreadhook		PL_threadhook
+#define PL_Itimesbuf		PL_timesbuf
+#define PL_Itmps_floor		PL_tmps_floor
+#define PL_Itmps_ix		PL_tmps_ix
+#define PL_Itmps_max		PL_tmps_max
+#define PL_Itmps_stack		PL_tmps_stack
 #define PL_Itokenbuf		PL_tokenbuf
+#define PL_Itop_env		PL_top_env
+#define PL_Itoptarget		PL_toptarget
 #define PL_Iuid			PL_uid
 #define PL_Iunicode		PL_unicode
 #define PL_Iunitcheckav		PL_unitcheckav
@@ -607,86 +680,10 @@
 #define PL_Iutf8cache		PL_utf8cache
 #define PL_Iutf8locale		PL_utf8locale
 #define PL_Iwarnhook		PL_warnhook
+#define PL_Iwatchaddr		PL_watchaddr
+#define PL_Iwatchok		PL_watchok
 #define PL_Ixmlfp		PL_xmlfp
 
-#define PL_TSv			PL_Sv
-#define PL_TXpv			PL_Xpv
-#define PL_Tav_fetch_sv		PL_av_fetch_sv
-#define PL_Tbodytarget		PL_bodytarget
-#define PL_Tchopset		PL_chopset
-#define PL_Tcolors		PL_colors
-#define PL_Tcolorset		PL_colorset
-#define PL_Tcurcop		PL_curcop
-#define PL_Tcurpad		PL_curpad
-#define PL_Tcurpm		PL_curpm
-#define PL_Tcurstack		PL_curstack
-#define PL_Tcurstackinfo	PL_curstackinfo
-#define PL_Tcurstash		PL_curstash
-#define PL_Tdefoutgv		PL_defoutgv
-#define PL_Tdefstash		PL_defstash
-#define PL_Tdelayedisa		PL_delayedisa
-#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_Tfirstgv		PL_firstgv
-#define PL_Tformtarget		PL_formtarget
-#define PL_Thv_fetch_ent_mh	PL_hv_fetch_ent_mh
-#define PL_Thv_fetch_sv		PL_hv_fetch_sv
-#define PL_Tin_eval		PL_in_eval
-#define PL_Tlast_in_gv		PL_last_in_gv
-#define PL_Tlastgotoprobe	PL_lastgotoprobe
-#define PL_Tlastscream		PL_lastscream
-#define PL_Tlocalizing		PL_localizing
-#define PL_Tmainstack		PL_mainstack
-#define PL_Tmarkstack		PL_markstack
-#define PL_Tmarkstack_max	PL_markstack_max
-#define PL_Tmarkstack_ptr	PL_markstack_ptr
-#define PL_Tmaxscream		PL_maxscream
-#define PL_Tmodcount		PL_modcount
-#define PL_Tna			PL_na
-#define PL_Tofs_sv		PL_ofs_sv
-#define PL_Top			PL_op
-#define PL_Topsave		PL_opsave
-#define PL_Tpeepp		PL_peepp
-#define PL_Treg_state		PL_reg_state
-#define PL_Tregdummy		PL_regdummy
-#define PL_Treginterp_cnt	PL_reginterp_cnt
-#define PL_Tregmatch_slab	PL_regmatch_slab
-#define PL_Tregmatch_state	PL_regmatch_state
-#define PL_Trestartop		PL_restartop
-#define PL_Trs			PL_rs
-#define PL_Tsavestack		PL_savestack
-#define PL_Tsavestack_ix	PL_savestack_ix
-#define PL_Tsavestack_max	PL_savestack_max
-#define PL_Tscopestack		PL_scopestack
-#define PL_Tscopestack_ix	PL_scopestack_ix
-#define PL_Tscopestack_max	PL_scopestack_max
-#define PL_Tscreamfirst		PL_screamfirst
-#define PL_Tscreamnext		PL_screamnext
-#define PL_Tsecondgv		PL_secondgv
-#define PL_Tsortcop		PL_sortcop
-#define PL_Tsortstash		PL_sortstash
-#define PL_Tstack_base		PL_stack_base
-#define PL_Tstack_max		PL_stack_max
-#define PL_Tstack_sp		PL_stack_sp
-#define PL_Tstart_env		PL_start_env
-#define PL_Tstatbuf		PL_statbuf
-#define PL_Tstatcache		PL_statcache
-#define PL_Tstatgv		PL_statgv
-#define PL_Tstatname		PL_statname
-#define PL_Ttainted		PL_tainted
-#define PL_Ttimesbuf		PL_timesbuf
-#define PL_Ttmps_floor		PL_tmps_floor
-#define PL_Ttmps_ix		PL_tmps_ix
-#define PL_Ttmps_max		PL_tmps_max
-#define PL_Ttmps_stack		PL_tmps_stack
-#define PL_Ttop_env		PL_top_env
-#define PL_Ttoptarget		PL_toptarget
-#define PL_Twatchaddr		PL_watchaddr
-#define PL_Twatchok		PL_watchok
 
 #endif	/* MULTIPLICITY */