X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/72d33970ea94fe3382327160378d9bc042cb1d73..cc116ce7f30f9861a5b501456e5dfaf8e57de587:/pp.h diff --git a/pp.h b/pp.h index f683510..828b7a2 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) @@ -271,23 +272,31 @@ Does not use C. See also C, C and C. */ #ifdef STRESS_REALLOC -# define EXTEND(p,n) (void)(sp = stack_grow(sp,p, (SSize_t)(n))) +# 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 { \ - const int markoff = mark - PL_stack_base; \ - sp = stack_grow(sp,p,(SSize_t) (n)); \ - mark = PL_stack_base + markoff; \ - } STMT_END +# define MEXTEND(p,n) STMT_START { \ + const SSize_t 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) (void)(UNLIKELY(PL_stack_max - p < (SSize_t)(n)) && \ - (sp = stack_grow(sp,p, (SSize_t) (n)))) - +# define EXTEND(p,n) STMT_START { \ + if (UNLIKELY(PL_stack_max - p < (SSize_t)(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; \ - } } STMT_END +# define MEXTEND(p,n) STMT_START { \ + if (UNLIKELY(PL_stack_max - p < (SSize_t)(n))) { \ + const SSize_t 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)) @@ -297,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 @@ -367,11 +376,11 @@ Does not use C. See also C, C and C. #define RETSETYES RETURNX(SETs(&PL_sv_yes)) #define RETSETNO RETURNX(SETs(&PL_sv_no)) #define RETSETUNDEF RETURNX(SETs(&PL_sv_undef)) +#define RETSETTARG STMT_START { SETTARG; RETURN; } STMT_END #define ARGTARG PL_op->op_targ - /* See OPpTARGET_MY: */ -#define MAXARG (PL_op->op_private & 15) +#define MAXARG (PL_op->op_private & OPpARG4_MASK) #define SWITCHSTACK(f,t) \ STMT_START { \ @@ -383,9 +392,10 @@ Does not use C. See also C, C and C. } STMT_END #define EXTEND_MORTAL(n) \ - STMT_START { \ - if (UNLIKELY(PL_tmps_ix + (n) >= PL_tmps_max)) \ - tmps_grow(n); \ + STMT_START { \ + SSize_t eMiX = PL_tmps_ix + (n); \ + if (UNLIKELY(eMiX >= PL_tmps_max)) \ + (void)Perl_tmps_grow_p(aTHX_ eMiX); \ } STMT_END #define AMGf_noright 1 @@ -395,17 +405,18 @@ Does not use C. See also C, C and C. #define AMGf_numeric 0x10 /* for Perl_try_amagic_bin */ #define AMGf_set 0x20 /* for Perl_try_amagic_bin */ #define AMGf_want_list 0x40 +#define AMGf_numarg 0x80 /* 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 @@ -422,19 +433,20 @@ Does not use C. See also C, C and C. SV *tmpsv; \ SV *arg= *sp; \ int gimme = GIMME_V; \ - if (SvAMAGIC(arg) && \ + if (UNLIKELY(SvAMAGIC(arg) && \ (tmpsv = amagic_call(arg, &PL_sv_undef, meth, \ AMGf_want_list | AMGf_noright \ - |AMGf_unary))) { \ + |AMGf_unary)))) \ + { \ SPAGAIN; \ if (gimme == G_VOID) { \ - (void)POPs; /* XXX ??? */ \ + NOOP; \ } \ 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) \ @@ -470,15 +482,6 @@ Does not use C. See also C, C and C. #define opASSIGN (PL_op->op_flags & OPf_STACKED) -#define SETsv(sv) STMT_START { \ - if (opASSIGN || (SvFLAGS(TARG) & SVs_PADMY)) \ - { sv_setsv(TARG, (sv)); SETTARG; } \ - else SETs(sv); } STMT_END - -#define SETsvUN(sv) STMT_START { \ - if (SvFLAGS(TARG) & SVs_PADMY) \ - { sv_setsv(TARG, (sv)); SETTARG; } \ - else SETs(sv); } STMT_END /* =for apidoc mU||LVRET @@ -525,11 +528,5 @@ True if this op will be the return value of an lvalue subroutine #endif /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */