X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=deb.c;h=eaa50826d47b755343b82d83c16eb66a2beb0fa4;hb=4dcf58d554d18650396856ef90d92ba379c6e184;hp=10b52cf49d9a59192b56ac46675ca6e08b78ef5e;hpb=1ae6be1c7649fa55b3105031a58ffe146fa4f2fd;p=p5sagit%2Fp5-mst-13.2.git diff --git a/deb.c b/deb.c index 10b52cf..eaa5082 100644 --- a/deb.c +++ b/deb.c @@ -1,6 +1,6 @@ /* deb.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. @@ -45,20 +45,17 @@ void Perl_vdeb(pTHX_ const char *pat, va_list *args) { #ifdef DEBUGGING - dTHR; - register I32 i; - GV* gv = PL_curcop->cop_filegv; + char* file = CopFILE(PL_curcop); -#ifdef USE_THREADS +#ifdef USE_5005THREADS PerlIO_printf(Perl_debug_log, "0x%"UVxf" (%s:%ld)\t", PTR2UV(thr), - SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "", - (long)PL_curcop->cop_line); + (file ? file : ""), + (long)CopLINE(PL_curcop)); #else - PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", - SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "", - (long)PL_curcop->cop_line); -#endif /* USE_THREADS */ + PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", (file ? file : ""), + (long)CopLINE(PL_curcop)); +#endif /* USE_5005THREADS */ (void) PerlIO_vprintf(Perl_debug_log, pat, *args); #endif /* DEBUGGING */ } @@ -67,7 +64,6 @@ I32 Perl_debstackptrs(pTHX) { #ifdef DEBUGGING - dTHR; PerlIO_printf(Perl_debug_log, "%8"UVxf" %8"UVxf" %8"IVdf" %8"IVdf" %8"IVdf"\n", PTR2UV(PL_curstack), PTR2UV(PL_stack_base), @@ -86,10 +82,9 @@ I32 Perl_debstack(pTHX) { #ifdef DEBUGGING - dTHR; I32 top = PL_stack_sp - PL_stack_base; register I32 i = top - 30; - I32 *markscan = PL_curstackinfo->si_markbase; + I32 *markscan = PL_markstack + PL_curstackinfo->si_markoff; if (i < 0) i = 0; @@ -98,13 +93,13 @@ Perl_debstack(pTHX) if (*markscan >= i) break; -#ifdef USE_THREADS +#ifdef USE_5005THREADS PerlIO_printf(Perl_debug_log, i ? "0x%"UVxf" => ... " : "0x%lx => ", PTR2UV(thr)); #else PerlIO_printf(Perl_debug_log, i ? " => ... " : " => "); -#endif /* USE_THREADS */ +#endif /* USE_5005THREADS */ if (PL_stack_base[0] != &PL_sv_undef || PL_stack_sp < PL_stack_base) PerlIO_printf(Perl_debug_log, " [STACK UNDERFLOW!!!]\n"); do {