X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=be532046c6a73f614ce29d4f169f3fd4d8b3363d;hb=52a043e6cc1df667f590107cf208184857a066bd;hp=371717ad6a43e4be515e0f314a19973234661b37;hpb=85e6fe838fb25b257a1b363debf8691c0992ef71;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/run.c b/run.c
index 371717a..be53204 100644
--- a/run.c
+++ b/run.c
@@ -1,67 +1,132 @@
+/*    run.c
+ *
+ *    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.
+ *
+ */
+
 #include "EXTERN.h"
+#define PERL_IN_RUN_C
 #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
+#ifdef PERL_OBJECT
+#define CALLOP this->*PL_op
+#else
+#define CALLOP *PL_op
+#endif
 
-run() {
-    while ( op = (*op->op_ppaddr)() ) ;
-}
+int
+Perl_runops_standard(pTHX)
+{
+    dTHR;
 
-#else
+    while ( PL_op = (CALLOP->op_ppaddr)(aTHX) ) ;
 
-run() {
-    if (!op) {
-	warn("NULL OP IN RUN");
-	return;
+    TAINT_NOT;
+    return 0;
+}
+
+int
+Perl_runops_debug(pTHX)
+{
+#ifdef DEBUGGING
+    dTHR;
+    if (!PL_op) {
+	if (ckWARN_d(WARN_DEBUGGING))
+	    Perl_warner(aTHX_ WARN_DEBUGGING, "NULL OP IN RUN");
+	return 0;
     }
+
     do {
-	if (debug) {
-	    if (watchaddr != 0 && *watchaddr != watchok)
-		fprintf(stderr, "WARNING: %lx changed from %lx to %lx\n",
-		    watchaddr, watchok, *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_t(debop(PL_op));
+	    DEBUG_P(debprof(PL_op));
 	}
-    } while ( op = (*op->op_ppaddr)() );
-}
+    } while ( PL_op = (CALLOP->op_ppaddr)(aTHX) );
 
-#endif
+    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)
+{
+#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
+S_debprof(pTHX_ OP *o)
 {
-    watchaddr = addr;
-    watchok = *addr;
-    fprintf(stderr, "WATCHING, %lx is currently %lx\n",
-	watchaddr, watchok);
+#ifdef DEBUGGING
+    if (!PL_profiledata)
+	Newz(000, PL_profiledata, MAXO, U32);
+    ++PL_profiledata[o->op_type];
+#endif /* DEBUGGING */
+}
+
+void
+Perl_debprofdump(pTHX)
+{
+#ifdef DEBUGGING
+    unsigned i;
+    if (!PL_profiledata)
+	return;
+    for (i = 0; i < MAXO; i++) {
+	if (PL_profiledata[i])
+	    PerlIO_printf(Perl_debug_log,
+			  "%5lu %s\n", (unsigned long)PL_profiledata[i],
+                                       PL_op_name[i]);
+    }
+#endif	/* DEBUGGING */
 }