make RE engine threadsafe; -Dusethreads builds, tests on Solaris,

and runs regexes in 1000s of threads without crashing; also fixed
statcache not being thread-local

p4raw-id: //depot/perl@1448

1 files changed, 204 insertions, 153 deletions

diff --git a/embedvar.h b/embedvar.h
index 2f6997311b..6d2dbe412a 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -24,7 +24,10 @@
 #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)
@@ -35,22 +38,59 @@
 #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)
@@ -62,11 +102,22 @@
 #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)
@@ -95,10 +146,7 @@
 #define argvoutgv		(curinterp->Iargvoutgv)
 #define basetime		(curinterp->Ibasetime)
 #define beginav			(curinterp->Ibeginav)
-#define bostr			(curinterp->Ibostr)
 #define cddir			(curinterp->Icddir)
-#define colors			(curinterp->Icolors)
-#define colorset		(curinterp->Icolorset)
 #define compcv			(curinterp->Icompcv)
 #define compiling		(curinterp->Icompiling)
 #define comppad			(curinterp->Icomppad)
@@ -128,10 +176,8 @@
 #define eval_start		(curinterp->Ieval_start)
 #define exitlist		(curinterp->Iexitlist)
 #define exitlistlen		(curinterp->Iexitlistlen)
-#define extralen		(curinterp->Iextralen)
 #define fdpid			(curinterp->Ifdpid)
 #define filemode		(curinterp->Ifilemode)
-#define firstgv			(curinterp->Ifirstgv)
 #define forkprocess		(curinterp->Iforkprocess)
 #define formfeed		(curinterp->Iformfeed)
 #define generation		(curinterp->Igeneration)
@@ -145,8 +191,6 @@
 #define inplace			(curinterp->Iinplace)
 #define last_proto		(curinterp->Ilast_proto)
 #define lastfd			(curinterp->Ilastfd)
-#define lastgotoprobe		(curinterp->Ilastgotoprobe)
-#define lastscream		(curinterp->Ilastscream)
 #define lastsize		(curinterp->Ilastsize)
 #define lastspbase		(curinterp->Ilastspbase)
 #define laststatval		(curinterp->Ilaststatval)
@@ -158,7 +202,6 @@
 #define main_cv			(curinterp->Imain_cv)
 #define main_root		(curinterp->Imain_root)
 #define main_start		(curinterp->Imain_start)
-#define maxscream		(curinterp->Imaxscream)
 #define maxsysfd		(curinterp->Imaxsysfd)
 #define mess_sv			(curinterp->Imess_sv)
 #define minus_F			(curinterp->Iminus_F)
@@ -188,38 +231,6 @@
 #define preambled		(curinterp->Ipreambled)
 #define preprocess		(curinterp->Ipreprocess)
 #define profiledata		(curinterp->Iprofiledata)
-#define reg_eval_set		(curinterp->Ireg_eval_set)
-#define reg_flags		(curinterp->Ireg_flags)
-#define reg_start_tmp		(curinterp->Ireg_start_tmp)
-#define reg_start_tmpl		(curinterp->Ireg_start_tmpl)
-#define regbol			(curinterp->Iregbol)
-#define regcc			(curinterp->Iregcc)
-#define regcode			(curinterp->Iregcode)
-#define regcomp_parse		(curinterp->Iregcomp_parse)
-#define regcomp_rx		(curinterp->Iregcomp_rx)
-#define regcompp		(curinterp->Iregcompp)
-#define regdata			(curinterp->Iregdata)
-#define regdummy		(curinterp->Iregdummy)
-#define regendp			(curinterp->Iregendp)
-#define regeol			(curinterp->Iregeol)
-#define regexecp		(curinterp->Iregexecp)
-#define regflags		(curinterp->Iregflags)
-#define regindent		(curinterp->Iregindent)
-#define reginput		(curinterp->Ireginput)
-#define reginterp_cnt		(curinterp->Ireginterp_cnt)
-#define reglastparen		(curinterp->Ireglastparen)
-#define regnarrate		(curinterp->Iregnarrate)
-#define regnaughty		(curinterp->Iregnaughty)
-#define regnpar			(curinterp->Iregnpar)
-#define regprecomp		(curinterp->Iregprecomp)
-#define regprev			(curinterp->Iregprev)
-#define regprogram		(curinterp->Iregprogram)
-#define regsawback		(curinterp->Iregsawback)
-#define regseen			(curinterp->Iregseen)
-#define regsize			(curinterp->Iregsize)
-#define regstartp		(curinterp->Iregstartp)
-#define regtill			(curinterp->Iregtill)
-#define regxend			(curinterp->Iregxend)
 #define replgv			(curinterp->Ireplgv)
 #define rightgv			(curinterp->Irightgv)
 #define rsfp			(curinterp->Irsfp)
@@ -227,19 +238,8 @@
 #define sawampersand		(curinterp->Isawampersand)
 #define sawstudy		(curinterp->Isawstudy)
 #define sawvec			(curinterp->Isawvec)
-#define screamfirst		(curinterp->Iscreamfirst)
-#define screamnext		(curinterp->Iscreamnext)
-#define secondgv		(curinterp->Isecondgv)
-#define seen_evals		(curinterp->Iseen_evals)
-#define seen_zerolen		(curinterp->Iseen_zerolen)
 #define siggv			(curinterp->Isiggv)
-#define sortcop			(curinterp->Isortcop)
-#define sortcxix		(curinterp->Isortcxix)
-#define sortstash		(curinterp->Isortstash)
 #define splitstr		(curinterp->Isplitstr)
-#define statcache		(curinterp->Istatcache)
-#define statgv			(curinterp->Istatgv)
-#define statname		(curinterp->Istatname)
 #define statusvalue		(curinterp->Istatusvalue)
 #define statusvalue_vms		(curinterp->Istatusvalue_vms)
 #define stdingv			(curinterp->Istdingv)
@@ -275,10 +275,7 @@
 #define Iargvoutgv		argvoutgv
 #define Ibasetime		basetime
 #define Ibeginav		beginav
-#define Ibostr			bostr
 #define Icddir			cddir
-#define Icolors			colors
-#define Icolorset		colorset
 #define Icompcv			compcv
 #define Icompiling		compiling
 #define Icomppad		comppad
@@ -308,10 +305,8 @@
 #define Ieval_start		eval_start
 #define Iexitlist		exitlist
 #define Iexitlistlen		exitlistlen
-#define Iextralen		extralen
 #define Ifdpid			fdpid
 #define Ifilemode		filemode
-#define Ifirstgv		firstgv
 #define Iforkprocess		forkprocess
 #define Iformfeed		formfeed
 #define Igeneration		generation
@@ -325,8 +320,6 @@
 #define Iinplace		inplace
 #define Ilast_proto		last_proto
 #define Ilastfd			lastfd
-#define Ilastgotoprobe		lastgotoprobe
-#define Ilastscream		lastscream
 #define Ilastsize		lastsize
 #define Ilastspbase		lastspbase
 #define Ilaststatval		laststatval
@@ -338,7 +331,6 @@
 #define Imain_cv		main_cv
 #define Imain_root		main_root
 #define Imain_start		main_start
-#define Imaxscream		maxscream
 #define Imaxsysfd		maxsysfd
 #define Imess_sv		mess_sv
 #define Iminus_F		minus_F
@@ -368,38 +360,6 @@
 #define Ipreambled		preambled
 #define Ipreprocess		preprocess
 #define Iprofiledata		profiledata
-#define Ireg_eval_set		reg_eval_set
-#define Ireg_flags		reg_flags
-#define Ireg_start_tmp		reg_start_tmp
-#define Ireg_start_tmpl		reg_start_tmpl
-#define Iregbol			regbol
-#define Iregcc			regcc
-#define Iregcode		regcode
-#define Iregcomp_parse		regcomp_parse
-#define Iregcomp_rx		regcomp_rx
-#define Iregcompp		regcompp
-#define Iregdata		regdata
-#define Iregdummy		regdummy
-#define Iregendp		regendp
-#define Iregeol			regeol
-#define Iregexecp		regexecp
-#define Iregflags		regflags
-#define Iregindent		regindent
-#define Ireginput		reginput
-#define Ireginterp_cnt		reginterp_cnt
-#define Ireglastparen		reglastparen
-#define Iregnarrate		regnarrate
-#define Iregnaughty		regnaughty
-#define Iregnpar		regnpar
-#define Iregprecomp		regprecomp
-#define Iregprev		regprev
-#define Iregprogram		regprogram
-#define Iregsawback		regsawback
-#define Iregseen		regseen
-#define Iregsize		regsize
-#define Iregstartp		regstartp
-#define Iregtill		regtill
-#define Iregxend		regxend
 #define Ireplgv			replgv
 #define Irightgv		rightgv
 #define Irsfp			rsfp
@@ -407,19 +367,8 @@
 #define Isawampersand		sawampersand
 #define Isawstudy		sawstudy
 #define Isawvec			sawvec
-#define Iscreamfirst		screamfirst
-#define Iscreamnext		screamnext
-#define Isecondgv		secondgv
-#define Iseen_evals		seen_evals
-#define Iseen_zerolen		seen_zerolen
 #define Isiggv			siggv
-#define Isortcop		sortcop
-#define Isortcxix		sortcxix
-#define Isortstash		sortstash
 #define Isplitstr		splitstr
-#define Istatcache		statcache
-#define Istatgv			statgv
-#define Istatname		statname
 #define Istatusvalue		statusvalue
 #define Istatusvalue_vms	statusvalue_vms
 #define Istdingv		stdingv
@@ -444,7 +393,10 @@
 #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
@@ -455,22 +407,59 @@
 #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
@@ -482,11 +471,22 @@
 #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
@@ -517,10 +517,7 @@
 #define argvoutgv		Perl_argvoutgv
 #define basetime		Perl_basetime
 #define beginav			Perl_beginav
-#define bostr			Perl_bostr
 #define cddir			Perl_cddir
-#define colors			Perl_colors
-#define colorset		Perl_colorset
 #define compcv			Perl_compcv
 #define compiling		Perl_compiling
 #define comppad			Perl_comppad
@@ -550,10 +547,8 @@
 #define eval_start		Perl_eval_start
 #define exitlist		Perl_exitlist
 #define exitlistlen		Perl_exitlistlen
-#define extralen		Perl_extralen
 #define fdpid			Perl_fdpid
 #define filemode		Perl_filemode
-#define firstgv			Perl_firstgv
 #define forkprocess		Perl_forkprocess
 #define formfeed		Perl_formfeed
 #define generation		Perl_generation
@@ -567,8 +562,6 @@
 #define inplace			Perl_inplace
 #define last_proto		Perl_last_proto
 #define lastfd			Perl_lastfd
-#define lastgotoprobe		Perl_lastgotoprobe
-#define lastscream		Perl_lastscream
 #define lastsize		Perl_lastsize
 #define lastspbase		Perl_lastspbase
 #define laststatval		Perl_laststatval
@@ -580,7 +573,6 @@
 #define main_cv			Perl_main_cv
 #define main_root		Perl_main_root
 #define main_start		Perl_main_start
-#define maxscream		Perl_maxscream
 #define maxsysfd		Perl_maxsysfd
 #define mess_sv			Perl_mess_sv
 #define minus_F			Perl_minus_F
@@ -610,38 +602,6 @@
 #define preambled		Perl_preambled
 #define preprocess		Perl_preprocess
 #define profiledata		Perl_profiledata
-#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 replgv			Perl_replgv
 #define rightgv			Perl_rightgv
 #define rsfp			Perl_rsfp
@@ -649,19 +609,8 @@
 #define sawampersand		Perl_sawampersand
 #define sawstudy		Perl_sawstudy
 #define sawvec			Perl_sawvec
-#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 siggv			Perl_siggv
-#define sortcop			Perl_sortcop
-#define sortcxix		Perl_sortcxix
-#define sortstash		Perl_sortstash
 #define splitstr		Perl_splitstr
-#define statcache		Perl_statcache
-#define statgv			Perl_statgv
-#define statname		Perl_statname
 #define statusvalue		Perl_statusvalue
 #define statusvalue_vms		Perl_statusvalue_vms
 #define stdingv			Perl_stdingv
@@ -686,7 +635,10 @@
 #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
@@ -697,22 +649,59 @@
 #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
@@ -724,11 +713,22 @@
 #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
@@ -750,7 +750,10 @@
 #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)
@@ -761,22 +764,59 @@
 #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)
@@ -788,11 +828,22 @@
 #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)