X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=cc_runtime.h;h=90826dfb0e0b7c6528290eb9ead8f714918bdc11;hb=20d572319ce8b690b7b68fec6b58f8ac07b1d362;hp=b1fc5b52b752572b96bb97b05606cd782897d2bb;hpb=d6376244c2261025775e8b11a6a64d7c9e0d1612;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/cc_runtime.h b/cc_runtime.h
index b1fc5b5..90826df 100644
--- a/cc_runtime.h
+++ b/cc_runtime.h
@@ -1,6 +1,6 @@
 /*    cc_runtime.h
  *
- *    Copyright (c) 1998-2002, Larry Wall
+ *    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.
@@ -54,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);	\
@@ -69,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