X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=7922bfd1a136c1371e3258f49d2b73d8da3466e9;hb=e17cb2a9c513ce1acd034452f9a933fcfa6c0129;hp=5d2255a4aa94de9357ff2e340d1f6fcd0725531b;hpb=4633a7c4bad06b471d9310620b7fe8ddd158cccd;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/run.c b/run.c
index 5d2255a..7922bfd 100644
--- a/run.c
+++ b/run.c
@@ -1,6 +1,6 @@
 /*    run.c
  *
- *    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.
@@ -16,105 +16,103 @@
  * know.  Run now!  Hope is in speed!"  --Gandalf
  */
 
-dEXT char **watchaddr = 0;
-dEXT char *watchok;
-
-#ifndef DEBUGGING
 
 int
-run() {
-    SAVEI32(runlevel);
-    runlevel++;
+runops_standard(void) {
+    dTHR;
 
-    while ( op = (*op->op_ppaddr)() ) ;
+    while ( op = (*op->op_ppaddr)(ARGS) ) ;
+
+    TAINT_NOT;
     return 0;
 }
 
-#else
+#ifdef DEBUGGING
 
-static void debprof _((OP*op));
+dEXT char **watchaddr = 0;
+dEXT char *watchok;
+
+static void debprof _((OP*o));
 
 int
-run() {
+runops_debug(void) {
+    dTHR;
     if (!op) {
 	warn("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",
+		PerlIO_printf(Perl_debug_log, "WARNING: %lx changed from %lx to %lx\n",
 		    (long)watchaddr, (long)watchok, (long)*watchaddr);
 	    DEBUG_s(debstack());
 	    DEBUG_t(debop(op));
 	    DEBUG_P(debprof(op));
 	}
-    } while ( op = (*op->op_ppaddr)() );
+    } while ( op = (*op->op_ppaddr)(ARGS) );
+
+    TAINT_NOT;
     return 0;
 }
 
 I32
-debop(op)
-OP *op;
+debop(OP *o)
 {
     SV *sv;
-    deb("%s", op_name[op->op_type]);
-    switch (op->op_type) {
+    deb("%s", 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, na));
 	    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");
     return 0;
 }
 
 void
-watch(addr)
-char **addr;
+watch(char **addr)
 {
     watchaddr = addr;
     watchok = *addr;
-    fprintf(stderr, "WATCHING, %lx is currently %lx\n",
+    PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
 	(long)watchaddr, (long)watchok);
 }
 
 static void
-debprof(op)
-OP* op;
+debprof(OP *o)
 {
     if (!profiledata)
 	New(000, profiledata, MAXO, U32);
-    ++profiledata[op->op_type];
+    ++profiledata[o->op_type];
 }
 
 void
-debprofdump()
+debprofdump(void)
 {
-    U32 i;
+    unsigned i;
     if (!profiledata)
 	return;
     for (i = 0; i < MAXO; i++) {
 	if (profiledata[i])
-	    fprintf(stderr, "%d\t%lu\n", i, profiledata[i]);
+	    PerlIO_printf(Perl_debug_log,
+			  "%u\t%lu\n", i, (unsigned long)profiledata[i]);
     }
 }
 
-#endif
+#endif /* DEBUGGING */