X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=0d9f7cf0f7c4322e2ae3d7499ce312f2479b29b9;hb=f70166d5938e239dffca56d3a48789e2071447cf;hp=7c09f8f58bde16535018e3432851be216d42f3b7;hpb=8da795c62c26645b9d86cd8671cbb9c297445664;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/run.c b/run.c
index 7c09f8f..0d9f7cf 100644
--- a/run.c
+++ b/run.c
@@ -1,6 +1,6 @@
 /*    run.c
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1999, 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.
@@ -8,6 +8,7 @@
  */
 
 #include "EXTERN.h"
+#define PERL_IN_RUN_C
 #include "perl.h"
 
 /*
@@ -16,105 +17,115 @@
  * know.  Run now!  Hope is in speed!"  --Gandalf
  */
 
-dEXT char **watchaddr = 0;
-dEXT char *watchok;
-
-#ifndef DEBUGGING
+#ifdef PERL_OBJECT
+#define CALLOP this->*PL_op
+#else
+#define CALLOP *PL_op
+#endif
 
 int
-runops() {
-    SAVEI32(runlevel);
-    runlevel++;
+Perl_runops_standard(pTHX)
+{
+    dTHR;
 
-    while ( op = (*op->op_ppaddr)() ) ;
+    while ( PL_op = (CALLOP->op_ppaddr)(aTHX) ) ;
+
+    TAINT_NOT;
     return 0;
 }
 
-#else
-
-static void debprof _((OP*op));
-
 int
-runops() {
-    if (!op) {
-	warn("NULL OP IN RUN");
+Perl_runops_debug(pTHX)
+{
+#ifdef DEBUGGING
+    dTHR;
+    if (!PL_op) {
+	Perl_warn(aTHX_ "NULL OP IN RUN");
 	return 0;
     }
 
-    SAVEI32(runlevel);
-    runlevel++;
-
     do {
-	if (debug) {
-	    if (watchaddr != 0 && *watchaddr != watchok)
-		fprintf(stderr, "WARNING: %lx changed from %lx to %lx\n",
-		    (long)watchaddr, (long)watchok, (long)*watchaddr);
+	if (PL_debug) {
+	    if (PL_watchaddr != 0 && *PL_watchaddr != PL_watchok)
+		PerlIO_printf(Perl_debug_log, "WARNING: %lx changed from %lx to %lx\n",
+		    (long)PL_watchaddr, (long)PL_watchok, (long)*PL_watchaddr);
 	    DEBUG_s(debstack());
-	    DEBUG_t(debop(op));
-	    DEBUG_P(debprof(op));
+	    DEBUG_t(debop(PL_op));
+	    DEBUG_P(debprof(PL_op));
 	}
-    } while ( op = (*op->op_ppaddr)() );
+    } while ( PL_op = (CALLOP->op_ppaddr)(aTHX) );
+
+    TAINT_NOT;
     return 0;
+#else
+    return runops_standard();
+#endif	/* DEBUGGING */
 }
 
 I32
-debop(op)
-OP *op;
+Perl_debop(pTHX_ OP *o)
 {
+#ifdef DEBUGGING
     SV *sv;
-    deb("%s", op_name[op->op_type]);
-    switch (op->op_type) {
+    STRLEN n_a;
+    Perl_deb(aTHX_ "%s", PL_op_name[o->op_type]);
+    switch (o->op_type) {
     case OP_CONST:
-	fprintf(stderr, "(%s)", SvPEEK(cSVOP->op_sv));
+	PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo->op_sv));
 	break;
     case OP_GVSV:
     case OP_GV:
-	if (cGVOP->op_gv) {
+	if (cGVOPo->op_gv) {
 	    sv = NEWSV(0,0);
-	    gv_fullname(sv, cGVOP->op_gv);
-	    fprintf(stderr, "(%s)", SvPV(sv, na));
+	    gv_fullname3(sv, cGVOPo->op_gv, Nullch);
+	    PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, n_a));
 	    SvREFCNT_dec(sv);
 	}
 	else
-	    fprintf(stderr, "(NULL)");
+	    PerlIO_printf(Perl_debug_log, "(NULL)");
 	break;
     default:
 	break;
     }
-    fprintf(stderr, "\n");
+    PerlIO_printf(Perl_debug_log, "\n");
+#endif	/* DEBUGGING */
     return 0;
 }
 
 void
-watch(addr)
-char **addr;
+Perl_watch(pTHX_ char **addr)
 {
-    watchaddr = addr;
-    watchok = *addr;
-    fprintf(stderr, "WATCHING, %lx is currently %lx\n",
-	(long)watchaddr, (long)watchok);
+#ifdef DEBUGGING
+    dTHR;
+    PL_watchaddr = addr;
+    PL_watchok = *addr;
+    PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
+	(long)PL_watchaddr, (long)PL_watchok);
+#endif	/* DEBUGGING */
 }
 
-static void
-debprof(op)
-OP* op;
+STATIC void
+S_debprof(pTHX_ OP *o)
 {
-    if (!profiledata)
-	New(000, profiledata, MAXO, U32);
-    ++profiledata[op->op_type];
+#ifdef DEBUGGING
+    if (!PL_profiledata)
+	Newz(000, PL_profiledata, MAXO, U32);
+    ++PL_profiledata[o->op_type];
+#endif /* DEBUGGING */
 }
 
 void
-debprofdump()
+Perl_debprofdump(pTHX)
 {
-    U32 i;
-    if (!profiledata)
+#ifdef DEBUGGING
+    unsigned i;
+    if (!PL_profiledata)
 	return;
     for (i = 0; i < MAXO; i++) {
-	if (profiledata[i])
-	    fprintf(stderr, "%d\t%lu\n", i, profiledata[i]);
+	if (PL_profiledata[i])
+	    PerlIO_printf(Perl_debug_log,
+			  "%5lu %s\n", (unsigned long)PL_profiledata[i],
+                                       PL_op_name[i]);
     }
+#endif	/* DEBUGGING */
 }
-
-#endif
-