*/
#ifdef PERL_OBJECT
-#define CALLOP this->*op
+#define CALLOP this->*PL_op
#else
-#define CALLOP *op
+#define CALLOP *PL_op
#endif
int
{
dTHR;
- while ( op = (CALLOP->op_ppaddr)(ARGS) ) ;
+ while ( PL_op = (CALLOP->op_ppaddr)(ARGS) ) ;
TAINT_NOT;
return 0;
}
#ifdef DEBUGGING
-
-dEXT char **watchaddr = 0;
-dEXT char *watchok;
-
#ifndef PERL_OBJECT
static void debprof _((OP*o));
#endif
{
#ifdef DEBUGGING
dTHR;
- if (!op) {
+ if (!PL_op) {
warn("NULL OP IN RUN");
return 0;
}
do {
- if (debug) {
- if (watchaddr != 0 && *watchaddr != watchok)
+ if (PL_debug) {
+ 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(op));
- DEBUG_P(debprof(op));
+ DEBUG_t(debop(PL_op));
+ DEBUG_P(debprof(PL_op));
}
- } while ( op = (CALLOP->op_ppaddr)(ARGS) );
+ } while ( PL_op = (CALLOP->op_ppaddr)(ARGS) );
TAINT_NOT;
return 0;
{
#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));
if (cGVOPo->op_gv) {
sv = NEWSV(0,0);
gv_fullname3(sv, cGVOPo->op_gv, Nullch);
- PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, na));
+ PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, n_a));
SvREFCNT_dec(sv);
}
else
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 */
}
debprof(OP *o)
{
#ifdef DEBUGGING
- if (!profiledata)
- New(000, profiledata, MAXO, U32);
- ++profiledata[o->op_type];
+ if (!PL_profiledata)
+ Newz(000, PL_profiledata, MAXO, U32);
+ ++PL_profiledata[o->op_type];
#endif /* DEBUGGING */
}
{
#ifdef DEBUGGING
unsigned i;
- if (!profiledata)
+ if (!PL_profiledata)
return;
for (i = 0; i < MAXO; i++) {
- if (profiledata[i])
+ if (PL_profiledata[i])
PerlIO_printf(Perl_debug_log,
- "%u\t%lu\n", i, (unsigned long)profiledata[i]);
+ "%5lu %s\n", (unsigned long)PL_profiledata[i],
+ PL_op_name[i]);
}
#endif /* DEBUGGING */
}