* know. Run now! Hope is in speed!" --Gandalf
*/
+#ifdef PERL_OBJECT
+#define CALLOP this->*PL_op
+#else
+#define CALLOP *PL_op
+#endif
int
runops_standard(void)
{
dTHR;
- while ( op = (*op->op_ppaddr)(ARGS) ) ;
+ while ( PL_op = (CALLOP->op_ppaddr)(ARGS) ) ;
TAINT_NOT;
return 0;
dEXT char **watchaddr = 0;
dEXT char *watchok;
+#ifndef PERL_OBJECT
static void debprof _((OP*o));
+#endif
#endif /* DEBUGGING */
{
#ifdef DEBUGGING
dTHR;
- if (!op) {
+ if (!PL_op) {
warn("NULL OP IN RUN");
return 0;
}
do {
- if (debug) {
+ if (PL_debug) {
if (watchaddr != 0 && *watchaddr != watchok)
PerlIO_printf(Perl_debug_log, "WARNING: %lx changed from %lx to %lx\n",
(long)watchaddr, (long)watchok, (long)*watchaddr);
DEBUG_s(debstack());
- DEBUG_t(debop(op));
- DEBUG_P(debprof(op));
+ DEBUG_t(debop(PL_op));
+ DEBUG_P(debprof(PL_op));
}
- } while ( op = (*op->op_ppaddr)(ARGS) );
+ } while ( PL_op = (CALLOP->op_ppaddr)(ARGS) );
TAINT_NOT;
return 0;
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, PL_na));
SvREFCNT_dec(sv);
}
else
#endif /* DEBUGGING */
}
-#ifdef DEBUGGING
-static void
+STATIC void
debprof(OP *o)
{
- if (!profiledata)
- New(000, profiledata, MAXO, U32);
- ++profiledata[o->op_type];
+#ifdef DEBUGGING
+ if (!PL_profiledata)
+ Newz(000, PL_profiledata, MAXO, U32);
+ ++PL_profiledata[o->op_type];
+#endif /* DEBUGGING */
}
-#endif /* DEBUGGING */
void
debprofdump(void)
{
#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],
+ op_name[i]);
}
#endif /* DEBUGGING */
}