[asperl] add AS patch#20 (exposes more global constants)

[p5sagit/p5-mst-13.2.git] / run.c

diff --git a/run.c b/run.c
index a952dac..ac9752b 100644 (file)
--- 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,34 +16,39 @@
  * know.  Run now!  Hope is in speed!"  --Gandalf
  */
 
-dEXT char **watchaddr = 0;
-dEXT char *watchok;
-
-#ifndef DEBUGGING
+#ifdef PERL_OBJECT
+#define CALLOP this->*op
+#else
+#define CALLOP *op
+#endif
 
 int
-runops() {
-    SAVEI32(runlevel);
-    runlevel++;
+runops_standard(void) {
+    dTHR;
+
+    while ( op = (CALLOP->op_ppaddr)(ARGS) ) ;
 
-    while ( op = (*op->op_ppaddr)() ) ;
+    TAINT_NOT;
     return 0;
 }
 
-#else
+#ifdef DEBUGGING
 
-static void debprof _((OP*op));
+dEXT char **watchaddr = 0;
+dEXT char *watchok;
+
+#ifndef PERL_OBJECT
+static void debprof _((OP*o));
+#endif
 
 int
-runops() {
+runops_debug(void) {
+    dTHR;
     if (!op) {
        warn("NULL OP IN RUN");
        return 0;
     }
 
-    SAVEI32(runlevel);
-    runlevel++;
-
     do {
        if (debug) {
            if (watchaddr != 0 && *watchaddr != watchok)
@@ -53,25 +58,26 @@ runops() {
            DEBUG_t(debop(op));
            DEBUG_P(debprof(op));
        }
-    } while ( op = (*op->op_ppaddr)() );
+    } while ( op = (CALLOP->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:
-       PerlIO_printf(Perl_debug_log, "(%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_fullname3(sv, cGVOP->op_gv, Nullch);
+           gv_fullname3(sv, cGVOPo->op_gv, Nullch);
            PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, na));
            SvREFCNT_dec(sv);
        }
@@ -86,8 +92,7 @@ OP *op;
 }
 
 void
-watch(addr)
-char **addr;
+watch(char **addr)
 {
     watchaddr = addr;
     watchok = *addr;
@@ -95,26 +100,26 @@ char **addr;
        (long)watchaddr, (long)watchok);
 }
 
-static void
-debprof(op)
-OP* op;
+STATIC void
+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])
-           PerlIO_printf(Perl_debug_log, "%d\t%lu\n", i, profiledata[i]);
+           PerlIO_printf(Perl_debug_log,
+                         "%u\t%lu\n", i, (unsigned long)profiledata[i]);
     }
 }
 
-#endif
+#endif /* DEBUGGING */