X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=deb.c;h=fae944cf076d24b688304693b2a55a59e229bcf4;hb=732266dc6ae9a10c35695fe9bd9850ecaa70acb6;hp=0928c01a9a7c0b675a5e6404646a64ffcf5020d8;hpb=3818b22bb9ef820a2553aa5e3504220f3b156f21;p=p5sagit%2Fp5-mst-13.2.git diff --git a/deb.c b/deb.c index 0928c01..fae944c 100644 --- a/deb.c +++ b/deb.c @@ -1,6 +1,6 @@ /* deb.c * - * Copyright (c) 1991-2000, Larry Wall + * Copyright (c) 1991-2002, 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,11 +45,9 @@ void Perl_vdeb(pTHX_ const char *pat, va_list *args) { #ifdef DEBUGGING - dTHR; - register I32 i; - char* file = CopFILE(PL_curcop); + char* file = OutCopFILE(PL_curcop); -#ifdef USE_THREADS +#ifdef USE_5005THREADS PerlIO_printf(Perl_debug_log, "0x%"UVxf" (%s:%ld)\t", PTR2UV(thr), (file ? file : ""), @@ -57,7 +55,7 @@ Perl_vdeb(pTHX_ const char *pat, va_list *args) #else PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", (file ? file : ""), (long)CopLINE(PL_curcop)); -#endif /* USE_THREADS */ +#endif /* USE_5005THREADS */ (void) PerlIO_vprintf(Perl_debug_log, pat, *args); #endif /* DEBUGGING */ } @@ -66,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), @@ -85,7 +82,6 @@ I32 Perl_debstack(pTHX) { #ifdef DEBUGGING - dTHR; I32 top = PL_stack_sp - PL_stack_base; register I32 i = top - 30; I32 *markscan = PL_markstack + PL_curstackinfo->si_markoff; @@ -97,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 {