X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=deb.c;h=6a5a21c20247e61df5857b05ffdddc7d23fe489c;hb=a344be1068c2cd951a34c870c809266dc300b723;hp=441487f88eff9b8529bbe016dfba37706e24423d;hpb=155aba94f677ac771761a1f510964fe5b21524ed;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/deb.c b/deb.c
index 441487f..6a5a21c 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,10 +45,9 @@ void
 Perl_vdeb(pTHX_ const char *pat, va_list *args)
 {
 #ifdef DEBUGGING
-    dTHR;
-    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 : "<free>"),
@@ -56,7 +55,7 @@ Perl_vdeb(pTHX_ const char *pat, va_list *args)
 #else
     PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", (file ? file : "<free>"),
 		  (long)CopLINE(PL_curcop));
-#endif /* USE_THREADS */
+#endif /* USE_5005THREADS */
     (void) PerlIO_vprintf(Perl_debug_log, pat, *args);
 #endif /* DEBUGGING */
 }
@@ -65,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),
@@ -83,12 +81,14 @@ Perl_debstackptrs(pTHX)
 I32
 Perl_debstack(pTHX)
 {
-#ifdef DEBUGGING
-    dTHR;
+#ifndef SKIP_DEBUGGING
     I32 top = PL_stack_sp - PL_stack_base;
     register I32 i = top - 30;
     I32 *markscan = PL_markstack + PL_curstackinfo->si_markoff;
 
+    if (CopSTASH_eq(PL_curcop, PL_debstash) && !DEBUG_J_TEST_)
+	return 0;
+
     if (i < 0)
 	i = 0;
     
@@ -96,13 +96,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 {
@@ -121,6 +121,6 @@ Perl_debstack(pTHX)
     }
     while (1);
     PerlIO_printf(Perl_debug_log, "\n");
-#endif /* DEBUGGING */
+#endif /* SKIP_DEBUGGING */
     return 0;
 }