-/* $RCSfile: dump.c,v $$Revision: 4.1 $$Date: 92/08/07 17:20:03 $
+/* dump.c
*
- * Copyright (c) 1991, Larry Wall
+ * Copyright (c) 1991-1997, Larry Wall
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
*
- * $Log: dump.c,v $
- * Revision 4.1 92/08/07 17:20:03 lwall
- * Stage 6 Snapshot
- *
- * Revision 4.0.1.2 92/06/08 13:14:22 lwall
- * patch20: removed implicit int declarations on funcions
- * patch20: fixed confusion between a *var's real name and its effective name
- *
- * Revision 4.0.1.1 91/06/07 10:58:44 lwall
- * patch4: new copyright notice
- *
- * Revision 4.0 91/03/20 01:08:25 lwall
- * 4.0 baseline.
- *
+ */
+
+/*
+ * "'You have talked long in your sleep, Frodo,' said Gandalf gently, 'and
+ * it has not been hard for me to read your mind and memory.'"
*/
#include "EXTERN.h"
}
#else /* Rest of file is for DEBUGGING */
+#ifdef I_STDARG
+static void dump(char *pat, ...);
+#else
static void dump();
+#endif
void
dump_all()
{
-#ifdef HAS_SETLINEBUF
- setlinebuf(stderr);
-#else
- setvbuf(stderr, Nullch, _IOLBF, 0);
-#endif
+ PerlIO_setlinebuf(Perl_debug_log);
if (main_root)
dump_op(main_root);
dump_packsubs(defstash);
dump_packsubs(stash)
HV* stash;
{
- U32 i;
+ I32 i;
HE *entry;
if (!HvARRAY(stash))
return;
- for (i = 0; i <= HvMAX(stash); i++) {
- for (entry = HvARRAY(stash)[i]; entry; entry = entry->hent_next) {
- GV *gv = (GV*)entry->hent_val;
+ for (i = 0; i <= (I32) HvMAX(stash); i++) {
+ for (entry = HvARRAY(stash)[i]; entry; entry = HeNEXT(entry)) {
+ GV *gv = (GV*)HeVAL(entry);
HV *hv;
- if (GvCV(gv))
+ if (GvCVu(gv))
dump_sub(gv);
if (GvFORM(gv))
dump_form(gv);
- if (*entry->hent_key == '_' && (hv = GvHV(gv)) && HvNAME(hv) &&
- hv != defstash)
+ if (HeKEY(entry)[HeKLEN(entry)-1] == ':' &&
+ (hv = GvHV(gv)) && HvNAME(hv) && hv != defstash)
dump_packsubs(hv); /* nested package */
}
}
{
SV *sv = sv_newmortal();
- gv_fullname(sv,gv);
+ gv_fullname3(sv, gv, Nullch);
dump("\nSUB %s = ", SvPVX(sv));
- if (CvUSERSUB(GvCV(gv)))
+ if (CvXSUB(GvCV(gv)))
dump("(xsub 0x%x %d)\n",
- (long)CvUSERSUB(GvCV(gv)),
- CvUSERINDEX(GvCV(gv)));
+ (long)CvXSUB(GvCV(gv)),
+ CvXSUBANY(GvCV(gv)).any_i32);
else if (CvROOT(GvCV(gv)))
dump_op(CvROOT(GvCV(gv)));
else
{
SV *sv = sv_newmortal();
- gv_fullname(sv,gv);
+ gv_fullname3(sv, gv, Nullch);
dump("\nFORMAT %s = ", SvPVX(sv));
if (CvROOT(GvFORM(gv)))
dump_op(CvROOT(GvFORM(gv)));
void
dump_eval()
{
- register I32 i;
- register GV *gv;
- register HE *entry;
-
dump_op(eval_root);
}
dump("{\n");
if (op->op_seq)
- fprintf(stderr, "%-4d", op->op_seq);
+ PerlIO_printf(Perl_debug_log, "%-4d", op->op_seq);
else
- fprintf(stderr, " ");
+ PerlIO_printf(Perl_debug_log, " ");
dump("TYPE = %s ===> ", op_name[op->op_type]);
if (op->op_next) {
if (op->op_seq)
- fprintf(stderr, "%d\n", op->op_next->op_seq);
+ PerlIO_printf(Perl_debug_log, "%d\n", op->op_next->op_seq);
else
- fprintf(stderr, "(%d)\n", op->op_next->op_seq);
+ PerlIO_printf(Perl_debug_log, "(%d)\n", op->op_next->op_seq);
}
else
- fprintf(stderr, "DONE\n");
+ PerlIO_printf(Perl_debug_log, "DONE\n");
dumplvl++;
if (op->op_targ) {
if (op->op_type == OP_NULL)
else
dump("TARG = %d\n", op->op_targ);
}
-#ifdef NOTDEF
+#ifdef DUMPADDR
dump("ADDR = 0x%lx => 0x%lx\n",op, op->op_next);
#endif
if (op->op_flags) {
*buf = '\0';
- if (op->op_flags & OPf_KNOW) {
- if (op->op_flags & OPf_LIST)
- (void)strcat(buf,"LIST,");
- else
- (void)strcat(buf,"SCALAR,");
- }
- else
+ switch (op->op_flags & OPf_WANT) {
+ case OPf_WANT_VOID:
+ (void)strcat(buf,"VOID,");
+ break;
+ case OPf_WANT_SCALAR:
+ (void)strcat(buf,"SCALAR,");
+ break;
+ case OPf_WANT_LIST:
+ (void)strcat(buf,"LIST,");
+ break;
+ default:
(void)strcat(buf,"UNKNOWN,");
+ break;
+ }
if (op->op_flags & OPf_KIDS)
(void)strcat(buf,"KIDS,");
if (op->op_flags & OPf_PARENS)
(void)strcat(buf,"PARENS,");
if (op->op_flags & OPf_STACKED)
(void)strcat(buf,"STACKED,");
- if (op->op_flags & OPf_LVAL)
- (void)strcat(buf,"LVAL,");
- if (op->op_flags & OPf_INTRO)
- (void)strcat(buf,"INTRO,");
+ if (op->op_flags & OPf_REF)
+ (void)strcat(buf,"REF,");
+ if (op->op_flags & OPf_MOD)
+ (void)strcat(buf,"MOD,");
if (op->op_flags & OPf_SPECIAL)
(void)strcat(buf,"SPECIAL,");
if (*buf)
if (op->op_private & OPpASSIGN_COMMON)
(void)strcat(buf,"COMMON,");
}
+ else if (op->op_type == OP_SASSIGN) {
+ if (op->op_private & OPpASSIGN_BACKWARDS)
+ (void)strcat(buf,"BACKWARDS,");
+ }
else if (op->op_type == OP_TRANS) {
if (op->op_private & OPpTRANS_SQUASH)
(void)strcat(buf,"SQUASH,");
if (op->op_private & OPpREPEAT_DOLIST)
(void)strcat(buf,"DOLIST,");
}
- else if (op->op_type == OP_ENTERSUBR ||
+ else if (op->op_type == OP_ENTERSUB ||
op->op_type == OP_RV2SV ||
op->op_type == OP_RV2AV ||
op->op_type == OP_RV2HV ||
op->op_type == OP_AELEM ||
op->op_type == OP_HELEM )
{
- if (op->op_private & OPpDEREF_DB)
- (void)strcat(buf,"DB,");
- if (op->op_private & OPpDEREF_AV)
- (void)strcat(buf,"AV,");
- if (op->op_private & OPpDEREF_HV)
- (void)strcat(buf,"HV,");
- if (op->op_private & HINT_STRICT_REFS)
- (void)strcat(buf,"STRICT_REFS,");
+ if (op->op_type == OP_ENTERSUB) {
+ if (op->op_private & OPpENTERSUB_AMPER)
+ (void)strcat(buf,"AMPER,");
+ if (op->op_private & OPpENTERSUB_DB)
+ (void)strcat(buf,"DB,");
+ }
+ switch (op->op_private & OPpDEREF) {
+ case OPpDEREF_SV:
+ (void)strcat(buf, "SV,");
+ break;
+ case OPpDEREF_AV:
+ (void)strcat(buf, "AV,");
+ break;
+ case OPpDEREF_HV:
+ (void)strcat(buf, "HV,");
+ break;
+ }
+ if (op->op_type == OP_AELEM || op->op_type == OP_HELEM) {
+ if (op->op_private & OPpLVAL_DEFER)
+ (void)strcat(buf,"LVAL_DEFER,");
+ }
+ else {
+ if (op->op_private & HINT_STRICT_REFS)
+ (void)strcat(buf,"STRICT_REFS,");
+ }
}
else if (op->op_type == OP_CONST) {
if (op->op_private & OPpCONST_BARE)
if (op->op_private & OPpFLIP_LINENUM)
(void)strcat(buf,"LINENUM,");
}
+ if (op->op_flags & OPf_MOD && op->op_private & OPpLVAL_INTRO)
+ (void)strcat(buf,"INTRO,");
if (*buf) {
buf[strlen(buf)-1] = '\0';
dump("PRIVATE = (%s)\n",buf);
ENTER;
tmpsv = NEWSV(0,0);
SAVEFREESV(tmpsv);
- gv_fullname(tmpsv,cGVOP->op_gv);
+ gv_fullname3(tmpsv, cGVOP->op_gv, Nullch);
dump("GV = %s\n", SvPV(tmpsv, na));
LEAVE;
}
case OP_ENTERLOOP:
dump("REDO ===> ");
if (cLOOP->op_redoop)
- fprintf(stderr, "%d\n", cLOOP->op_redoop->op_seq);
+ PerlIO_printf(Perl_debug_log, "%d\n", cLOOP->op_redoop->op_seq);
else
- fprintf(stderr, "DONE\n");
+ PerlIO_printf(Perl_debug_log, "DONE\n");
dump("NEXT ===> ");
if (cLOOP->op_nextop)
- fprintf(stderr, "%d\n", cLOOP->op_nextop->op_seq);
+ PerlIO_printf(Perl_debug_log, "%d\n", cLOOP->op_nextop->op_seq);
else
- fprintf(stderr, "DONE\n");
+ PerlIO_printf(Perl_debug_log, "DONE\n");
dump("LAST ===> ");
if (cLOOP->op_lastop)
- fprintf(stderr, "%d\n", cLOOP->op_lastop->op_seq);
+ PerlIO_printf(Perl_debug_log, "%d\n", cLOOP->op_lastop->op_seq);
else
- fprintf(stderr, "DONE\n");
+ PerlIO_printf(Perl_debug_log, "DONE\n");
break;
case OP_COND_EXPR:
dump("TRUE ===> ");
if (cCONDOP->op_true)
- fprintf(stderr, "%d\n", cCONDOP->op_true->op_seq);
+ PerlIO_printf(Perl_debug_log, "%d\n", cCONDOP->op_true->op_seq);
else
- fprintf(stderr, "DONE\n");
+ PerlIO_printf(Perl_debug_log, "DONE\n");
dump("FALSE ===> ");
if (cCONDOP->op_false)
- fprintf(stderr, "%d\n", cCONDOP->op_false->op_seq);
+ PerlIO_printf(Perl_debug_log, "%d\n", cCONDOP->op_false->op_seq);
else
- fprintf(stderr, "DONE\n");
+ PerlIO_printf(Perl_debug_log, "DONE\n");
break;
+ case OP_MAPWHILE:
case OP_GREPWHILE:
case OP_OR:
case OP_AND:
- case OP_METHOD:
dump("OTHER ===> ");
if (cLOGOP->op_other)
- fprintf(stderr, "%d\n", cLOGOP->op_other->op_seq);
+ PerlIO_printf(Perl_debug_log, "%d\n", cLOGOP->op_other->op_seq);
else
- fprintf(stderr, "DONE\n");
+ PerlIO_printf(Perl_debug_log, "DONE\n");
break;
case OP_PUSHRE:
case OP_MATCH:
case OP_SUBST:
dump_pm((PMOP*)op);
break;
+ default:
+ break;
}
if (op->op_flags & OPf_KIDS) {
OP *kid;
SV *sv;
if (!gv) {
- fprintf(stderr,"{}\n");
+ PerlIO_printf(Perl_debug_log, "{}\n");
return;
}
sv = sv_newmortal();
dumplvl++;
- fprintf(stderr,"{\n");
- gv_fullname(sv,gv);
+ PerlIO_printf(Perl_debug_log, "{\n");
+ gv_fullname3(sv, gv, Nullch);
dump("GV_NAME = %s", SvPVX(sv));
if (gv != GvEGV(gv)) {
- gv_efullname(sv,GvEGV(gv));
+ gv_efullname3(sv, GvEGV(gv), Nullch);
dump("-> %s", SvPVX(sv));
}
dump("\n");
(void)strcat(buf,"ALL,");
if (pm->op_pmflags & PMf_SKIPWHITE)
(void)strcat(buf,"SKIPWHITE,");
- if (pm->op_pmflags & PMf_FOLD)
- (void)strcat(buf,"FOLD,");
if (pm->op_pmflags & PMf_CONST)
(void)strcat(buf,"CONST,");
if (pm->op_pmflags & PMf_KEEP)
dump("}\n");
}
+
+#if !defined(I_STDARG) && !defined(I_VARARGS)
/* VARARGS1 */
static void dump(arg1,arg2,arg3,arg4,arg5)
char *arg1;
I32 i;
for (i = dumplvl*4; i; i--)
- (void)putc(' ',stderr);
- fprintf(stderr,arg1, arg2, arg3, arg4, arg5);
+ (void)PerlIO_putc(Perl_debug_log,' ');
+ PerlIO_printf(Perl_debug_log, arg1, arg2, arg3, arg4, arg5);
}
+
+#else
+
+#ifdef I_STDARG
+static void
+dump(char *pat,...)
+#else
+/*VARARGS0*/
+static void
+dump(pat,va_alist)
+ char *pat;
+ va_dcl
+#endif
+{
+ I32 i;
+ va_list args;
+
+#ifdef I_STDARG
+ va_start(args, pat);
+#else
+ va_start(args);
+#endif
+ for (i = dumplvl*4; i; i--)
+ (void)PerlIO_putc(Perl_debug_log,' ');
+ PerlIO_vprintf(Perl_debug_log,pat,args);
+ va_end(args);
+}
+#endif
+
#endif
projects / p5sagit/p5-mst-13.2.git / blobdiff