X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/54ca4ee7252684545d9524460bab88037e5f584b..24631c4f6929bc824e657b74b2edfada4c8d05b0:/deb.c diff --git a/deb.c b/deb.c index a21066e..02a0a7d 100644 --- a/deb.c +++ b/deb.c @@ -1,7 +1,7 @@ /* deb.c * - * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others + * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + * 2002, 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -9,8 +9,10 @@ */ /* - * "Didst thou think that the eyes of the White Tower were blind? Nay, I - * have seen more than thou knowest, Gray Fool." --Denethor + * 'Didst thou think that the eyes of the White Tower were blind? Nay, + * I have seen more than thou knowest, Grey Fool.' --Denethor + * + * [p.853 of _The Lord of the Rings_, V/vii: "The Pyre of Denethor"] */ /* @@ -29,9 +31,12 @@ Perl_deb_nocontext(const char *pat, ...) #ifdef DEBUGGING dTHX; va_list args; + PERL_ARGS_ASSERT_DEB_NOCONTEXT; va_start(args, pat); vdeb(pat, &args); va_end(args); +#else + PERL_UNUSED_ARG(pat); #endif /* DEBUGGING */ } #endif @@ -39,27 +44,35 @@ Perl_deb_nocontext(const char *pat, ...) void Perl_deb(pTHX_ const char *pat, ...) { -#ifdef DEBUGGING va_list args; + PERL_ARGS_ASSERT_DEB; va_start(args, pat); +#ifdef DEBUGGING vdeb(pat, &args); - va_end(args); #else - PERL_UNUSED_ARG(pat); + PERL_UNUSED_CONTEXT; #endif /* DEBUGGING */ + va_end(args); } void Perl_vdeb(pTHX_ const char *pat, va_list *args) { #ifdef DEBUGGING - dVAR; - char* file = OutCopFILE(PL_curcop); + const char* const file = PL_curcop ? OutCopFILE(PL_curcop) : ""; + const char* const display_file = file ? file : ""; + const long line = PL_curcop ? (long)CopLINE(PL_curcop) : 0; - PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", (file ? file : ""), - (long)CopLINE(PL_curcop)); + PERL_ARGS_ASSERT_VDEB; + + if (DEBUG_v_TEST) + PerlIO_printf(Perl_debug_log, "(%ld:%s:%ld)\t", + (long)PerlProc_getpid(), display_file, line); + else + PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", display_file, line); (void) PerlIO_vprintf(Perl_debug_log, pat, *args); #else + PERL_UNUSED_CONTEXT; PERL_UNUSED_ARG(pat); PERL_UNUSED_ARG(args); #endif /* DEBUGGING */ @@ -69,7 +82,6 @@ I32 Perl_debstackptrs(pTHX) { #ifdef DEBUGGING - dVAR; PerlIO_printf(Perl_debug_log, "%8"UVxf" %8"UVxf" %8"IVdf" %8"IVdf" %8"IVdf"\n", PTR2UV(PL_curstack), PTR2UV(PL_stack_base), @@ -80,6 +92,8 @@ Perl_debstackptrs(pTHX) PTR2UV(PL_mainstack), PTR2UV(AvARRAY(PL_curstack)), PTR2UV(PL_mainstack), PTR2UV(AvFILLp(PL_curstack)), PTR2UV(AvMAX(PL_curstack))); +#else + PERL_UNUSED_CONTEXT; #endif /* DEBUGGING */ return 0; } @@ -99,9 +113,11 @@ S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max, I32 mark_min, I32 mark_max) { #ifdef DEBUGGING - dVAR; - register I32 i = stack_max - 30; + I32 i = stack_max - 30; const I32 *markscan = PL_markstack + mark_min; + + PERL_ARGS_ASSERT_DEB_STACK_N; + if (i < stack_min) i = stack_min; @@ -119,7 +135,7 @@ S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max, if (markscan <= PL_markstack + mark_max && *markscan < i) { do { ++markscan; - PerlIO_putc(Perl_debug_log, '*'); + (void)PerlIO_putc(Perl_debug_log, '*'); } while (markscan <= PL_markstack + mark_max && *markscan < i); PerlIO_printf(Perl_debug_log, " "); @@ -131,6 +147,7 @@ S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max, while (1); PerlIO_printf(Perl_debug_log, "\n"); #else + PERL_UNUSED_CONTEXT; PERL_UNUSED_ARG(stack_base); PERL_UNUSED_ARG(stack_min); PERL_UNUSED_ARG(stack_max); @@ -146,7 +163,6 @@ I32 Perl_debstack(pTHX) { #ifndef SKIP_DEBUGGING - dVAR; if (CopSTASH_eq(PL_curcop, PL_debstash) && !DEBUG_J_TEST_) return 0; @@ -175,7 +191,8 @@ static const char * const si_names[] = { "DESTROY", "WARNHOOK", "DIEHOOK", - "REQUIRE" + "REQUIRE", + "MULTICALL" }; #endif @@ -186,7 +203,6 @@ void Perl_deb_stack_all(pTHX) { #ifdef DEBUGGING - dVAR; I32 si_ix; const PERL_SI *si; @@ -198,8 +214,10 @@ Perl_deb_stack_all(pTHX) si_ix=0; for (;;) { - const int si_name_ix = si->si_type+1; /* -1 is a valid index */ - const char * const si_name = (si_name_ix>= sizeof(si_names)) ? "????" : si_names[si_name_ix]; + const size_t si_name_ix = si->si_type+1; /* -1 is a valid index */ + const char * const si_name = + si_name_ix < C_ARRAY_LENGTH(si_names) ? + si_names[si_name_ix] : "????"; I32 ix; PerlIO_printf(Perl_debug_log, "STACK %"IVdf": %s\n", (IV)si_ix, si_name); @@ -223,11 +241,9 @@ Perl_deb_stack_all(pTHX) */ I32 i, stack_min, stack_max, mark_min, mark_max; - const PERL_CONTEXT *cx_n; + const PERL_CONTEXT *cx_n = NULL; const PERL_SI *si_n; - cx_n = Null(PERL_CONTEXT*); - /* there's a separate stack per SI, so only search * this one */ @@ -255,7 +271,7 @@ Perl_deb_stack_all(pTHX) si_n = si; i = ix; - cx_n = Null(PERL_CONTEXT*); + cx_n = NULL; for (;;) { i++; if (i > si_n->si_cxix) { @@ -286,8 +302,7 @@ Perl_deb_stack_all(pTHX) if (CxTYPE(cx) == CXt_EVAL || CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT) { - const OP * const retop = (CxTYPE(cx) == CXt_EVAL) - ? cx->blk_eval.retop : cx->blk_sub.retop; + const OP * const retop = cx->blk_sub.retop; PerlIO_printf(Perl_debug_log, " retop=%s\n", retop ? OP_NAME(retop) : "(null)" @@ -306,15 +321,11 @@ Perl_deb_stack_all(pTHX) } /* next stackinfo */ PerlIO_printf(Perl_debug_log, "\n"); +#else + PERL_UNUSED_CONTEXT; #endif /* DEBUGGING */ } /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * - * ex: set ts=8 sts=4 sw=4 noet: + * ex: set ts=8 sts=4 sw=4 et: */