Make the ansi branch

[perl5.git] / run.c

diff --git a/run.c b/run.c
index 5529fb6..1e1001d 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.
@@ -19,23 +19,24 @@
 dEXT char **watchaddr = 0;
 dEXT char *watchok;
 
-#ifndef DEBUGGING
-
 int
-runops() {
+runops_standard() {
+    dTHR;
     SAVEI32(runlevel);
     runlevel++;
 
-    while ( op = (*op->op_ppaddr)() ) ;
+    while ( op = (*op->op_ppaddr)(ARGS) ) ;
+
+    TAINT_NOT;
     return 0;
 }
 
-#else
-
-static void debprof _((OP*op));
+#ifdef DEBUGGING
+static void debprof _((OP*o));
 
 int
-runops() {
+runops_debug() {
+    dTHR;
     if (!op) {
        warn("NULL OP IN RUN");
        return 0;
@@ -53,25 +54,27 @@ runops() {
            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(o)
+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_fullname(sv, cGVOP->op_gv, Nullch);
+           gv_fullname3(sv, cGVOPo->op_gv, Nullch);
            PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, na));
            SvREFCNT_dec(sv);
        }
@@ -96,23 +99,24 @@ char **addr;
 }
 
 static void
-debprof(op)
-OP* op;
+debprof(o)
+OP* o;
 {
     if (!profiledata)
        New(000, profiledata, MAXO, U32);
-    ++profiledata[op->op_type];
+    ++profiledata[o->op_type];
 }
 
 void
 debprofdump()
 {
-    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]);
     }
 }