[asperl] integrate mainline changes

p4raw-id: //depot/asperl@884

1 files changed, 16 insertions, 18 deletions

diff --git a/embedvar.h b/embedvar.h
index 4e3f81630e..0ba157975e 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -22,21 +22,22 @@
 
 #define Sv			(curinterp->TSv)
 #define Xpv			(curinterp->TXpv)
+#define av_fetch_sv		(curinterp->Tav_fetch_sv)
 #define bodytarget		(curinterp->Tbodytarget)
 #define chopset			(curinterp->Tchopset)
 #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 cxstack			(curinterp->Tcxstack)
-#define cxstack_ix		(curinterp->Tcxstack_ix)
-#define cxstack_max		(curinterp->Tcxstack_max)
 #define defoutgv		(curinterp->Tdefoutgv)
 #define defstash		(curinterp->Tdefstash)
 #define delaymagic		(curinterp->Tdelaymagic)
 #define dirty			(curinterp->Tdirty)
 #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 localizing		(curinterp->Tlocalizing)
@@ -215,10 +216,8 @@
 #define screamnext		(curinterp->Iscreamnext)
 #define secondgv		(curinterp->Isecondgv)
 #define siggv			(curinterp->Isiggv)
-#define signalstack		(curinterp->Isignalstack)
 #define sortcop			(curinterp->Isortcop)
 #define sortcxix		(curinterp->Isortcxix)
-#define sortstack		(curinterp->Isortstack)
 #define sortstash		(curinterp->Isortstash)
 #define splitstr		(curinterp->Isplitstr)
 #define statcache		(curinterp->Istatcache)
@@ -379,10 +378,8 @@
 #define Isecondgv		secondgv
 #define Iseen_zerolen		seen_zerolen
 #define Isiggv			siggv
-#define Isignalstack		signalstack
 #define Isortcop		sortcop
 #define Isortcxix		sortcxix
-#define Isortstack		sortstack
 #define Isortstash		sortstash
 #define Isplitstr		splitstr
 #define Istatcache		statcache
@@ -408,21 +405,22 @@
 
 #define TSv			Sv
 #define TXpv			Xpv
+#define Tav_fetch_sv		av_fetch_sv
 #define Tbodytarget		bodytarget
 #define Tchopset		chopset
 #define Tcurcop			curcop
 #define Tcurpad			curpad
 #define Tcurpm			curpm
 #define Tcurstack		curstack
+#define Tcurstackinfo		curstackinfo
 #define Tcurstash		curstash
-#define Tcxstack		cxstack
-#define Tcxstack_ix		cxstack_ix
-#define Tcxstack_max		cxstack_max
 #define Tdefoutgv		defoutgv
 #define Tdefstash		defstash
 #define Tdelaymagic		delaymagic
 #define Tdirty			dirty
 #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 Tlocalizing		localizing
@@ -603,10 +601,8 @@
 #define secondgv		Perl_secondgv
 #define seen_zerolen		Perl_seen_zerolen
 #define siggv			Perl_siggv
-#define signalstack		Perl_signalstack
 #define sortcop			Perl_sortcop
 #define sortcxix		Perl_sortcxix
-#define sortstack		Perl_sortstack
 #define sortstash		Perl_sortstash
 #define splitstr		Perl_splitstr
 #define statcache		Perl_statcache
@@ -632,21 +628,22 @@
 
 #define Sv			Perl_Sv
 #define Xpv			Perl_Xpv
+#define av_fetch_sv		Perl_av_fetch_sv
 #define bodytarget		Perl_bodytarget
 #define chopset			Perl_chopset
 #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 cxstack			Perl_cxstack
-#define cxstack_ix		Perl_cxstack_ix
-#define cxstack_max		Perl_cxstack_max
 #define defoutgv		Perl_defoutgv
 #define defstash		Perl_defstash
 #define delaymagic		Perl_delaymagic
 #define dirty			Perl_dirty
 #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 localizing		Perl_localizing
@@ -694,21 +691,22 @@
 
 #define Sv			(thr->TSv)
 #define Xpv			(thr->TXpv)
+#define av_fetch_sv		(thr->Tav_fetch_sv)
 #define bodytarget		(thr->Tbodytarget)
 #define chopset			(thr->Tchopset)
 #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 cxstack			(thr->Tcxstack)
-#define cxstack_ix		(thr->Tcxstack_ix)
-#define cxstack_max		(thr->Tcxstack_max)
 #define defoutgv		(thr->Tdefoutgv)
 #define defstash		(thr->Tdefstash)
 #define delaymagic		(thr->Tdelaymagic)
 #define dirty			(thr->Tdirty)
 #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 localizing		(thr->Tlocalizing)