/* 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.
*/
/*
- * "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"]
*/
/*
#ifdef DEBUGGING
dTHX;
va_list args;
+ PERL_ARGS_ASSERT_DEB_NOCONTEXT;
va_start(args, pat);
vdeb(pat, &args);
va_end(args);
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_CONTEXT;
- PERL_UNUSED_ARG(pat);
#endif /* DEBUGGING */
+ va_end(args);
}
void
Perl_vdeb(pTHX_ const char *pat, va_list *args)
{
#ifdef DEBUGGING
- dVAR;
- const char* const file = OutCopFILE(PL_curcop);
+ const char* const file = PL_curcop ? OutCopFILE(PL_curcop) : "<null>";
+ const char* const display_file = file ? file : "<free>";
+ const long line = PL_curcop ? (long)CopLINE(PL_curcop) : 0;
- PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", (file ? file : "<free>"),
- (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_debstackptrs(pTHX)
{
#ifdef DEBUGGING
- dVAR;
PerlIO_printf(Perl_debug_log,
- "%8"UVxf" %8"UVxf" %8"IVdf" %8"IVdf" %8"IVdf"\n",
+ "%8" UVxf " %8" UVxf " %8" IVdf " %8" IVdf " %8" IVdf "\n",
PTR2UV(PL_curstack), PTR2UV(PL_stack_base),
(IV)*PL_markstack_ptr, (IV)(PL_stack_sp-PL_stack_base),
(IV)(PL_stack_max-PL_stack_base));
PerlIO_printf(Perl_debug_log,
- "%8"UVxf" %8"UVxf" %8"UVuf" %8"UVuf" %8"UVuf"\n",
+ "%8" UVxf " %8" UVxf " %8" UVuf " %8" UVuf " %8" UVuf "\n",
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;
}
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;
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, " ");
Perl_debstack(pTHX)
{
#ifndef SKIP_DEBUGGING
- dVAR;
if (CopSTASH_eq(PL_curcop, PL_debstash) && !DEBUG_J_TEST_)
return 0;
"DESTROY",
"WARNHOOK",
"DIEHOOK",
- "REQUIRE"
+ "REQUIRE",
+ "MULTICALL"
};
#endif
Perl_deb_stack_all(pTHX)
{
#ifdef DEBUGGING
- dVAR;
I32 si_ix;
const PERL_SI *si;
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",
+ PerlIO_printf(Perl_debug_log, "STACK %" IVdf ": %s\n",
(IV)si_ix, si_name);
for (ix=0; ix<=si->si_cxix; ix++) {
const PERL_CONTEXT * const cx = &(si->si_cxstack[ix]);
PerlIO_printf(Perl_debug_log,
- " CX %"IVdf": %-6s => ",
+ " CX %" IVdf ": %-6s => ",
(IV)ix, PL_block_type[CxTYPE(cx)]
);
/* substitution contexts don't save stack pointers etc) */
PerlIO_printf(Perl_debug_log, "\n");
else {
- /* Find the the current context's stack range by searching
+ /* Find the current context's stack range by searching
* forward for any higher contexts using this stack; failing
* that, it will be equal to the size of the stack for old
* stacks, or PL_stack_sp for the current stack
const PERL_CONTEXT *cx_n = NULL;
const PERL_SI *si_n;
- /* there's a separate stack per SI, so only search
- * this one */
+ /* there's a separate argument stack per SI, so only
+ * search this one */
for (i=ix+1; i<=si->si_cxix; i++) {
- if (CxTYPE(cx) == CXt_SUBST)
+ const PERL_CONTEXT *this_cx = &(si->si_cxstack[i]);
+ if (CxTYPE(this_cx) == CXt_SUBST)
continue;
- cx_n = &(si->si_cxstack[i]);
+ cx_n = this_cx;
break;
}
stack_max = AvFILLp(si->si_stack);
}
- /* for the other stack types, there's only one stack
- * shared between all SIs */
+ /* for the markstack, there's only one stack shared
+ * between all SIs */
si_n = si;
i = ix;
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)"
}
/*
- * 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:
*/
https://perl5.git.perl.org / perl5.git / blobdiff