X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.h;h=ab4140c41503988e7f18d49f8895a6a21452890a;hb=49d8d3a1123fb996c090905424ed66f675b3df17;hp=7dc918c40d89f063725d37d900e8bac32059b8ef;hpb=e9905555f91f68a030263c4a82187c30e04a3aed;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp.h b/pp.h
index 7dc918c..ab4140c 100644
--- a/pp.h
+++ b/pp.h
@@ -1,16 +1,24 @@
 /*    pp.h
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
  */
 
+#ifdef USE_THREADS
+#define ARGS thr
+#define dARGS struct perl_thread *thr;
+#else
 #define ARGS
-#define ARGSproto void
 #define dARGS
+#endif /* USE_THREADS */
+#ifdef CAN_PROTOTYPE
+#define PP(s) OP * s(ARGSproto)
+#else /* CAN_PROTOTYPE */
 #define PP(s) OP* s(ARGS) dARGS
+#endif /* CAN_PROTOTYPE */
 
 #define SP sp
 #define MARK mark
@@ -23,7 +31,8 @@
 #define TOPMARK		(*markstack_ptr)
 #define POPMARK		(*markstack_ptr--)
 
-#define dSP		register SV **sp = stack_sp
+#define djSP		register SV **sp = stack_sp
+#define dSP		dTHR; djSP
 #define dMARK		register SV **mark = stack_base + POPMARK
 #define dORIGMARK	I32 origmark = mark - stack_base
 #define SETORIGMARK	origmark = mark - stack_base
@@ -55,24 +64,26 @@
 #define POPp		(SvPVx(POPs, na))
 #define POPn		(SvNVx(POPs))
 #define POPi		((IV)SvIVx(POPs))
+#define POPu		((UV)SvUVx(POPs))
 #define POPl		((long)SvIVx(POPs))
 
 #define TOPs		(*sp)
 #define TOPp		(SvPV(TOPs, na))
 #define TOPn		(SvNV(TOPs))
 #define TOPi		((IV)SvIV(TOPs))
+#define TOPu		((UV)SvUV(TOPs))
 #define TOPl		((long)SvIV(TOPs))
 
 /* Go to some pains in the rare event that we must extend the stack. */
-#define EXTEND(p,n)	STMT_START { if (stack_max - p < (n)) {		  	    \
-			    sp = stack_grow(sp,p, (int) (n));		    \
+#define EXTEND(p,n)	STMT_START { if (stack_max - p < (n)) {		\
+			    sp = stack_grow(sp,p, (int) (n));		\
 			} } STMT_END
 
 /* Same thing, but update mark register too. */
-#define MEXTEND(p,n)	STMT_START {if (stack_max - p < (n)) {			    \
-			    int markoff = mark - stack_base;		    \
-			    sp = stack_grow(sp,p,(int) (n));		    \
-			    mark = stack_base + markoff;		    \
+#define MEXTEND(p,n)	STMT_START {if (stack_max - p < (n)) {		\
+			    int markoff = mark - stack_base;		\
+			    sp = stack_grow(sp,p,(int) (n));		\
+			    mark = stack_base + markoff;		\
 			} } STMT_END
 
 #define PUSHs(s)	(*++sp = (s))
@@ -80,18 +91,21 @@
 #define PUSHp(p,l)	STMT_START { sv_setpvn(TARG, (p), (l)); PUSHTARG; } STMT_END
 #define PUSHn(n)	STMT_START { sv_setnv(TARG, (double)(n)); PUSHTARG; } STMT_END
 #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)	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, (double)(n)); XPUSHTARG; } STMT_END
 #define XPUSHi(i)	STMT_START { sv_setiv(TARG, (IV)(i)); XPUSHTARG; } STMT_END
+#define XPUSHu(u)	STMT_START { sv_setuv(TARG, (UV)(u)); XPUSHTARG; } STMT_END
 
 #define SETs(s)		(*sp = s)
 #define SETTARG		STMT_START { SvSETMAGIC(TARG); SETs(TARG); } STMT_END
 #define SETp(p,l)	STMT_START { sv_setpvn(TARG, (p), (l)); SETTARG; } STMT_END
 #define SETn(n)		STMT_START { sv_setnv(TARG, (double)(n)); SETTARG; } STMT_END
 #define SETi(i)		STMT_START { sv_setiv(TARG, (IV)(i)); SETTARG; } STMT_END
+#define SETu(u)		STMT_START { sv_setuv(TARG, (UV)(u)); SETTARG; } STMT_END
 
 #define dTOPss		SV *sv = TOPs
 #define dPOPss		SV *sv = POPs
@@ -99,14 +113,35 @@
 #define dPOPnv		double value = POPn
 #define dTOPiv		IV value = TOPi
 #define dPOPiv		IV value = POPi
-
-#define dPOPPOPssrl	SV *right = POPs; SV *left = POPs
-#define dPOPPOPnnrl	double right = POPn; double left = POPn
-#define dPOPPOPiirl	IV right = POPi; IV left = POPi
-
-#define dPOPTOPssrl	SV *right = POPs; SV *left = TOPs
-#define dPOPTOPnnrl	double right = POPn; double left = TOPn
-#define dPOPTOPiirl	IV right = POPi; IV left = TOPi
+#define dTOPuv		UV value = TOPu
+#define dPOPuv		UV value = POPu
+
+#define dPOPXssrl(X)	SV *right = POPs; SV *left = CAT2(X,s)
+#define dPOPXnnrl(X)	double right = POPn; double left = CAT2(X,n)
+#define dPOPXiirl(X)	IV right = POPi; IV left = CAT2(X,i)
+
+#define USE_LEFT(sv) \
+	(SvOK(sv) || SvGMAGICAL(sv) || !(op->op_flags & OPf_STACKED))
+#define dPOPXnnrl_ul(X)	\
+    double right = POPn;				\
+    SV *leftsv = CAT2(X,s);				\
+    double left = USE_LEFT(leftsv) ? SvNV(leftsv) : 0.0
+#define dPOPXiirl_ul(X) \
+    IV right = POPi;					\
+    SV *leftsv = CAT2(X,s);				\
+    IV left = USE_LEFT(leftsv) ? SvIV(leftsv) : 0
+
+#define dPOPPOPssrl	dPOPXssrl(POP)
+#define dPOPPOPnnrl	dPOPXnnrl(POP)
+#define dPOPPOPnnrl_ul	dPOPXnnrl_ul(POP)
+#define dPOPPOPiirl	dPOPXiirl(POP)
+#define dPOPPOPiirl_ul	dPOPXiirl_ul(POP)
+
+#define dPOPTOPssrl	dPOPXssrl(TOP)
+#define dPOPTOPnnrl	dPOPXnnrl(TOP)
+#define dPOPTOPnnrl_ul	dPOPXnnrl_ul(TOP)
+#define dPOPTOPiirl	dPOPXiirl(TOP)
+#define dPOPTOPiirl_ul	dPOPXiirl_ul(TOP)
 
 #define RETPUSHYES	RETURNX(PUSHs(&sv_yes))
 #define RETPUSHNO	RETURNX(PUSHs(&sv_no))
@@ -119,12 +154,18 @@
 #define ARGTARG		op->op_targ
 #define MAXARG		op->op_private
 
-#define SWITCHSTACK(f,t)	AvFILL(f) = sp - stack_base;		\
+#define SWITCHSTACK(f,t)	AvFILLp(f) = sp - stack_base;		\
 				stack_base = AvARRAY(t);		\
 				stack_max = stack_base + AvMAX(t);	\
-				sp = stack_sp = stack_base + AvFILL(t);	\
+				sp = stack_sp = stack_base + AvFILLp(t);	\
 				curstack = t;
 
+#define EXTEND_MORTAL(n) \
+	STMT_START { \
+	    if (tmps_ix + (n) >= tmps_max) \
+		Renew(tmps_stack, tmps_max = tmps_ix + (n) + 1, SV*); \
+	} STMT_END
+
 #ifdef OVERLOAD
 
 #define AMGf_noright	1