X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=run.c;h=3c1c3a267636e0f4b0318fecfb14dbe5e8fcc1de;hb=2680586ee66b8de4d2b5f26a2013220f2bec9d5f;hp=97444ec58e8994d673ef1d3ecf4528f3c078d599;hpb=4c2891ed1c6b8a97b3d1318b04ed56b17dd4de31;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/run.c b/run.c
index 97444ec..3c1c3a2 100644
--- a/run.c
+++ b/run.c
@@ -34,10 +34,6 @@ runops_standard(void)
 }
 
 #ifdef DEBUGGING
-
-dEXT char **watchaddr = 0;
-dEXT char *watchok;
-
 #ifndef PERL_OBJECT
 static void debprof _((OP*o));
 #endif
@@ -56,9 +52,9 @@ runops_debug(void)
 
     do {
 	if (PL_debug) {
-	    if (watchaddr != 0 && *watchaddr != watchok)
+	    if (PL_watchaddr != 0 && *PL_watchaddr != PL_watchok)
 		PerlIO_printf(Perl_debug_log, "WARNING: %lx changed from %lx to %lx\n",
-		    (long)watchaddr, (long)watchok, (long)*watchaddr);
+		    (long)PL_watchaddr, (long)PL_watchok, (long)*PL_watchaddr);
 	    DEBUG_s(debstack());
 	    DEBUG_t(debop(PL_op));
 	    DEBUG_P(debprof(PL_op));
@@ -77,7 +73,8 @@ debop(OP *o)
 {
 #ifdef DEBUGGING
     SV *sv;
-    deb("%s", op_name[o->op_type]);
+    STRLEN n_a;
+    deb("%s", PL_op_name[o->op_type]);
     switch (o->op_type) {
     case OP_CONST:
 	PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo->op_sv));
@@ -87,7 +84,7 @@ debop(OP *o)
 	if (cGVOPo->op_gv) {
 	    sv = NEWSV(0,0);
 	    gv_fullname3(sv, cGVOPo->op_gv, Nullch);
-	    PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, PL_na));
+	    PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, n_a));
 	    SvREFCNT_dec(sv);
 	}
 	else
@@ -105,10 +102,11 @@ void
 watch(char **addr)
 {
 #ifdef DEBUGGING
-    watchaddr = addr;
-    watchok = *addr;
+    dTHR;
+    PL_watchaddr = addr;
+    PL_watchok = *addr;
     PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
-	(long)watchaddr, (long)watchok);
+	(long)PL_watchaddr, (long)PL_watchok);
 #endif	/* DEBUGGING */
 }
 
@@ -133,7 +131,7 @@ debprofdump(void)
 	if (PL_profiledata[i])
 	    PerlIO_printf(Perl_debug_log,
 			  "%5lu %s\n", (unsigned long)PL_profiledata[i],
-                                       op_name[i]);
+                                       PL_op_name[i]);
     }
 #endif	/* DEBUGGING */
 }