This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
[win32] fix extra LEAVE when require fails
[perl5.git] / scope.h
diff --git a/scope.h b/scope.h
index d6eb270..44bc435 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -22,6 +22,7 @@
 #define SAVEt_REGCONTEXT 21
 #define SAVEt_STACK_POS  22
 #define SAVEt_I16      23
 #define SAVEt_REGCONTEXT 21
 #define SAVEt_STACK_POS  22
 #define SAVEt_I16      23
+#define SAVEt_OP       24
 
 #define SSCHECK(need) if (savestack_ix + need > savestack_max) savestack_grow()
 #define SSPUSHINT(i) (savestack[savestack_ix++].any_i32 = (I32)(i))
 
 #define SSCHECK(need) if (savestack_ix + need > savestack_max) savestack_grow()
 #define SSPUSHINT(i) (savestack[savestack_ix++].any_i32 = (I32)(i))
 
 #define SAVETMPS save_int((int*)&tmps_floor), tmps_floor = tmps_ix
 #define FREETMPS if (tmps_ix > tmps_floor) free_tmps()
 
 #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(deb("ENTER scope %ld at %s:%d\n",               \
+                   scopestack_ix, __FILE__, __LINE__));        \
+    } STMT_END
+#define LEAVE                                                  \
+    STMT_START {                                               \
+       DEBUG_l(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()
 #define ENTER push_scope()
 #define LEAVE pop_scope()
+#endif
 #define LEAVE_SCOPE(old) if (savestack_ix > old) leave_scope(old)
 
 /*
 #define LEAVE_SCOPE(old) if (savestack_ix > old) leave_scope(old)
 
 /*
@@ -69,7 +82,7 @@
     SSPUSHINT(stack_sp - stack_base);  \
     SSPUSHINT(SAVEt_STACK_POS);                \
  } STMT_END
     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
 
 /* 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 +108,37 @@ struct jmpenv {
 
 typedef struct jmpenv 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 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))
    
 #define CATCH_GET      (top_env->je_mustcatch)
 #define CATCH_SET(v)   (top_env->je_mustcatch = (v))