X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=cc_runtime.h;h=90826dfb0e0b7c6528290eb9ead8f714918bdc11;hb=bf2695427bbbda7bb4063221b3964a6198ba6e03;hp=110b106d7dfcaedcbb0019a5397cea76f9d3ea00;hpb=0ca044874fec3bf87bea6955f6263e103e6744a8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/cc_runtime.h b/cc_runtime.h
index 110b106..90826df 100644
--- a/cc_runtime.h
+++ b/cc_runtime.h
@@ -1,4 +1,14 @@
+/*    cc_runtime.h
+ *
+ *    Copyright (C) 1999, 2000, 2001, 2004, 2006, 2008 by Larry Wall and others
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ */
+
 #define DOOP(ppname) PUTBACK; PL_op = ppname(aTHX); SPAGAIN
+#define CCPP(s)   OP * s(pTHX)
 
 #define PP_LIST(g) do {			\
 	dMARK;				\
@@ -13,7 +23,7 @@
 
 #define MAYBE_TAINT_SASSIGN_SRC(sv) \
     if (PL_tainting && PL_tainted && (!SvGMAGICAL(left) || !SvSMAGICAL(left) || \
-                                !((mg=mg_find(left, 't')) && mg->mg_len & 1)))\
+        !((mg=mg_find(left, PERL_MAGIC_taint)) && mg->mg_len & 1)))\
         TAINT_NOT
 
 #define PP_PREINC(sv) do {	\
@@ -44,8 +54,8 @@
 	switch (ret) {				\
 	case 0:					\
 	    PL_op = ppaddr(aTHX);		\
-	    PL_retstack[PL_retstack_ix - 1] = Nullop;	\
-	    if (PL_op != nxt) CALLRUNOPS();		\
+            cxstack[cxstack_ix].blk_eval.retop = Nullop; \
+	    if (PL_op != nxt) CALLRUNOPS(aTHX);	\
 	    JMPENV_POP;				\
 	    break;				\
 	case 1: JMPENV_POP; JMPENV_JUMP(1);	\
@@ -59,16 +69,17 @@
 	SPAGAIN;				\
     } while (0)
 
-
-#define PP_ENTERTRY(jmpbuf,label)  \
+#define PP_ENTERTRY(label)  		\
 	STMT_START {                    \
-		int ret;		\
-		JMPENV_PUSH_ENV(jmpbuf,ret);			\
-		switch (ret) {				\
-			case 1: JMPENV_POP_ENV(jmpbuf); JMPENV_JUMP(1);\
-			case 2: JMPENV_POP_ENV(jmpbuf); JMPENV_JUMP(2);\
-			case 3: JMPENV_POP_ENV(jmpbuf); SPAGAIN; goto label;\
-		}                                       \
+	    dJMPENV;			\
+	    int ret;			\
+	    JMPENV_PUSH(ret);		\
+	    switch (ret) {		\
+		case 1: JMPENV_POP; JMPENV_JUMP(1);\
+		case 2: JMPENV_POP; JMPENV_JUMP(2);\
+		case 3: JMPENV_POP; SPAGAIN; goto label;\
+	    }                                      \
 	} STMT_END
+
 #define PP_LEAVETRY \
 	STMT_START{ PL_top_env=PL_top_env->je_prev; }STMT_END