X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=cc_runtime.h;h=dbc7475774941d25c463631851b8521ad9279e03;hb=d0519643027383a891fd684df8a90fa5b75bf419;hp=fe830c0bde130a3d039d6260a89dd3a4a67e8204;hpb=a8a597b252f6dd39ef24cf476a20f8618821e02f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/cc_runtime.h b/cc_runtime.h
index fe830c0..dbc7475 100644
--- a/cc_runtime.h
+++ b/cc_runtime.h
@@ -1,4 +1,5 @@
-#define DOOP(ppname) PUTBACK; op = ppname(ARGS); SPAGAIN
+#define DOOP(ppname) PUTBACK; PL_op = ppname(aTHX); SPAGAIN
+#define CCPP(s)   OP * s(pTHX)
 
 #define PP_LIST(g) do {			\
 	dMARK;				\
@@ -6,13 +7,13 @@
 	    if (++MARK <= SP)		\
 		*MARK = *SP;		\
 	    else			\
-		*MARK = &sv_undef;	\
+		*MARK = &PL_sv_undef;	\
 	    SP = MARK;			\
 	}				\
    } while (0)
 
 #define MAYBE_TAINT_SASSIGN_SRC(sv) \
-    if (tainting && tainted && (!SvGMAGICAL(left) || !SvSMAGICAL(left) || \
+    if (PL_tainting && PL_tainted && (!SvGMAGICAL(left) || !SvSMAGICAL(left) || \
                                 !((mg=mg_find(left, 't')) && mg->mg_len & 1)))\
         TAINT_NOT
 
@@ -28,9 +29,9 @@
 
 #define PP_UNSTACK do {		\
 	TAINT_NOT;		\
-	stack_sp = stack_base + cxstack[cxstack_ix].blk_oldsp;	\
+	PL_stack_sp = PL_stack_base + cxstack[cxstack_ix].blk_oldsp;	\
 	FREETMPS;		\
-	oldsave = scopestack[scopestack_ix - 1]; \
+	oldsave = PL_scopestack[PL_scopestack_ix - 1]; \
 	LEAVE_SCOPE(oldsave);	\
 	SPAGAIN;		\
     } while(0)
@@ -43,29 +44,32 @@
 	JMPENV_PUSH(ret);			\
 	switch (ret) {				\
 	case 0:					\
-	    op = ppaddr(ARGS);			\
-	    retstack[retstack_ix - 1] = Nullop;	\
-	    if (op != nxt) runops();		\
+	    PL_op = ppaddr(aTHX);		\
+	    PL_retstack[PL_retstack_ix - 1] = Nullop;	\
+	    if (PL_op != nxt) CALLRUNOPS();		\
 	    JMPENV_POP;				\
 	    break;				\
 	case 1: JMPENV_POP; JMPENV_JUMP(1);	\
 	case 2: JMPENV_POP; JMPENV_JUMP(2);	\
 	case 3:					\
 	    JMPENV_POP;				\
-	    if (restartop != nxt)		\
+	    if (PL_restartop && PL_restartop != nxt)		\
 		JMPENV_JUMP(3);			\
 	}					\
-	op = nxt;				\
+	PL_op = nxt;				\
 	SPAGAIN;				\
     } while (0)
 
-#define PP_ENTERTRY(jmpbuf,label) do {		\
-	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;\
-	}					\
-    } while (0)
+
+#define PP_ENTERTRY(jmpbuf,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;\
+		}                                       \
+	} STMT_END
+#define PP_LEAVETRY \
+	STMT_START{ PL_top_env=PL_top_env->je_prev; }STMT_END