X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/5aaab254c02795622bdf42e348ad8473aa1fc643..1eaa9028796b8bad514effe7ea2a37264d5195b7:/pp.h diff --git a/pp.h b/pp.h index 4d5eeec..a7e936c 100644 --- a/pp.h +++ b/pp.h @@ -30,7 +30,7 @@ the C macro. See C. =for apidoc ms||djSP -Declare Just C. This is actually identical to C, and declares +Declare Just C. This is actually identical to C, and declares a local copy of perl's stack pointer, available via the C macro. See C. (Available for backward source code compatibility with the old (Perl 5.005) thread model.) @@ -57,9 +57,10 @@ Refetch the stack pointer. Used after a callback. See L. #define PUSHMARK(p) \ STMT_START { \ - if (++PL_markstack_ptr == PL_markstack_max) \ - markstack_grow(); \ - *PL_markstack_ptr = (I32)((p) - PL_stack_base);\ + I32 * mark_stack_entry; \ + if (UNLIKELY((mark_stack_entry = ++PL_markstack_ptr) == PL_markstack_max)) \ + mark_stack_entry = markstack_grow(); \ + *mark_stack_entry = (I32)((p) - PL_stack_base); \ } STMT_END #define TOPMARK (*PL_markstack_ptr) @@ -133,10 +134,6 @@ Pops a long off the stack. #define POPu ((UV)SvUVx(POPs)) #define POPl ((long)SvIVx(POPs)) #define POPul ((unsigned long)SvIVx(POPs)) -#ifdef HAS_QUAD -#define POPq ((Quad_t)SvIVx(POPs)) -#define POPuq ((Uquad_t)SvUVx(POPs)) -#endif #define TOPs (*sp) #define TOPm1s (*(sp-1)) @@ -148,16 +145,12 @@ Pops a long off the stack. #define TOPu ((UV)SvUV(TOPs)) #define TOPl ((long)SvIV(TOPs)) #define TOPul ((unsigned long)SvUV(TOPs)) -#ifdef HAS_QUAD -#define TOPq ((Quad_t)SvIV(TOPs)) -#define TOPuq ((Uquad_t)SvUV(TOPs)) -#endif /* Go to some pains in the rare event that we must extend the stack. */ /* -=for apidoc Am|void|EXTEND|SP|int nitems -Used to extend the argument stack for an XSUB's return values. Once +=for apidoc Am|void|EXTEND|SP|SSize_t nitems +Used to extend the argument stack for an XSUB's return values. Once used, guarantees that there is room for at least C to be pushed onto the stack. @@ -278,15 +271,33 @@ Does not use C. See also C, C and C. =cut */ -#define EXTEND(p,n) (void)(PL_stack_max - p < (int)(n) && \ - (sp = stack_grow(sp,p, (int) (n)))) - +#ifdef STRESS_REALLOC +# define EXTEND(p,n) STMT_START { \ + sp = stack_grow(sp,p,(SSize_t) (n)); \ + PERL_UNUSED_VAR(sp); \ + } STMT_END /* Same thing, but update mark register too. */ -#define MEXTEND(p,n) STMT_START {if (PL_stack_max - p < (int)(n)) { \ - const int markoff = mark - PL_stack_base; \ - sp = stack_grow(sp,p,(int) (n)); \ - mark = PL_stack_base + markoff; \ - } } STMT_END +# define MEXTEND(p,n) STMT_START { \ + const int markoff = mark - PL_stack_base; \ + sp = stack_grow(sp,p,(SSize_t) (n)); \ + mark = PL_stack_base + markoff; \ + PERL_UNUSED_VAR(sp); \ + } STMT_END +#else +# define EXTEND(p,n) STMT_START { \ + if (UNLIKELY(PL_stack_max - p < (int)(n))) { \ + sp = stack_grow(sp,p,(SSize_t) (n)); \ + PERL_UNUSED_VAR(sp); \ + } } STMT_END +/* Same thing, but update mark register too. */ +# define MEXTEND(p,n) STMT_START { \ + if (UNLIKELY(PL_stack_max - p < (int)(n))) { \ + const int markoff = mark - PL_stack_base; \ + sp = stack_grow(sp,p,(SSize_t) (n)); \ + mark = PL_stack_base + markoff; \ + PERL_UNUSED_VAR(sp); \ + } } STMT_END +#endif #define PUSHs(s) (*++sp = (s)) #define PUSHTARG STMT_START { SvSETMAGIC(TARG); PUSHs(TARG); } STMT_END @@ -295,7 +306,7 @@ Does not use C. See also C, C and C. #define PUSHi(i) STMT_START { sv_setiv(TARG, (IV)(i)); PUSHTARG; } STMT_END #define PUSHu(u) STMT_START { sv_setuv(TARG, (UV)(u)); PUSHTARG; } STMT_END -#define XPUSHs(s) (EXTEND(sp,1), *++sp = (s)) +#define XPUSHs(s) STMT_START { EXTEND(sp,1); *++sp = (s); } STMT_END #define XPUSHTARG STMT_START { SvSETMAGIC(TARG); XPUSHs(TARG); } STMT_END #define XPUSHp(p,l) STMT_START { sv_setpvn(TARG, (p), (l)); XPUSHTARG; } STMT_END #define XPUSHn(n) STMT_START { sv_setnv(TARG, (NV)(n)); XPUSHTARG; } STMT_END @@ -333,12 +344,6 @@ Does not use C. See also C, C and C. #define dPOPiv IV value = POPi #define dTOPuv UV value = TOPu #define dPOPuv UV value = POPu -#ifdef HAS_QUAD -#define dTOPqv Quad_t value = TOPu -#define dPOPqv Quad_t value = POPu -#define dTOPuqv Uquad_t value = TOPuq -#define dPOPuqv Uquad_t value = POPuq -#endif #define dPOPXssrl(X) SV *right = POPs; SV *left = CAT2(X,s) #define dPOPXnnrl(X) NV right = POPn; NV left = CAT2(X,n) @@ -388,7 +393,7 @@ Does not use C. See also C, C and C. #define EXTEND_MORTAL(n) \ STMT_START { \ - if (PL_tmps_ix + (n) >= PL_tmps_max) \ + if (UNLIKELY(PL_tmps_ix + (n) >= PL_tmps_max)) \ tmps_grow(n); \ } STMT_END @@ -404,12 +409,12 @@ Does not use C. See also C, C and C. /* do SvGETMAGIC on the stack args before checking for overload */ #define tryAMAGICun_MG(method, flags) STMT_START { \ - if ( (SvFLAGS(TOPs) & (SVf_ROK|SVs_GMG)) \ + if ( UNLIKELY((SvFLAGS(TOPs) & (SVf_ROK|SVs_GMG))) \ && Perl_try_amagic_un(aTHX_ method, flags)) \ return NORMAL; \ } STMT_END #define tryAMAGICbin_MG(method, flags) STMT_START { \ - if ( ((SvFLAGS(TOPm1s)|SvFLAGS(TOPs)) & (SVf_ROK|SVs_GMG)) \ + if ( UNLIKELY(((SvFLAGS(TOPm1s)|SvFLAGS(TOPs)) & (SVf_ROK|SVs_GMG))) \ && Perl_try_amagic_bin(aTHX_ method, flags)) \ return NORMAL; \ } STMT_END @@ -420,29 +425,26 @@ Does not use C. See also C, C and C. /* No longer used in core. Use AMG_CALLunary instead */ #define AMG_CALLun(sv,meth) AMG_CALLunary(sv, CAT2(meth,_amg)) -#define tryAMAGICunTARGET(meth, shift, jump) \ - tryAMAGICunTARGET_flags(meth, shift, jump, 0) -#define tryAMAGICunTARGETlist(meth, shift, jump) \ - tryAMAGICunTARGET_flags(meth, shift, jump, AMGf_want_list) -#define tryAMAGICunTARGET_flags(meth, shift, jump, flags) \ +#define tryAMAGICunTARGETlist(meth, jump) \ STMT_START { \ dSP; \ SV *tmpsv; \ - SV *arg= sp[shift]; \ + SV *arg= *sp; \ int gimme = GIMME_V; \ - if (SvAMAGIC(arg) && \ + if (UNLIKELY(SvAMAGIC(arg) && \ (tmpsv = amagic_call(arg, &PL_sv_undef, meth, \ - flags | AMGf_noright | AMGf_unary))) { \ + AMGf_want_list | AMGf_noright \ + |AMGf_unary)))) \ + { \ SPAGAIN; \ - sp += shift; \ if (gimme == G_VOID) { \ (void)POPs; /* XXX ??? */ \ } \ - else if ((flags & AMGf_want_list) && gimme == G_ARRAY) { \ - int i; \ - I32 len; \ + else if (gimme == G_ARRAY) { \ + SSize_t i; \ + SSize_t len; \ assert(SvTYPE(tmpsv) == SVt_PVAV); \ - len = av_len((AV *)tmpsv) + 1; \ + len = av_tindex((AV *)tmpsv) + 1; \ (void)POPs; /* get rid of the arg */ \ EXTEND(sp, len); \ for (i = 0; i < len; ++i) \