X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FDevel%2FPeek%2FPeek.xs;h=e7f5746803545b74fe1d527aae029a8a1c12ca0f;hb=8ecf71871febb31312d723e89648aadebf858ae1;hp=df914764829d5172325da42dc91c093b0ec55d07;hpb=c5be433b5c5658093bc9cae4434721a0b63e7a85;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/Devel/Peek/Peek.xs b/ext/Devel/Peek/Peek.xs
index df91476..e7f5746 100644
--- a/ext/Devel/Peek/Peek.xs
+++ b/ext/Devel/Peek/Peek.xs
@@ -3,12 +3,12 @@
 #include "perl.h"
 #include "XSUB.h"
 
-#ifdef PURIFY
-#define DeadCode() NULL
-#else
 SV *
 DeadCode(pTHX)
 {
+#ifdef PURIFY
+    return Nullsv;
+#else
     SV* sva;
     SV* sv, *dbg;
     SV* ret = newRV_noinc((SV*)newAV());
@@ -34,12 +34,12 @@ DeadCode(pTHX)
 		    continue;		/* file-level scope. */
 		}
 		if (!CvROOT(cv)) {
-		    /* PerlIO_printf(PerlIO_stderr(), "  no root?!\n"); */
+		    /* PerlIO_printf(Perl_debug_log, "  no root?!\n"); */
 		    continue;		/* autoloading stub. */
 		}
-		do_gvgv_dump(0, PerlIO_stderr(), "GVGV::GV", CvGV(sv));
+		do_gvgv_dump(0, Perl_debug_log, "GVGV::GV", CvGV(sv));
 		if (CvDEPTH(cv)) {
-		    PerlIO_printf(PerlIO_stderr(), "  busy\n");
+		    PerlIO_printf(Perl_debug_log, "  busy\n");
 		    continue;
 		}
 		svp = AvARRAY(padlist);
@@ -49,7 +49,7 @@ DeadCode(pTHX)
 		    pad = AvARRAY((AV*)svp[i]);
 		    argav = (AV*)pad[0];
 		    if (!argav || (SV*)argav == &PL_sv_undef) {
-			PerlIO_printf(PerlIO_stderr(), "    closure-template\n");
+			PerlIO_printf(Perl_debug_log, "    closure-template\n");
 			continue;
 		    }
 		    args = AvARRAY(argav);
@@ -58,7 +58,7 @@ DeadCode(pTHX)
 		    if (AvREAL(argav)) {
 			for (j = 0; j < AvFILL(argav); j++) {
 			    if (SvROK(args[j])) {
-				PerlIO_printf(PerlIO_stderr(), "     ref in args!\n");
+				PerlIO_printf(Perl_debug_log, "     ref in args!\n");
 				levelref++;
 			    }
 			    /* else if (SvPOK(args[j]) && SvPVX(args[j])) { */
@@ -70,14 +70,14 @@ DeadCode(pTHX)
 		    for (j = 1; j < AvFILL((AV*)svp[1]); j++) {	/* Vars. */
 			if (SvROK(pad[j])) {
 			    levelref++;
-			    do_sv_dump(0, PerlIO_stderr(), pad[j], 0, 4, 0, 0);
+			    do_sv_dump(0, Perl_debug_log, pad[j], 0, 4, 0, 0);
 			    dumpit = 1;
 			}
 			/* else if (SvPOK(pad[j]) && SvPVX(pad[j])) { */
 			else if (SvTYPE(pad[j]) >= SVt_PVAV) {
 			    if (!SvPADMY(pad[j])) {
 				levelref++;
-				do_sv_dump(0, PerlIO_stderr(), pad[j], 0, 4, 0, 0);
+				do_sv_dump(0, Perl_debug_log, pad[j], 0, 4, 0, 0);
 				dumpit = 1;
 			    }
 			}
@@ -89,7 +89,7 @@ DeadCode(pTHX)
 				/* Dump(pad[j],4); */
 			}
 		    }
-		    PerlIO_printf(PerlIO_stderr(), "    level %i: refs: %i, strings: %i in %i,\targsarray: %i, argsstrings: %i\n", 
+		    PerlIO_printf(Perl_debug_log, "    level %i: refs: %i, strings: %i in %i,\targsarray: %i, argsstrings: %i\n", 
 			    i, levelref, levelm, levels, levela, levelas);
 		    totm += levelm;
 		    tota += levela;
@@ -97,10 +97,10 @@ DeadCode(pTHX)
 		    tots += levels;
 		    totref += levelref;
 		    if (dumpit)
-			do_sv_dump(0, PerlIO_stderr(), (SV*)cv, 0, 2, 0, 0);
+			do_sv_dump(0, Perl_debug_log, (SV*)cv, 0, 2, 0, 0);
 		}
 		if (AvFILL(padlist) > 1) {
-		    PerlIO_printf(PerlIO_stderr(), "  total: refs: %i, strings: %i in %i,\targsarrays: %i, argsstrings: %i\n", 
+		    PerlIO_printf(Perl_debug_log, "  total: refs: %i, strings: %i in %i,\targsarrays: %i, argsstrings: %i\n", 
 			    totref, totm, tots, tota, totas);
 		}
 		tref += totref;
@@ -111,20 +111,24 @@ DeadCode(pTHX)
 	    }
 	}
     }
-    PerlIO_printf(PerlIO_stderr(), "total: refs: %i, strings: %i in %i\targsarray: %i, argsstrings: %i\n", tref, tm, ts, ta, tas);
+    PerlIO_printf(Perl_debug_log, "total: refs: %i, strings: %i in %i\targsarray: %i, argsstrings: %i\n", tref, tm, ts, ta, tas);
 
     return ret;
-}
 #endif /* !PURIFY */
+}
 
 #if defined(PERL_DEBUGGING_MSTATS) || defined(DEBUGGING_MSTATS) \
 	|| (defined(MYMALLOC) && !defined(PLAIN_MALLOC))
 #   define mstat(str) dump_mstats(str)
 #else
 #   define mstat(str) \
-	PerlIO_printf(PerlIO_stderr(), "%s: perl not compiled with DEBUGGING_MSTATS\n",str);
+	PerlIO_printf(Perl_debug_log, "%s: perl not compiled with DEBUGGING_MSTATS\n",str);
 #endif
 
+#define _CvGV(cv)					\
+	(SvROK(cv) && (SvTYPE(SvRV(cv))==SVt_PVCV)	\
+	 ? (SV*)CvGV((CV*)SvRV(cv)) : &PL_sv_undef)
+
 MODULE = Devel::Peek		PACKAGE = Devel::Peek
 
 void
@@ -142,7 +146,7 @@ PPCODE:
     SV *dumpop = perl_get_sv("Devel::Peek::dump_ops", FALSE);
     I32 save_dumpindent = PL_dumpindent;
     PL_dumpindent = 2;
-    do_sv_dump(0, PerlIO_stderr(), sv, 0, lim, dumpop && SvTRUE(dumpop), pv_lim);
+    do_sv_dump(0, Perl_debug_log, sv, 0, lim, dumpop && SvTRUE(dumpop), pv_lim);
     PL_dumpindent = save_dumpindent;
 }
 
@@ -159,8 +163,8 @@ PPCODE:
     PL_dumpindent = 2;
 
     for (i=1; i<items; i++) {
-	PerlIO_printf(PerlIO_stderr(), "Elt No. %ld  0x%lx\n", i - 1, ST(i));
-	do_sv_dump(0, PerlIO_stderr(), ST(i), 0, lim, dumpop && SvTRUE(dumpop), pv_lim);
+	PerlIO_printf(Perl_debug_log, "Elt No. %ld  0x%"UVxf"\n", i - 1, PTR2UV(ST(i)));
+	do_sv_dump(0, Perl_debug_log, ST(i), 0, lim, dumpop && SvTRUE(dumpop), pv_lim);
     }
     PL_dumpindent = save_dumpindent;
 }
@@ -206,3 +210,9 @@ CODE:
     RETVAL = DeadCode(aTHX);
 OUTPUT:
     RETVAL
+
+MODULE = Devel::Peek		PACKAGE = Devel::Peek	PREFIX = _
+
+SV *
+_CvGV(cv)
+    SV *cv