X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=b4b9b903875de924b6d2dcb35e69336619b87749;hb=5e1b1338a505d6fdfc71afc04f983f0bf262ea09;hp=697c7d2a6b176b27ac619ea89d8cc37a4ee0d663;hpb=760ac839baf413929cd31cc32ffd6dba6b781a81;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/run.c b/run.c
index 697c7d2..b4b9b90 100644
--- a/run.c
+++ b/run.c
@@ -1,6 +1,6 @@
 /*    run.c
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-2002, 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,14 @@
  * know.  Run now!  Hope is in speed!"  --Gandalf
  */
 
-dEXT char **watchaddr = 0;
-dEXT char *watchok;
-
-#ifndef DEBUGGING
-
-int
-runops() {
-    SAVEI32(runlevel);
-    runlevel++;
-
-    while ( op = (*op->op_ppaddr)() ) ;
-    return 0;
-}
-
-#else
-
-static void debprof _((OP*op));
-
 int
-runops() {
-    if (!op) {
-	warn("NULL OP IN RUN");
-	return 0;
-    }
-
-    SAVEI32(runlevel);
-    runlevel++;
-
-    do {
-	if (debug) {
-	    if (watchaddr != 0 && *watchaddr != watchok)
-		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)() );
-    return 0;
-}
-
-I32
-debop(op)
-OP *op;
+Perl_runops_standard(pTHX)
 {
-    SV *sv;
-    deb("%s", op_name[op->op_type]);
-    switch (op->op_type) {
-    case OP_CONST:
-	PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOP->op_sv));
-	break;
-    case OP_GVSV:
-    case OP_GV:
-	if (cGVOP->op_gv) {
-	    sv = NEWSV(0,0);
-	    gv_fullname(sv, cGVOP->op_gv);
-	    PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, na));
-	    SvREFCNT_dec(sv);
-	}
-	else
-	    PerlIO_printf(Perl_debug_log, "(NULL)");
-	break;
-    default:
-	break;
+    while ((PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX))) {
+	PERL_ASYNC_CHECK();
     }
-    PerlIO_printf(Perl_debug_log, "\n");
-    return 0;
-}
 
-void
-watch(addr)
-char **addr;
-{
-    watchaddr = addr;
-    watchok = *addr;
-    PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
-	(long)watchaddr, (long)watchok);
-}
-
-static void
-debprof(op)
-OP* op;
-{
-    if (!profiledata)
-	New(000, profiledata, MAXO, U32);
-    ++profiledata[op->op_type];
-}
-
-void
-debprofdump()
-{
-    U32 i;
-    if (!profiledata)
-	return;
-    for (i = 0; i < MAXO; i++) {
-	if (profiledata[i])
-	    PerlIO_printf(Perl_debug_log, "%d\t%lu\n", i, profiledata[i]);
-    }
+    TAINT_NOT;
+    return 0;
 }
 
-#endif
-