X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=3d48139d8836620efbb2a58302fa9c2f6ba380d8;hb=9483776f29dbf67c9f5f68dcc7dd77bf0eb0eeb5;hp=1c44f05f35e741b5300b86169f50135919e07dcf;hpb=8a12f161a3a8b8cc9c866a9f342b9476fb0b9b95;p=p5sagit%2Fp5-mst-13.2.git diff --git a/run.c b/run.c index 1c44f05..3d48139 100644 --- a/run.c +++ b/run.c @@ -1,6 +1,7 @@ /* run.c * - * Copyright (c) 1991-1999, Larry Wall + * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + * 2000, 2001, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -20,9 +21,7 @@ int Perl_runops_standard(pTHX) { - dTHR; - - while ( PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX) ) { + while ((PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX))) { PERL_ASYNC_CHECK(); } @@ -30,101 +29,3 @@ Perl_runops_standard(pTHX) 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 { - PERL_ASYNC_CHECK(); - if (PL_debug) { - if (PL_watchaddr != 0 && *PL_watchaddr != PL_watchok) - PerlIO_printf(Perl_debug_log, - "WARNING: %"UVxf" changed from %"UVxf" to %"UVxf"\n", - PTR2UV(PL_watchaddr), PTR2UV(PL_watchok), (UV)*PL_watchaddr); - DEBUG_s(debstack()); - DEBUG_t(debop(PL_op)); - DEBUG_P(debprof(PL_op)); - } - } while ( PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX) ); - - TAINT_NOT; - return 0; -#else - return runops_standard(); -#endif /* DEBUGGING */ -} - -I32 -Perl_debop(pTHX_ OP *o) -{ -#ifdef DEBUGGING - SV *sv; - STRLEN n_a; - Perl_deb(aTHX_ "%s", PL_op_name[o->op_type]); - switch (o->op_type) { - case OP_CONST: - PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo->op_sv)); - break; - case OP_GVSV: - case OP_GV: - if (cGVOPo) { - sv = NEWSV(0,0); - gv_fullname3(sv, cGVOPo, Nullch); - PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, n_a)); - SvREFCNT_dec(sv); - } - else - PerlIO_printf(Perl_debug_log, "(NULL)"); - break; - default: - break; - } - PerlIO_printf(Perl_debug_log, "\n"); -#endif /* DEBUGGING */ - return 0; -} - -void -Perl_watch(pTHX_ char **addr) -{ -#ifdef DEBUGGING - dTHR; - PL_watchaddr = addr; - PL_watchok = *addr; - PerlIO_printf(Perl_debug_log, "WATCHING, %"UVxf" is currently %"UVxf"\n", - PTR2UV(PL_watchaddr), PTR2UV(PL_watchok)); -#endif /* DEBUGGING */ -} - -STATIC void -S_debprof(pTHX_ OP *o) -{ -#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 */ -}