Add comment to top of reentr.c and fix typos in other files

[perl5.git] / deb.c

diff --git a/deb.c b/deb.c
index 37b42e1..58b49a6 100644 (file)
--- a/deb.c
+++ b/deb.c
@@ -1,6 +1,7 @@
 /*    deb.c
  *
- *    Copyright (c) 1991-2002, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
+ *    2000, 2001, 2002, 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.
@@ -12,6 +13,11 @@
  * have seen more than thou knowest, Gray Fool."  --Denethor
  */
 
+/*
+ * This file contains various utilities for producing debugging output
+ * (mainly related to displaying the stack)
+ */
+
 #include "EXTERN.h"
 #define PERL_IN_DEB_C
 #include "perl.h"
@@ -47,15 +53,8 @@ Perl_vdeb(pTHX_ const char *pat, va_list *args)
 #ifdef DEBUGGING
     char* file = OutCopFILE(PL_curcop);
 
-#ifdef USE_5005THREADS
-    PerlIO_printf(Perl_debug_log, "0x%"UVxf" (%s:%ld)\t",
-                 PTR2UV(thr),
-                 (file ? file : "<free>"),
-                 (long)CopLINE(PL_curcop));
-#else
     PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", (file ? file : "<free>"),
                  (long)CopLINE(PL_curcop));
-#endif /* USE_5005THREADS */
     (void) PerlIO_vprintf(Perl_debug_log, pat, *args);
 #endif /* DEBUGGING */
 }
@@ -191,14 +190,14 @@ Perl_deb_stack_all(pTHX)
        else
            si_name = si_names[si_name_ix];
        PerlIO_printf(Perl_debug_log, "STACK %"IVdf": %s\n",
-                                               si_ix, si_name);
+                                               (IV)si_ix, si_name);
 
        for (ix=0; ix<=si->si_cxix; ix++) {
 
            cx = &(si->si_cxstack[ix]);
            PerlIO_printf(Perl_debug_log,
                    "  CX %"IVdf": %-6s => ",
-                   ix, PL_block_type[CxTYPE(cx)]
+                   (IV)ix, PL_block_type[CxTYPE(cx)]
            );
            /* substitution contexts don't save stack pointers etc) */
            if (CxTYPE(cx) == CXt_SUBST)
@@ -212,9 +211,9 @@ Perl_deb_stack_all(pTHX)
                 */
 
                I32 i, stack_min, stack_max, mark_min, mark_max;
-               I32 ret_min, ret_max;
                PERL_CONTEXT *cx_n;
                PERL_SI      *si_n;
+               OP           *retop;
 
                cx_n = Null(PERL_CONTEXT*);
 
@@ -263,27 +262,26 @@ Perl_deb_stack_all(pTHX)
                }
 
                mark_min  = cx->blk_oldmarksp;
-               ret_min   = cx->blk_oldretsp;
                if (cx_n) {
                    mark_max  = cx_n->blk_oldmarksp;
-                   ret_max   = cx_n->blk_oldretsp;
                }
                else {
                    mark_max = PL_markstack_ptr - PL_markstack;
-                   ret_max  = PL_retstack_ix;
                }
 
                deb_stack_n(AvARRAY(si->si_stack),
                        stack_min, stack_max, mark_min, mark_max);
 
-               if (ret_max > ret_min) {
+               if (CxTYPE(cx) == CXt_EVAL || CxTYPE(cx) == CXt_SUB
+                       || CxTYPE(cx) == CXt_FORMAT)
+               {
+                   retop = (CxTYPE(cx) == CXt_EVAL)
+                           ? cx->blk_eval.retop : cx->blk_sub.retop;
+
                    PerlIO_printf(Perl_debug_log, "  retop=%s\n",
-                           PL_retstack[ret_min]
-                               ? OP_NAME(PL_retstack[ret_min])
-                               : "(null)"
+                           retop ? OP_NAME(retop) : "(null)"
                    );
                }
-
            }
        } /* next context */