Integrate changes #9259,9260 from maintperl into mainline.

[perl5.git] / run.c

diff --git a/run.c b/run.c
index b46df8f..1b1e72b 100644 (file)
--- a/run.c
+++ b/run.c
@@ -1,6 +1,6 @@
 /*    run.c
  *
 /*    run.c
  *

- *    Copyright (c) 1991-1999, Larry Wall
+ *    Copyright (c) 1991-2001, 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.
  *
  *    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"
  */
 
 #include "EXTERN.h"

+#define PERL_IN_RUN_C

 #include "perl.h"
 
 /*
 #include "perl.h"
 
 /*


@@ -16,50 +17,40 @@
  * know.  Run now!  Hope is in speed!"  --Gandalf
  */
 
  * know.  Run now!  Hope is in speed!"  --Gandalf
  */
 

-#ifdef PERL_OBJECT
-#define CALLOP this->*PL_op
-#else
-#define CALLOP *PL_op
-#endif
-

 int
 int

-runops_standard(void)
+Perl_runops_standard(pTHX)

 {
 {

-    dTHR;
-
-    while ( PL_op = (CALLOP->op_ppaddr)(ARGS) ) ;
+    while ((PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX))) {
+       PERL_ASYNC_CHECK();
+    }

 
     TAINT_NOT;
     return 0;
 }
 
 
     TAINT_NOT;
     return 0;
 }
 

-#ifdef DEBUGGING
-#ifndef PERL_OBJECT
-static void debprof _((OP*o));
-#endif
-
-#endif /* DEBUGGING */
-

 int
 int

-runops_debug(void)
+Perl_runops_debug(pTHX)

 {
 #ifdef DEBUGGING
 {
 #ifdef DEBUGGING

-    dTHR;

     if (!PL_op) {
     if (!PL_op) {

-       warn("NULL OP IN RUN");
+       if (ckWARN_d(WARN_DEBUGGING))
+           Perl_warner(aTHX_ WARN_DEBUGGING, "NULL OP IN RUN");

        return 0;
     }
 
     do {
        return 0;
     }
 
     do {

+       PERL_ASYNC_CHECK();

        if (PL_debug) {
            if (PL_watchaddr != 0 && *PL_watchaddr != PL_watchok)
        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);
+               PerlIO_printf(Perl_debug_log,
+                             "WARNING: %"UVxf" changed from %"UVxf" to %"UVxf"\n",
+                             PTR2UV(PL_watchaddr), PTR2UV(PL_watchok),
+                             PTR2UV(*PL_watchaddr));

            DEBUG_s(debstack());
            DEBUG_t(debop(PL_op));
            DEBUG_P(debprof(PL_op));
        }
            DEBUG_s(debstack());
            DEBUG_t(debop(PL_op));
            DEBUG_P(debprof(PL_op));
        }

-    } while ( PL_op = (CALLOP->op_ppaddr)(ARGS) );
+    } while ((PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX)));

 
     TAINT_NOT;
     return 0;
 
     TAINT_NOT;
     return 0;


@@ -69,27 +60,38 @@ runops_debug(void)
 }
 
 I32
 }
 
 I32

-debop(OP *o)
+Perl_debop(pTHX_ OP *o)

 {
 #ifdef DEBUGGING
     SV *sv;
 {
 #ifdef DEBUGGING
     SV *sv;

+    SV **svp;

     STRLEN n_a;
     STRLEN n_a;

-    deb("%s", PL_op_name[o->op_type]);
+    Perl_deb(aTHX_ "%s", PL_op_name[o->op_type]);

     switch (o->op_type) {
     case OP_CONST:
     switch (o->op_type) {
     case OP_CONST:

-       PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo->op_sv));
+       PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo_sv));

        break;
     case OP_GVSV:
     case OP_GV:
        break;
     case OP_GVSV:
     case OP_GV:

-       if (cGVOPo->op_gv) {
+       if (cGVOPo_gv) {

            sv = NEWSV(0,0);
            sv = NEWSV(0,0);

-           gv_fullname3(sv, cGVOPo->op_gv, Nullch);
+           gv_fullname3(sv, cGVOPo_gv, Nullch);

            PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, n_a));
            SvREFCNT_dec(sv);
        }
        else
            PerlIO_printf(Perl_debug_log, "(NULL)");
        break;
            PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, n_a));
            SvREFCNT_dec(sv);
        }
        else
            PerlIO_printf(Perl_debug_log, "(NULL)");
        break;

+    case OP_PADSV:
+    case OP_PADAV:
+    case OP_PADHV:
+       /* print the lexical's name */
+       svp = av_fetch(PL_comppad_name, o->op_targ, FALSE);
+       if (svp)
+           PerlIO_printf(Perl_debug_log, "(%s)", SvPV(*svp,n_a));
+       else
+           PerlIO_printf(Perl_debug_log, "[%"UVuf"]", (UV)o->op_targ);
+       break;

     default:
        break;
     }
     default:
        break;
     }


@@ -99,19 +101,18 @@ debop(OP *o)
 }
 
 void
 }
 
 void

-watch(char **addr)
+Perl_watch(pTHX_ char **addr)

 {
 #ifdef DEBUGGING
 {
 #ifdef DEBUGGING

-    dTHR;

     PL_watchaddr = addr;
     PL_watchok = *addr;
     PL_watchaddr = addr;
     PL_watchok = *addr;

-    PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
-       (long)PL_watchaddr, (long)PL_watchok);
+    PerlIO_printf(Perl_debug_log, "WATCHING, %"UVxf" is currently %"UVxf"\n",
+       PTR2UV(PL_watchaddr), PTR2UV(PL_watchok));

 #endif /* DEBUGGING */
 }
 
 STATIC void
 #endif /* DEBUGGING */
 }
 
 STATIC void

-debprof(OP *o)
+S_debprof(pTHX_ OP *o)

 {
 #ifdef DEBUGGING
     if (!PL_profiledata)
 {
 #ifdef DEBUGGING
     if (!PL_profiledata)


@@ -121,7 +122,7 @@ debprof(OP *o)
 }
 
 void
 }
 
 void

-debprofdump(void)
+Perl_debprofdump(pTHX)

 {
 #ifdef DEBUGGING
     unsigned i;
 {
 #ifdef DEBUGGING
     unsigned i;