From: Reini Urban <rurban@x-ray.at>
Date: Sun, 3 Jan 2010 12:09:02 +0000 (+0000)
Subject: CC compiler updates for >=5.10
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=39987fc8b0e8ebad4623529024d583219a7b856c;p=p5sagit%2Fp5-mst-13.2.git

CC compiler updates for >=5.10

    PP_EVAL: nullify the string loop, analog to the old retstack.
             pp_leaveeval sets: retop = cx->blk_eval.retop
    PP_ENTERTRY: See PERL_FLEXIBLE_EXCEPTIONS in cop.h
---

diff --git a/cc_runtime.h b/cc_runtime.h
index b384fd2..90826df 100644
--- a/cc_runtime.h
+++ b/cc_runtime.h
@@ -54,6 +54,7 @@
 	switch (ret) {				\
 	case 0:					\
 	    PL_op = ppaddr(aTHX);		\
+            cxstack[cxstack_ix].blk_eval.retop = Nullop; \
 	    if (PL_op != nxt) CALLRUNOPS(aTHX);	\
 	    JMPENV_POP;				\
 	    break;				\
@@ -68,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