=cut
*/
-#define EXTEND(p,n) (void)(PL_stack_max - p < (int)(n) && \
+#define EXTEND(p,n) (void)(UNLIKELY(PL_stack_max - p < (int)(n)) && \
(sp = stack_grow(sp,p, (int) (n))))
/* 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 {if (UNLIKELY(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 PUSHs(s) (*++sp = (s))
#define PUSHTARG STMT_START { SvSETMAGIC(TARG); PUSHs(TARG); } STMT_END
#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
/* 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) && \
(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) { \
+ else if (gimme == G_ARRAY) { \
int i; \
I32 len; \
assert(SvTYPE(tmpsv) == SVt_PVAV); \