Integrate win32 branch into mainline

[p5sagit/p5-mst-13.2.git] / scope.h

diff --git a/scope.h b/scope.h
index d9fe15a..0b9a483 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -22,7 +22,9 @@
 #define SAVEt_REGCONTEXT 21
 #define SAVEt_STACK_POS  22
 #define SAVEt_I16      23
-#define SAVEt_OP       24
+#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))
@@ -38,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)
 
 /*
@@ -109,7 +123,7 @@ typedef struct jmpenv JMPENV;
     STMT_START {                                       \
        cur_env.je_prev = top_env;                      \
        OP_REG_TO_MEM;                                  \
-       cur_env.je_ret = Sigsetjmp(cur_env.je_buf, 1);  \
+       cur_env.je_ret = PerlProc_setjmp(cur_env.je_buf, 1);    \
        OP_MEM_TO_REG;                                  \
        top_env = &cur_env;                             \
        cur_env.je_mustcatch = FALSE;                   \
@@ -121,11 +135,11 @@ typedef struct jmpenv JMPENV;
     STMT_START {                                               \
        OP_REG_TO_MEM;                                          \
        if (top_env->je_prev)                                   \
-           Siglongjmp(top_env->je_buf, (v));                   \
+           PerlProc_longjmp(top_env->je_buf, (v));                     \
        if ((v) == 2)                                           \
-           exit(STATUS_NATIVE_EXPORT);                         \
+           PerlProc_exit(STATUS_NATIVE_EXPORT);                                \
        PerlIO_printf(PerlIO_stderr(), "panic: top_env\n");     \
-       exit(1);                                                \
+       PerlProc_exit(1);                                               \
     } STMT_END
    
 #define CATCH_GET      (top_env->je_mustcatch)