X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=7922bfd1a136c1371e3258f49d2b73d8da3466e9;hb=ce3f0a3cd6f30cb49f01b7811c2891acb7bab15a;hp=76fd63c5f8898a580111360a0b00da9a6fd4bed5;hpb=463ee0b2acbd047c27e8b5393cdd8398881824c5;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/run.c b/run.c
index 76fd63c..7922bfd 100644
--- a/run.c
+++ b/run.c
@@ -1,74 +1,118 @@
+/*    run.c
+ *
+ *    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.
+ *
+ */
+
 #include "EXTERN.h"
 #include "perl.h"
 
-char **watchaddr = 0;
-char *watchok;
+/*
+ * "Away now, Shadowfax!  Run, greatheart, run as you have never run before!
+ * Now we are come to the lands where you were foaled, and every stone you
+ * know.  Run now!  Hope is in speed!"  --Gandalf
+ */
+
 
-#ifndef DEBUGGING
+int
+runops_standard(void) {
+    dTHR;
 
-run() {
-    while ( op = (*op->op_ppaddr)() ) ;
+    while ( op = (*op->op_ppaddr)(ARGS) ) ;
+
+    TAINT_NOT;
+    return 0;
 }
 
-#else
+#ifdef DEBUGGING
 
-run() {
+dEXT char **watchaddr = 0;
+dEXT char *watchok;
+
+static void debprof _((OP*o));
+
+int
+runops_debug(void) {
+    dTHR;
     if (!op) {
 	warn("NULL OP IN RUN");
-	return;
+	return 0;
     }
+
     do {
 	if (debug) {
 	    if (watchaddr != 0 && *watchaddr != watchok)
-		fprintf(stderr, "WARNING: %lx changed from %lx to %lx\n",
-		    watchaddr, watchok, *watchaddr);
+		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)() );
-}
-
-#endif
+    } while ( op = (*op->op_ppaddr)(ARGS) );
 
-I32
-getgimme(op)
-OP *op;
-{
-    return cxstack[cxstack_ix].blk_gimme;
+    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));
-	    sv_free(sv);
+	    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",
-	watchaddr, watchok);
+    PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
+	(long)watchaddr, (long)watchok);
+}
+
+static void
+debprof(OP *o)
+{
+    if (!profiledata)
+	New(000, profiledata, MAXO, U32);
+    ++profiledata[o->op_type];
+}
+
+void
+debprofdump(void)
+{
+    unsigned i;
+    if (!profiledata)
+	return;
+    for (i = 0; i < MAXO; i++) {
+	if (profiledata[i])
+	    PerlIO_printf(Perl_debug_log,
+			  "%u\t%lu\n", i, (unsigned long)profiledata[i]);
+    }
 }
+
+#endif /* DEBUGGING */
+