X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=scope.h;h=0dde4e12a0625c8d956ee2f9011917e57a4b9834;hb=4944e2f7e3104099141e13fc5a663be1edbc5ff4;hp=debe1f88a7fc903f22342cdf78070011a83897ec;hpb=22921e25517d6c195d0fab9eb946bfafb563c256;p=p5sagit%2Fp5-mst-13.2.git diff --git a/scope.h b/scope.h index debe1f8..0dde4e1 100644 --- a/scope.h +++ b/scope.h @@ -22,28 +22,44 @@ #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 SAVEt_HINTS 27 -#define SSCHECK(need) if (savestack_ix + need > savestack_max) savestack_grow() -#define SSPUSHINT(i) (savestack[savestack_ix++].any_i32 = (I32)(i)) -#define SSPUSHLONG(i) (savestack[savestack_ix++].any_long = (long)(i)) -#define SSPUSHIV(i) (savestack[savestack_ix++].any_iv = (IV)(i)) -#define SSPUSHPTR(p) (savestack[savestack_ix++].any_ptr = (void*)(p)) -#define SSPUSHDPTR(p) (savestack[savestack_ix++].any_dptr = (p)) -#define SSPOPINT (savestack[--savestack_ix].any_i32) -#define SSPOPLONG (savestack[--savestack_ix].any_long) -#define SSPOPIV (savestack[--savestack_ix].any_iv) -#define SSPOPPTR (savestack[--savestack_ix].any_ptr) -#define SSPOPDPTR (savestack[--savestack_ix].any_dptr) +#define SSCHECK(need) if (PL_savestack_ix + need > PL_savestack_max) savestack_grow() +#define SSPUSHINT(i) (PL_savestack[PL_savestack_ix++].any_i32 = (I32)(i)) +#define SSPUSHLONG(i) (PL_savestack[PL_savestack_ix++].any_long = (long)(i)) +#define SSPUSHIV(i) (PL_savestack[PL_savestack_ix++].any_iv = (IV)(i)) +#define SSPUSHPTR(p) (PL_savestack[PL_savestack_ix++].any_ptr = (void*)(p)) +#define SSPUSHDPTR(p) (PL_savestack[PL_savestack_ix++].any_dptr = (p)) +#define SSPOPINT (PL_savestack[--PL_savestack_ix].any_i32) +#define SSPOPLONG (PL_savestack[--PL_savestack_ix].any_long) +#define SSPOPIV (PL_savestack[--PL_savestack_ix].any_iv) +#define SSPOPPTR (PL_savestack[--PL_savestack_ix].any_ptr) +#define SSPOPDPTR (PL_savestack[--PL_savestack_ix].any_dptr) -#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 +#define SAVETMPS save_int((int*)&PL_tmps_floor), PL_tmps_floor = PL_tmps_ix +#define FREETMPS if (PL_tmps_ix > PL_tmps_floor) free_tmps() +#ifdef DEBUGGING +#define ENTER \ + STMT_START { \ + push_scope(); \ + DEBUG_l(WITH_THR(deb("ENTER scope %ld at %s:%d\n", \ + PL_scopestack_ix, __FILE__, __LINE__))); \ + } STMT_END +#define LEAVE \ + STMT_START { \ + DEBUG_l(WITH_THR(deb("LEAVE scope %ld at %s:%d\n", \ + PL_scopestack_ix, __FILE__, __LINE__))); \ + pop_scope(); \ + } STMT_END +#else #define ENTER push_scope() #define LEAVE pop_scope() -#define LEAVE_SCOPE(old) if (savestack_ix > old) leave_scope(old) +#endif +#define LEAVE_SCOPE(old) if (PL_savestack_ix > old) leave_scope(old) /* * Not using SOFT_CAST on SAVEFREESV and SAVEFREESV @@ -62,14 +78,37 @@ #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((DESTRUCTORFUNC)(FUNC_NAME_TO_PTR(f)), \ + SOFT_CAST(void*)(p)) +#else +#define CALLDESTRUCTOR *SSPOPDPTR #define SAVEDESTRUCTOR(f,p) \ - save_destructor(SOFT_CAST(void(*)_((void*)))(f),SOFT_CAST(void*)(p)) -#define SAVESTACK_POS() STMT_START { \ - SSCHECK(2); \ - SSPUSHINT(stack_sp - stack_base); \ - SSPUSHINT(SAVEt_STACK_POS); \ - } STMT_END + save_destructor(SOFT_CAST(void(*)_((void*)))(FUNC_NAME_TO_PTR(f)), \ + SOFT_CAST(void*)(p)) +#endif + +#define SAVESTACK_POS() \ + STMT_START { \ + SSCHECK(2); \ + SSPUSHINT(PL_stack_sp - PL_stack_base); \ + SSPUSHINT(SAVEt_STACK_POS); \ + } STMT_END +#define SAVEOP() save_op() + +#define SAVEHINTS() \ + STMT_START { \ + if (PL_hints & HINT_LOCALIZE_HH) \ + save_hints(); \ + else { \ + SSCHECK(2); \ + SSPUSHINT(PL_hints); \ + SSPUSHINT(SAVEt_HINTS); \ + } \ + } STMT_END /* 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,27 +134,38 @@ struct jmpenv { typedef struct jmpenv JMPENV; +#ifdef OP_IN_REGISTER +#define OP_REG_TO_MEM PL_opsave = op +#define OP_MEM_TO_REG op = PL_opsave +#else +#define OP_REG_TO_MEM NOOP +#define OP_MEM_TO_REG NOOP +#endif + #define dJMPENV JMPENV cur_env #define JMPENV_PUSH(v) \ STMT_START { \ - cur_env.je_prev = top_env; \ - cur_env.je_ret = Sigsetjmp(cur_env.je_buf, 1); \ - top_env = &cur_env; \ + cur_env.je_prev = PL_top_env; \ + OP_REG_TO_MEM; \ + cur_env.je_ret = PerlProc_setjmp(cur_env.je_buf, 1); \ + OP_MEM_TO_REG; \ + PL_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 + STMT_START { PL_top_env = cur_env.je_prev; } STMT_END #define JMPENV_JUMP(v) \ STMT_START { \ - if (top_env->je_prev) \ - Siglongjmp(top_env->je_buf, (v)); \ + OP_REG_TO_MEM; \ + if (PL_top_env->je_prev) \ + PerlProc_longjmp(PL_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) -#define CATCH_SET(v) (top_env->je_mustcatch = (v)) +#define CATCH_GET (PL_top_env->je_mustcatch) +#define CATCH_SET(v) (PL_top_env->je_mustcatch = (v))