X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=deb.c;h=bc7e4196dadb9d7788ef0743c212a532d6b8ba51;hb=597c4554ca87aa4325a00c70a0fbb22acbfcfa07;hp=df2ccffaa4cfab3e261860a9caa8ff592ddecbc7;hpb=5f66b61cbe1f2ea985f00c0d9a66153e7a3b6ee1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/deb.c b/deb.c
index df2ccff..bc7e419 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, 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.
@@ -29,6 +29,7 @@ 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);
@@ -41,14 +42,15 @@ 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
@@ -56,12 +58,20 @@ 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_UNUSED_ARG(pat);
     PERL_UNUSED_ARG(args);
 #endif /* DEBUGGING */
@@ -104,6 +114,9 @@ S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max,
     dVAR;
     register 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;
     
@@ -133,6 +146,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);
@@ -200,8 +214,8 @@ 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 >= sizeof(si_names)) ? "????" : si_names[si_name_ix];
 	I32 ix;
 	PerlIO_printf(Perl_debug_log, "STACK %"IVdf": %s\n",
 						(IV)si_ix, si_name);
@@ -225,11 +239,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 */
 
@@ -257,7 +269,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) {
@@ -288,8 +300,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)"
@@ -308,6 +319,8 @@ Perl_deb_stack_all(pTHX)
     } /* next stackinfo */
 
     PerlIO_printf(Perl_debug_log, "\n");
+#else
+    PERL_UNUSED_CONTEXT;
 #endif /* DEBUGGING */
 }