X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=scope.h;h=cc349f0f7c22957f73a2677ea1db343a5395ab0d;hb=249edfdff1b2b750e894ee5a0b6cb64d2640ca02;hp=d6eb270a909b65e25256c4b45352e178ee9f712b;hpb=acce7d4e04d89207299003c3e80c69d50bc82069;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/scope.h b/scope.h
index d6eb270..cc349f0 100644
--- a/scope.h
+++ b/scope.h
@@ -22,6 +22,9 @@
 #define SAVEt_REGCONTEXT 21
 #define SAVEt_STACK_POS  22
 #define SAVEt_I16	23
+#define SAVEt_AELEM     24
+#define SAVEt_HELEM     25
+#define SAVEt_OP	26
 
 #define SSCHECK(need) if (savestack_ix + need > savestack_max) savestack_grow()
 #define SSPUSHINT(i) (savestack[savestack_ix++].any_i32 = (I32)(i))
@@ -37,12 +40,24 @@
 
 #define SAVETMPS save_int((int*)&tmps_floor), tmps_floor = tmps_ix
 #define FREETMPS if (tmps_ix > tmps_floor) free_tmps()
-#ifdef DEPRECATED
-#define FREE_TMPS() FREETMPS
-#endif
 
+#ifdef DEBUGGING
+#define ENTER							\
+    STMT_START {						\
+	push_scope();						\
+	DEBUG_l(WITH_THR(deb("ENTER scope %ld at %s:%d\n",	\
+		    scopestack_ix, __FILE__, __LINE__)));	\
+    } STMT_END
+#define LEAVE							\
+    STMT_START {						\
+	DEBUG_l(WITH_THR(deb("LEAVE scope %ld at %s:%d\n",	\
+		    scopestack_ix, __FILE__, __LINE__)));	\
+	pop_scope();						\
+    } STMT_END
+#else
 #define ENTER push_scope()
 #define LEAVE pop_scope()
+#endif
 #define LEAVE_SCOPE(old) if (savestack_ix > old) leave_scope(old)
 
 /*
@@ -62,14 +77,23 @@
 #define SAVECLEARSV(sv)	save_clearsv(SOFT_CAST(SV**)&(sv))
 #define SAVEDELETE(h,k,l) \
 	  save_delete(SOFT_CAST(HV*)(h), SOFT_CAST(char*)(k), (I32)(l))
+#ifdef PERL_OBJECT
+#define CALLDESTRUCTOR this->*SSPOPDPTR
 #define SAVEDESTRUCTOR(f,p) \
-	  save_destructor(SOFT_CAST(void(*)_((void*)))(f),SOFT_CAST(void*)(p))
+	  save_destructor((DESTRUCTORFUNC)(FUNC_NAME_TO_PTR(f)),	\
+			  SOFT_CAST(void*)(p))
+#else
+#define CALLDESTRUCTOR *SSPOPDPTR
+#define SAVEDESTRUCTOR(f,p) \
+	  save_destructor(SOFT_CAST(void(*)_((void*)))(FUNC_NAME_TO_PTR(f)), \
+			  SOFT_CAST(void*)(p))
+#endif
 #define SAVESTACK_POS() STMT_START {	\
     SSCHECK(2);				\
     SSPUSHINT(stack_sp - stack_base);	\
     SSPUSHINT(SAVEt_STACK_POS);		\
  } STMT_END
-
+#define SAVEOP()	save_op()
 
 /* A jmpenv packages the state required to perform a proper non-local jump.
  * Note that there is a start_env initialized when perl starts, and top_env
@@ -95,17 +119,37 @@ struct jmpenv {
 
 typedef struct jmpenv JMPENV;
 
+#ifdef OP_IN_REGISTER
+#define OP_REG_TO_MEM	opsave = op
+#define OP_MEM_TO_REG	op = opsave
+#else
+#define OP_REG_TO_MEM	NOOP
+#define OP_MEM_TO_REG	NOOP
+#endif
+
 #define dJMPENV		JMPENV cur_env
-#define JMPENV_PUSH	(cur_env.je_prev = top_env,			\
-			 cur_env.je_ret = Sigsetjmp(cur_env.je_buf,1),	\
-			 top_env = &cur_env,				\
-			 cur_env.je_mustcatch = FALSE,			\
-			 cur_env.je_ret)
-#define JMPENV_POP	(top_env = cur_env.je_prev)
-#define JMPENV_JUMP(v)	(top_env->je_prev ? Siglongjmp(top_env->je_buf, (v))	\
-			 : ((v) == 2) ? exit(STATUS_NATIVE_EXPORT)		\
-			 : (PerlIO_printf(PerlIO_stderr(), "panic: top_env\n"),	\
-			     exit(1)))
+#define JMPENV_PUSH(v) \
+    STMT_START {					\
+	cur_env.je_prev = top_env;			\
+	OP_REG_TO_MEM;					\
+	cur_env.je_ret = PerlProc_setjmp(cur_env.je_buf, 1);	\
+	OP_MEM_TO_REG;					\
+	top_env = &cur_env;				\
+	cur_env.je_mustcatch = FALSE;			\
+	(v) = cur_env.je_ret;				\
+    } STMT_END
+#define JMPENV_POP \
+    STMT_START { top_env = cur_env.je_prev; } STMT_END
+#define JMPENV_JUMP(v) \
+    STMT_START {						\
+	OP_REG_TO_MEM;						\
+	if (top_env->je_prev)					\
+	    PerlProc_longjmp(top_env->je_buf, (v));			\
+	if ((v) == 2)						\
+	    PerlProc_exit(STATUS_NATIVE_EXPORT);				\
+	PerlIO_printf(PerlIO_stderr(), "panic: top_env\n");	\
+	PerlProc_exit(1);						\
+    } STMT_END
    
 #define CATCH_GET	(top_env->je_mustcatch)
 #define CATCH_SET(v)	(top_env->je_mustcatch = (v))