X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/e4555ecffb7d38bbad515b6666701652c73c5b85..a5c7cb08f7954af4accf63bfffaab1bd61f1dd68:/dump.c diff --git a/dump.c b/dump.c index 015bc49..1c64449 100644 --- a/dump.c +++ b/dump.c @@ -94,40 +94,43 @@ S_append_flags(pTHX_ SV *sv, U32 flags, const struct flag_to_name *start, /* =for apidoc pv_escape -Escapes at most the first "count" chars of pv and puts the results into -dsv such that the size of the escaped string will not exceed "max" chars -and will not contain any incomplete escape sequences. - -If flags contains PERL_PV_ESCAPE_QUOTE then any double quotes in the string +Escapes at most the first C chars of C and puts the results into +C such that the size of the escaped string will not exceed C chars +and will not contain any incomplete escape sequences. The number of bytes +escaped will be returned in the C parameter if it is not null. +When the C parameter is null no escaping actually occurs, but the number +of bytes that would be escaped were it not null will be calculated. + +If flags contains C then any double quotes in the string will also be escaped. Normally the SV will be cleared before the escaped string is prepared, -but when PERL_PV_ESCAPE_NOCLEAR is set this will not occur. +but when C is set this will not occur. -If PERL_PV_ESCAPE_UNI is set then the input string is treated as Unicode, -if PERL_PV_ESCAPE_UNI_DETECT is set then the input string is scanned -using C to determine if it is Unicode. +If C is set then the input string is treated as UTF-8 +if C is set then the input string is scanned +using C to determine if it is UTF-8. -If PERL_PV_ESCAPE_ALL is set then all input chars will be output -using C<\x01F1> style escapes, otherwise if PERL_PV_ESCAPE_NONASCII is set, only +If C is set then all input chars will be output +using C<\x01F1> style escapes, otherwise if C is set, only non-ASCII chars will be escaped using this style; otherwise, only chars above 255 will be so escaped; other non printable chars will use octal or common escaped patterns like C<\n>. -Otherwise, if PERL_PV_ESCAPE_NOBACKSLASH +Otherwise, if C then all chars below 255 will be treated as printable and will be output as literals. -If PERL_PV_ESCAPE_FIRSTCHAR is set then only the first char of the +If C is set then only the first char of the string will be escaped, regardless of max. If the output is to be in hex, then it will be returned as a plain hex sequence. Thus the output will either be a single char, an octal escape sequence, a special escape like C<\n> or a hex value. -If PERL_PV_ESCAPE_RE is set then the escape char used will be a '%' and -not a '\\'. This is because regexes very often contain backslashed -sequences, whereas '%' is not a particularly common character in patterns. +If C is set then the escape char used will be a C<"%"> and +not a C<"\\">. This is because regexes very often contain backslashed +sequences, whereas C<"%"> is not a particularly common character in patterns. -Returns a pointer to the escaped text as held by dsv. +Returns a pointer to the escaped text as held by C. =cut */ @@ -144,16 +147,16 @@ Perl_pv_escape( pTHX_ SV *dsv, char const * const str, STRLEN wrote = 0; /* chars written so far */ STRLEN chsize = 0; /* size of data to be written */ STRLEN readsize = 1; /* size of data just read */ - bool isuni= flags & PERL_PV_ESCAPE_UNI ? 1 : 0; /* is this Unicode */ + bool isuni= flags & PERL_PV_ESCAPE_UNI ? 1 : 0; /* is this UTF-8 */ const char *pv = str; const char * const end = pv + count; /* end of string */ octbuf[0] = esc; PERL_ARGS_ASSERT_PV_ESCAPE; - if (!(flags & PERL_PV_ESCAPE_NOCLEAR)) { + if (dsv && !(flags & PERL_PV_ESCAPE_NOCLEAR)) { /* This won't alter the UTF-8 flag */ - sv_setpvs(dsv, ""); + SvPVCLEAR(dsv); } if ((flags & PERL_PV_ESCAPE_UNI_DETECT) && is_utf8_string((U8*)pv, count)) @@ -221,7 +224,8 @@ Perl_pv_escape( pTHX_ SV *dsv, char const * const str, if ( max && (wrote + chsize > max) ) { break; } else if (chsize > 1) { - sv_catpvn(dsv, octbuf, chsize); + if (dsv) + sv_catpvn(dsv, octbuf, chsize); wrote += chsize; } else { /* If PERL_PV_ESCAPE_NOBACKSLASH is set then non-ASCII bytes @@ -230,7 +234,8 @@ Perl_pv_escape( pTHX_ SV *dsv, char const * const str, Or add a new API call sv_catpvc(). Think about that name, and how to keep it clear that it's unlike the s of catpvs, which is really an array of octets, not a string. */ - Perl_sv_catpvf( aTHX_ dsv, "%c", c); + if (dsv) + Perl_sv_catpvf( aTHX_ dsv, "%c", c); wrote++; } if ( flags & PERL_PV_ESCAPE_FIRSTCHAR ) @@ -238,29 +243,29 @@ Perl_pv_escape( pTHX_ SV *dsv, char const * const str, } if (escaped != NULL) *escaped= pv - str; - return SvPVX(dsv); + return dsv ? SvPVX(dsv) : NULL; } /* =for apidoc pv_pretty Converts a string into something presentable, handling escaping via -pv_escape() and supporting quoting and ellipses. +C and supporting quoting and ellipses. -If the PERL_PV_PRETTY_QUOTE flag is set then the result will be +If the C flag is set then the result will be double quoted with any double quotes in the string escaped. Otherwise -if the PERL_PV_PRETTY_LTGT flag is set then the result be wrapped in +if the C flag is set then the result be wrapped in angle brackets. -If the PERL_PV_PRETTY_ELLIPSES flag is set and not all characters in +If the C flag is set and not all characters in string were output then an ellipsis C<...> will be appended to the string. Note that this happens AFTER it has been quoted. -If start_color is non-null then it will be inserted after the opening -quote (if there is one) but before the escaped text. If end_color +If C is non-null then it will be inserted after the opening +quote (if there is one) but before the escaped text. If C is non-null then it will be inserted after the escaped text but before any quotes or ellipses. -Returns a pointer to the prettified text as held by dsv. +Returns a pointer to the prettified text as held by C. =cut */ @@ -270,36 +275,51 @@ Perl_pv_pretty( pTHX_ SV *dsv, char const * const str, const STRLEN count, const STRLEN max, char const * const start_color, char const * const end_color, const U32 flags ) { - const U8 dq = (flags & PERL_PV_PRETTY_QUOTE) ? '"' : '%'; + const U8 *quotes = (U8*)((flags & PERL_PV_PRETTY_QUOTE) ? "\"\"" : + (flags & PERL_PV_PRETTY_LTGT) ? "<>" : NULL); STRLEN escaped; + STRLEN max_adjust= 0; + STRLEN orig_cur; PERL_ARGS_ASSERT_PV_PRETTY; if (!(flags & PERL_PV_PRETTY_NOCLEAR)) { - /* This won't alter the UTF-8 flag */ - sv_setpvs(dsv, ""); + /* This won't alter the UTF-8 flag */ + SvPVCLEAR(dsv); } + orig_cur= SvCUR(dsv); - if ( dq == '"' ) - sv_catpvs(dsv, "\""); - else if ( flags & PERL_PV_PRETTY_LTGT ) - sv_catpvs(dsv, "<"); + if ( quotes ) + Perl_sv_catpvf(aTHX_ dsv, "%c", quotes[0]); if ( start_color != NULL ) sv_catpv(dsv, start_color); - - pv_escape( dsv, str, count, max, &escaped, flags | PERL_PV_ESCAPE_NOCLEAR ); - + + if ((flags & PERL_PV_PRETTY_EXACTSIZE)) { + if (quotes) + max_adjust += 2; + assert(max > max_adjust); + pv_escape( NULL, str, count, max - max_adjust, &escaped, flags ); + if ( (flags & PERL_PV_PRETTY_ELLIPSES) && ( escaped < count ) ) + max_adjust += 3; + assert(max > max_adjust); + } + + pv_escape( dsv, str, count, max - max_adjust, &escaped, flags | PERL_PV_ESCAPE_NOCLEAR ); + if ( end_color != NULL ) sv_catpv(dsv, end_color); - if ( dq == '"' ) - sv_catpvs( dsv, "\""); - else if ( flags & PERL_PV_PRETTY_LTGT ) - sv_catpvs(dsv, ">"); + if ( quotes ) + Perl_sv_catpvf(aTHX_ dsv, "%c", quotes[1]); if ( (flags & PERL_PV_PRETTY_ELLIPSES) && ( escaped < count ) ) sv_catpvs(dsv, "..."); + + if ((flags & PERL_PV_PRETTY_EXACTSIZE)) { + while( SvCUR(dsv) - orig_cur < max ) + sv_catpvs(dsv," "); + } return SvPVX(dsv); } @@ -338,7 +358,7 @@ Perl_sv_peek(pTHX_ SV *sv) int unref = 0; U32 type; - sv_setpvs(t, ""); + SvPVCLEAR(t); retry: if (!sv) { sv_catpv(t, "VOID"); @@ -401,11 +421,14 @@ Perl_sv_peek(pTHX_ SV *sv) break; } } - if (SvREFCNT(sv) > 1) - Perl_sv_catpvf(aTHX_ t, "<%"UVuf"%s>", (UV)SvREFCNT(sv), - is_tmp ? "T" : ""); - else if (is_tmp) - sv_catpv(t, ""); + if (is_tmp || SvREFCNT(sv) > 1) { + Perl_sv_catpvf(aTHX_ t, "<"); + if (SvREFCNT(sv) > 1) + Perl_sv_catpvf(aTHX_ t, "%"UVuf, (UV)SvREFCNT(sv)); + if (is_tmp) + Perl_sv_catpvf(aTHX_ t, "%s", SvTEMP(t) ? "T" : "t"); + Perl_sv_catpvf(aTHX_ t, ">"); + } } if (SvROK(sv)) { @@ -457,9 +480,9 @@ Perl_sv_peek(pTHX_ SV *sv) } } else if (SvNOKp(sv)) { - STORE_NUMERIC_LOCAL_SET_STANDARD(); + STORE_LC_NUMERIC_UNDERLYING_SET_STANDARD(); Perl_sv_catpvf(aTHX_ t, "(%"NVgf")",SvNVX(sv)); - RESTORE_NUMERIC_LOCAL(); + RESTORE_LC_NUMERIC_UNDERLYING(); } else if (SvIOKp(sv)) { if (SvIsUV(sv)) @@ -552,7 +575,10 @@ Perl_dump_packsubs_perl(pTHX_ const HV *stash, bool justperl) for (i = 0; i <= (I32) HvMAX(stash); i++) { const HE *entry; for (entry = HvARRAY(stash)[i]; entry; entry = HeNEXT(entry)) { - const GV * const gv = (const GV *)HeVAL(entry); + GV * gv = (GV *)HeVAL(entry); + if (SvROK(gv) && SvTYPE(SvRV(gv)) == SVt_PVCV) + /* unfake a fake GV */ + (void)CvGV(SvRV(gv)); if (SvTYPE(gv) != SVt_PVGV || !GvGP(gv)) continue; if (GvCVu(gv)) @@ -631,26 +657,29 @@ Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm) PERL_ARGS_ASSERT_DO_PMOP_DUMP; - if (!pm) { - Perl_dump_indent(aTHX_ level, file, "{}\n"); + if (!pm) return; - } - Perl_dump_indent(aTHX_ level, file, "{\n"); - level++; if (pm->op_pmflags & PMf_ONCE) ch = '?'; else ch = '/'; if (PM_GETRE(pm)) - Perl_dump_indent(aTHX_ level, file, "PMf_PRE %c%s%c%s\n", - ch, RX_PRECOMP(PM_GETRE(pm)), ch, + Perl_dump_indent(aTHX_ level, file, "PMf_PRE %c%.*s%c%s\n", + ch,(int)RX_PRELEN(PM_GETRE(pm)), RX_PRECOMP(PM_GETRE(pm)), ch, (pm->op_private & OPpRUNTIME) ? " (RUNTIME)" : ""); else Perl_dump_indent(aTHX_ level, file, "PMf_PRE (RUNTIME)\n"); - if (pm->op_type != OP_PUSHRE && pm->op_pmreplrootu.op_pmreplroot) { - Perl_dump_indent(aTHX_ level, file, "PMf_REPL = "); - op_dump(pm->op_pmreplrootu.op_pmreplroot); + + if (pm->op_type == OP_SPLIT) + Perl_dump_indent(aTHX_ level, file, "TARGOFF/GV = 0x%"UVxf"\n", + PTR2UV(pm->op_pmreplrootu.op_pmtargetgv)); + else { + if (pm->op_pmreplrootu.op_pmreplroot) { + Perl_dump_indent(aTHX_ level, file, "PMf_REPL = "); + op_dump(pm->op_pmreplrootu.op_pmreplroot); + } } + if (pm->op_code_list) { if (pm->op_pmflags & PMf_CODELIST_PRIVATE) { Perl_dump_indent(aTHX_ level, file, "CODE_LIST =\n"); @@ -665,8 +694,6 @@ Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm) Perl_dump_indent(aTHX_ level, file, "PMFLAGS = (%s)\n", SvCUR(tmpsv) ? SvPVX_const(tmpsv) + 1 : ""); SvREFCNT_dec_NN(tmpsv); } - - Perl_dump_indent(aTHX_ level-1, file, "}\n"); } const struct flag_to_name pmflags_flags_names[] = { @@ -792,30 +819,6 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) if (o->op_targ) { if (optype == OP_NULL) { Perl_dump_indent(aTHX_ level, file, " (was %s)\n", PL_op_name[o->op_targ]); - if (o->op_targ == OP_NEXTSTATE) { - if (CopLINE(cCOPo)) - Perl_dump_indent(aTHX_ level, file, "LINE = %"UVuf"\n", - (UV)CopLINE(cCOPo)); - if (CopSTASHPV(cCOPo)) { - SV* tmpsv = newSVpvs_flags("", SVs_TEMP); - HV *stash = CopSTASH(cCOPo); - const char * const hvname = HvNAME_get(stash); - - Perl_dump_indent(aTHX_ level, file, "PACKAGE = \"%s\"\n", - generic_pv_escape( tmpsv, hvname, HvNAMELEN(stash), HvNAMEUTF8(stash))); - } - if (CopLABEL(cCOPo)) { - SV* tmpsv = newSVpvs_flags("", SVs_TEMP); - STRLEN label_len; - U32 label_flags; - const char *label = CopLABEL_len_flags(cCOPo, - &label_len, - &label_flags); - Perl_dump_indent(aTHX_ level, file, "LABEL = \"%s\"\n", - generic_pv_escape( tmpsv, label, label_len,(label_flags & SVf_UTF8))); - } - - } } else Perl_dump_indent(aTHX_ level, file, "TARG = %ld\n", (long)o->op_targ); @@ -845,7 +848,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) if (o->op_savefree) sv_catpvs(tmpsv, ",SAVEFREE"); if (o->op_static) sv_catpvs(tmpsv, ",STATIC"); if (o->op_folded) sv_catpvs(tmpsv, ",FOLDED"); - if (o->op_lastsib) sv_catpvs(tmpsv, ",LASTSIB"); + if (o->op_moresib) sv_catpvs(tmpsv, ",MORESIB"); Perl_dump_indent(aTHX_ level, file, "FLAGS = (%s)\n", SvCUR(tmpsv) ? SvPVX_const(tmpsv) + 1 : ""); } @@ -906,7 +909,10 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) sv_catpv(tmpsv, &PL_op_private_labels[label]); sv_catpv(tmpsv, "="); } - sv_catpv(tmpsv, &PL_op_private_labels[enum_label]); + if (enum_label == -1) + Perl_sv_catpvf(aTHX_ tmpsv, "0x%"UVxf, (UV)val); + else + sv_catpv(tmpsv, &PL_op_private_labels[enum_label]); } else { @@ -956,15 +962,35 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) } #endif break; + + case OP_MULTIDEREF: + { + UNOP_AUX_item *items = cUNOP_AUXo->op_aux; + UV i, count = items[-1].uv; + + Perl_dump_indent(aTHX_ level, file, "ARGS = \n"); + for (i=0; i < count; i++) + Perl_dump_indent(aTHX_ level+1, file, "%"UVuf" => 0x%"UVxf"\n", + i, items[i].uv); + break; + } + case OP_CONST: case OP_HINTSEVAL: case OP_METHOD_NAMED: + case OP_METHOD_SUPER: + case OP_METHOD_REDIR: + case OP_METHOD_REDIR_SUPER: #ifndef USE_ITHREADS /* with ITHREADS, consts are stored in the pad, and the right pad * may not be active here, so skip */ - Perl_dump_indent(aTHX_ level, file, "SV = %s\n", SvPEEK(cSVOPo_sv)); + Perl_dump_indent(aTHX_ level, file, "SV = %s\n", SvPEEK(cMETHOPx_meth(o))); #endif break; + case OP_NULL: + if (o->op_targ != OP_NEXTSTATE && o->op_targ != OP_DBSTATE) + break; + /* FALLTHROUGH */ case OP_NEXTSTATE: case OP_DBSTATE: if (CopLINE(cCOPo)) @@ -989,6 +1015,8 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) generic_pv_escape( tmpsv, label, label_len, (label_flags & SVf_UTF8))); } + Perl_dump_indent(aTHX_ level, file, "SEQ = %u\n", + (unsigned int)cCOPo->cop_seq); break; case OP_ENTERLOOP: Perl_dump_indent(aTHX_ level, file, "REDO ===> "); @@ -1019,7 +1047,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) else PerlIO_printf(file, "DONE\n"); break; - case OP_PUSHRE: + case OP_SPLIT: case OP_MATCH: case OP_QR: case OP_SUBST: @@ -1039,7 +1067,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) } if (o->op_flags & OPf_KIDS) { OP *kid; - for (kid = cUNOPo->op_first; kid; kid = OP_SIBLING(kid)) + for (kid = cUNOPo->op_first; kid; kid = OpSIBLING(kid)) do_op_dump(level, file, kid); } Perl_dump_indent(aTHX_ level-1, file, "}\n"); @@ -1067,9 +1095,6 @@ Perl_gv_dump(pTHX_ GV *gv) const char* name; SV *sv, *tmp = newSVpvs_flags("", SVs_TEMP); - - PERL_ARGS_ASSERT_GV_DUMP; - if (!gv) { PerlIO_printf(Perl_debug_log, "{}\n"); return; @@ -1086,7 +1111,7 @@ Perl_gv_dump(pTHX_ GV *gv) Perl_dump_indent(aTHX_ 1, Perl_debug_log, "-> %s", generic_pv_escape( tmp, name, len, SvUTF8(sv) )); } - PerlIO_putc(Perl_debug_log, '\n'); + (void)PerlIO_putc(Perl_debug_log, '\n'); Perl_dump_indent(aTHX_ 0, Perl_debug_log, "}\n"); } @@ -1096,7 +1121,7 @@ Perl_gv_dump(pTHX_ GV *gv) */ static const struct { const char type; const char *name; } magic_names[] = { -#include "mg_names.c" +#include "mg_names.inc" /* this null string terminates the list */ { 0, NULL }, }; @@ -1207,7 +1232,7 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 " ???? - " __FILE__ " does not know how to handle this MG_LEN" ); - PerlIO_putc(file, '\n'); + (void)PerlIO_putc(file, '\n'); } if (mg->mg_type == PERL_MAGIC_utf8) { const STRLEN * const cache = (STRLEN *) mg->mg_ptr; @@ -1250,7 +1275,7 @@ Perl_do_hv_dump(pTHX_ I32 level, PerlIO *file, const char *name, HV *sv) HvNAMELEN(sv), HvNAMEUTF8(sv))); } else - PerlIO_putc(file, '\n'); + (void)PerlIO_putc(file, '\n'); } void @@ -1265,7 +1290,7 @@ Perl_do_gv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv) generic_pv_escape( tmpsv, GvNAME(sv), GvNAMELEN(sv), GvNAMEUTF8(sv) )); } else - PerlIO_putc(file, '\n'); + (void)PerlIO_putc(file, '\n'); } void @@ -1289,7 +1314,7 @@ Perl_do_gvgv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv) generic_pv_escape( tmp, GvNAME(sv), GvNAMELEN(sv), GvNAMEUTF8(sv))); } else - PerlIO_putc(file, '\n'); + (void)PerlIO_putc(file, '\n'); } const struct flag_to_name first_sv_flags_names[] = { @@ -1307,9 +1332,8 @@ const struct flag_to_name second_sv_flags_names[] = { {SVf_OOK, "OOK,"}, {SVf_FAKE, "FAKE,"}, {SVf_READONLY, "READONLY,"}, - {SVf_IsCOW, "IsCOW,"}, + {SVf_PROTECT, "PROTECT,"}, {SVf_BREAK, "BREAK,"}, - {SVf_AMAGIC, "OVERLOAD,"}, {SVp_IOK, "pIOK,"}, {SVp_NOK, "pNOK,"}, {SVp_POK, "pPOK,"} @@ -1339,6 +1363,7 @@ const struct flag_to_name hv_flags_names[] = { {SVphv_SHAREKEYS, "SHAREKEYS,"}, {SVphv_LAZYDEL, "LAZYDEL,"}, {SVphv_HASKFLAGS, "HASKFLAGS,"}, + {SVf_AMAGIC, "OVERLOAD,"}, {SVphv_CLONEABLE, "CLONEABLE,"} }; @@ -1346,7 +1371,6 @@ const struct flag_to_name gp_flags_names[] = { {GVf_INTRO, "INTRO,"}, {GVf_MULTI, "MULTI,"}, {GVf_ASSUMECV, "ASSUMECV,"}, - {GVf_IN_PAD, "IN_PAD,"} }; const struct flag_to_name gp_flags_imported_names[] = { @@ -1364,7 +1388,9 @@ const struct flag_to_name regexp_extflags_names[] = { {RXf_PMf_SINGLELINE, "PMf_SINGLELINE,"}, {RXf_PMf_FOLD, "PMf_FOLD,"}, {RXf_PMf_EXTENDED, "PMf_EXTENDED,"}, + {RXf_PMf_EXTENDED_MORE, "PMf_EXTENDED_MORE,"}, {RXf_PMf_KEEPCOPY, "PMf_KEEPCOPY,"}, + {RXf_PMf_NOCAPTURE, "PMf_NOCAPURE,"}, {RXf_IS_ANCHORED, "IS_ANCHORED,"}, {RXf_NO_INPLACE_SUBST, "NO_INPLACE_SUBST,"}, {RXf_EVAL_SEEN, "EVAL_SEEN,"}, @@ -1394,15 +1420,23 @@ const struct flag_to_name regexp_core_intflags_names[] = { {PREGf_CUTGROUP_SEEN, "CUTGROUP_SEEN,"}, {PREGf_USE_RE_EVAL, "USE_RE_EVAL,"}, {PREGf_NOSCAN, "NOSCAN,"}, - {PREGf_CANY_SEEN, "CANY_SEEN,"}, {PREGf_GPOS_SEEN, "GPOS_SEEN,"}, {PREGf_GPOS_FLOAT, "GPOS_FLOAT,"}, - {PREGf_ANCH_BOL, "ANCH_BOL,"}, {PREGf_ANCH_MBOL, "ANCH_MBOL,"}, {PREGf_ANCH_SBOL, "ANCH_SBOL,"}, {PREGf_ANCH_GPOS, "ANCH_GPOS,"}, }; +/* Perl_do_sv_dump(): + * + * level: amount to indent the output + * sv: the object to dump + * nest: the current level of recursion + * maxnest: the maximum allowed level of recursion + * dumpops: if true, also dump the ops associated with a CV + * pvlim: limit on the length of any strings that are output + * */ + void Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim) { @@ -1429,21 +1463,16 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo (int)(PL_dumpindent*level), "", (IV)SvREFCNT(sv), (int)(PL_dumpindent*level), ""); - if (!((flags & SVpad_NAME) == SVpad_NAME - && (type == SVt_PVMG || type == SVt_PVNV))) { - if ((flags & SVs_PADMY) && (flags & SVs_PADSTALE)) + if ((flags & SVs_PADSTALE)) sv_catpv(d, "PADSTALE,"); - } - if (!((flags & SVpad_NAME) == SVpad_NAME && type == SVt_PVMG)) { - if (!(flags & SVs_PADMY) && (flags & SVs_PADTMP)) + if ((flags & SVs_PADTMP)) sv_catpv(d, "PADTMP,"); - if (flags & SVs_PADMY) sv_catpv(d, "PADMY,"); - } append_flags(d, flags, first_sv_flags_names); if (flags & SVf_ROK) { sv_catpv(d, "ROK,"); if (SvWEAKREF(sv)) sv_catpv(d, "WEAKREF,"); } + if (flags & SVf_IsCOW && type != SVt_PVHV) sv_catpvs(d, "IsCOW,"); append_flags(d, flags, second_sv_flags_names); if (flags & SVp_SCREAM && type != SVt_PVHV && !isGV_with_GP(sv) && type != SVt_PVAV) { @@ -1479,22 +1508,12 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } } /* FALLTHROUGH */ + case SVt_PVMG: default: - evaled_or_uv: - if (SvEVALED(sv)) sv_catpv(d, "EVALED,"); if (SvIsUV(sv) && !(flags & SVf_ROK)) sv_catpv(d, "IsUV,"); break; - case SVt_PVMG: - if (SvTAIL(sv)) sv_catpv(d, "TAIL,"); - if (SvVALID(sv)) sv_catpv(d, "VALID,"); - if (SvPAD_TYPED(sv)) sv_catpv(d, "TYPED,"); - if (SvPAD_OUR(sv)) sv_catpv(d, "OUR,"); - /* FALLTHROUGH */ - case SVt_PVNV: - if (SvPAD_STATE(sv)) sv_catpv(d, "STATE,"); - goto evaled_or_uv; + case SVt_PVAV: - if (AvPAD_NAMELIST(sv)) sv_catpvs(d, "NAMELIST,"); break; } /* SVphv_SHAREKEYS is also 0x20000000 */ @@ -1545,35 +1564,20 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo && type != SVt_REGEXP && !isGV_with_GP(sv) && !SvVALID(sv)) || (type == SVt_IV && !SvROK(sv))) { if (SvIsUV(sv) -#ifdef PERL_OLD_COPY_ON_WRITE - || SvIsCOW(sv) -#endif ) Perl_dump_indent(aTHX_ level, file, " UV = %"UVuf, (UV)SvUVX(sv)); else Perl_dump_indent(aTHX_ level, file, " IV = %"IVdf, (IV)SvIVX(sv)); -#ifdef PERL_OLD_COPY_ON_WRITE - if (SvIsCOW_shared_hash(sv)) - PerlIO_printf(file, " (HASH)"); - else if (SvIsCOW_normal(sv)) - PerlIO_printf(file, " (COW from 0x%"UVxf")", (UV)SvUVX(sv)); -#endif - PerlIO_putc(file, '\n'); + (void)PerlIO_putc(file, '\n'); } - if ((type == SVt_PVNV || type == SVt_PVMG) - && (SvFLAGS(sv) & SVpad_NAME) == SVpad_NAME) { - Perl_dump_indent(aTHX_ level, file, " COP_LOW = %"UVuf"\n", - (UV) COP_SEQ_RANGE_LOW(sv)); - Perl_dump_indent(aTHX_ level, file, " COP_HIGH = %"UVuf"\n", - (UV) COP_SEQ_RANGE_HIGH(sv)); - } else if ((type >= SVt_PVNV && type != SVt_PVAV && type != SVt_PVHV + if ((type >= SVt_PVNV && type != SVt_PVAV && type != SVt_PVHV && type != SVt_PVCV && type != SVt_PVFM && type != SVt_REGEXP && type != SVt_PVIO && !isGV_with_GP(sv) && !SvVALID(sv)) || type == SVt_NV) { - STORE_NUMERIC_LOCAL_SET_STANDARD(); + STORE_LC_NUMERIC_UNDERLYING_SET_STANDARD(); Perl_dump_indent(aTHX_ level, file, " NV = %.*" NVgf "\n", NV_DIG, SvNVX(sv)); - RESTORE_NUMERIC_LOCAL(); + RESTORE_LC_NUMERIC_UNDERLYING(); } if (SvROK(sv)) { @@ -1626,7 +1630,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo if (!re) Perl_dump_indent(aTHX_ level, file, " LEN = %"IVdf"\n", (IV)SvLEN(sv)); -#ifdef PERL_NEW_COPY_ON_WRITE +#ifdef PERL_COPY_ON_WRITE if (SvIsCOW(sv) && SvLEN(sv)) Perl_dump_indent(aTHX_ level, file, " COW_REFCNT = %d\n", CowREFCNT(sv)); @@ -1637,17 +1641,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } if (type >= SVt_PVMG) { - if (type == SVt_PVMG && SvPAD_OUR(sv)) { - HV * const ost = SvOURSTASH(sv); - if (ost) - do_hv_dump(level, file, " OURSTASH", ost); - } else if (SvTYPE(sv) == SVt_PVAV && AvPAD_NAMELIST(sv)) { - Perl_dump_indent(aTHX_ level, file, " MAXNAMED = %"UVuf"\n", - (UV)PadnamelistMAXNAMED(sv)); - } else { - if (SvMAGIC(sv)) + if (SvMAGIC(sv)) do_magic_dump(level, file, SvMAGIC(sv), nest+1, maxnest, dumpops, pvlim); - } if (SvSTASH(sv)) do_hv_dump(level, file, " STASH", SvSTASH(sv)); @@ -1666,27 +1661,24 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo Perl_dump_indent(aTHX_ level, file, " ALLOC = 0x%"UVxf"\n", PTR2UV(AvALLOC(sv))); } else - PerlIO_putc(file, '\n'); + (void)PerlIO_putc(file, '\n'); Perl_dump_indent(aTHX_ level, file, " FILL = %"IVdf"\n", (IV)AvFILLp(sv)); Perl_dump_indent(aTHX_ level, file, " MAX = %"IVdf"\n", (IV)AvMAX(sv)); - /* arylen is stored in magic, and padnamelists use SvMAGIC for - something else. */ - if (!AvPAD_NAMELIST(sv)) - Perl_dump_indent(aTHX_ level, file, " ARYLEN = 0x%"UVxf"\n", - SvMAGIC(sv) ? PTR2UV(AvARYLEN(sv)) : 0); - sv_setpvs(d, ""); + SvPVCLEAR(d); if (AvREAL(sv)) sv_catpv(d, ",REAL"); if (AvREIFY(sv)) sv_catpv(d, ",REIFY"); Perl_dump_indent(aTHX_ level, file, " FLAGS = (%s)\n", SvCUR(d) ? SvPVX_const(d) + 1 : ""); - if (nest < maxnest && av_tindex(MUTABLE_AV(sv)) >= 0) { + if (nest < maxnest && AvARRAY(MUTABLE_AV(sv))) { SSize_t count; - for (count = 0; count <= av_tindex(MUTABLE_AV(sv)) && count < maxnest; count++) { - SV** const elt = av_fetch(MUTABLE_AV(sv),count,0); - + SV **svp = AvARRAY(MUTABLE_AV(sv)); + for (count = 0; + count <= AvFILLp(MUTABLE_AV(sv)) && count < maxnest; + count++, svp++) + { + SV* const elt = *svp; Perl_dump_indent(aTHX_ level + 1, file, "Elt No. %"IVdf"\n", (IV)count); - if (elt) - do_sv_dump(level+1, file, *elt, nest+1, maxnest, dumpops, pvlim); + do_sv_dump(level+1, file, elt, nest+1, maxnest, dumpops, pvlim); } } break; @@ -1730,7 +1722,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo PerlIO_printf(file, ", "); } } - PerlIO_putc(file, ')'); + (void)PerlIO_putc(file, ')'); /* The "quality" of a hash is defined as the total number of comparisons needed to access every element once, relative to the expected number needed for a random hash. @@ -1749,10 +1741,10 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo pow2 = pow2 << 1; theoret = usedkeys; theoret += theoret * (theoret-1)/pow2; - PerlIO_putc(file, '\n'); + (void)PerlIO_putc(file, '\n'); Perl_dump_indent(aTHX_ level, file, " hash quality = %.1"NVff"%%", theoret/sum*100); } - PerlIO_putc(file, '\n'); + (void)PerlIO_putc(file, '\n'); Perl_dump_indent(aTHX_ level, file, " KEYS = %"IVdf"\n", (IV)usedkeys); { STRLEN count = 0; @@ -1768,15 +1760,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } while (++ents <= last); } - if (SvOOK(sv)) { - struct xpvhv_aux *const aux = HvAUX(sv); - Perl_dump_indent(aTHX_ level, file, " FILL = %"UVuf - " (cached = %"UVuf")\n", - (UV)count, (UV)aux->xhv_fill_lazy); - } else { - Perl_dump_indent(aTHX_ level, file, " FILL = %"UVuf"\n", - (UV)count); - } + Perl_dump_indent(aTHX_ level, file, " FILL = %"UVuf"\n", + (UV)count); } Perl_dump_indent(aTHX_ level, file, " MAX = %"IVdf"\n", (IV)HvMAX(sv)); if (SvOOK(sv)) { @@ -1788,7 +1773,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo PerlIO_printf(file, " (LAST = 0x%"UVxf")", (UV)HvLASTRAND_get(sv)); } #endif - PerlIO_putc(file, '\n'); + (void)PerlIO_putc(file, '\n'); } { MAGIC * const mg = mg_find(sv, PERL_MAGIC_symtab); @@ -1825,7 +1810,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo HEK *const *const endp = HvAUX(sv)->xhv_name_u.xhvnameu_names + (count < 0 ? -count : count); while (hekp < endp) { - if (HEK_LEN(*hekp)) { + if (*hekp) { SV *tmp = newSVpvs_flags("", SVs_TEMP); Perl_sv_catpvf(aTHX_ names, ", \"%s\"", generic_pv_escape(tmp, HEK_KEY(*hekp), HEK_LEN(*hekp), HEK_UTF8(*hekp))); @@ -1948,7 +1933,12 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo do_hv_dump(level, file, " COMP_STASH", CvSTASH(sv)); if (!CvISXSUB(sv)) { if (CvSTART(sv)) { - Perl_dump_indent(aTHX_ level, file, + if (CvSLABBED(sv)) + Perl_dump_indent(aTHX_ level, file, + " SLAB = 0x%"UVxf"\n", + PTR2UV(CvSTART(sv))); + else + Perl_dump_indent(aTHX_ level, file, " START = 0x%"UVxf" ===> %"IVdf"\n", PTR2UV(CvSTART(sv)), (IV)sequence_num(CvSTART(sv))); @@ -1982,10 +1972,14 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo Perl_dump_indent(aTHX_ level, file, " DEPTH = %"IVdf"\n", (IV)CvDEPTH(sv)); Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%"UVxf"\n", (UV)CvFLAGS(sv)); Perl_dump_indent(aTHX_ level, file, " OUTSIDE_SEQ = %"UVuf"\n", (UV)CvOUTSIDE_SEQ(sv)); - Perl_dump_indent(aTHX_ level, file, " PADLIST = 0x%"UVxf"\n", PTR2UV(CvPADLIST(sv))); - if (nest < maxnest) { - do_dump_pad(level+1, file, CvPADLIST(sv), 0); + if (!CvISXSUB(sv)) { + Perl_dump_indent(aTHX_ level, file, " PADLIST = 0x%"UVxf"\n", PTR2UV(CvPADLIST(sv))); + if (nest < maxnest) { + do_dump_pad(level+1, file, CvPADLIST(sv), 0); + } } + else + Perl_dump_indent(aTHX_ level, file, " HSCXT = 0x%p\n", CvHSCXT(sv)); { const CV * const outside = CvOUTSIDE(sv); Perl_dump_indent(aTHX_ level, file, " OUTSIDE = 0x%"UVxf" (%s)\n", @@ -2002,7 +1996,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo GvNAMEUTF8(CvGV(outside))) : "UNDEFINED")); } - if (nest < maxnest && (CvCLONE(sv) || CvCLONED(sv))) + if (CvOUTSIDE(sv) + && (nest < maxnest && (CvCLONE(sv) || CvCLONED(sv)))) do_sv_dump(level+1, file, MUTABLE_SV(CvOUTSIDE(sv)), nest+1, maxnest, dumpops, pvlim); break; @@ -2030,6 +2025,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo } Perl_dump_indent(aTHX_ level, file, " NAMELEN = %"IVdf"\n", (IV)GvNAMELEN(sv)); do_hv_dump (level, file, " GvSTASH", GvSTASH(sv)); + Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%"UVxf"\n", (UV)GvFLAGS(sv)); Perl_dump_indent(aTHX_ level, file, " GP = 0x%"UVxf"\n", PTR2UV(GvGP(sv))); if (!GvGP(sv)) break; @@ -2041,9 +2037,12 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo Perl_dump_indent(aTHX_ level, file, " HV = 0x%"UVxf"\n", PTR2UV(GvHV(sv))); Perl_dump_indent(aTHX_ level, file, " CV = 0x%"UVxf"\n", PTR2UV(GvCV(sv))); Perl_dump_indent(aTHX_ level, file, " CVGEN = 0x%"UVxf"\n", (UV)GvCVGEN(sv)); + Perl_dump_indent(aTHX_ level, file, " GPFLAGS = 0x%"UVxf + " (%s)\n", + (UV)GvGPFLAGS(sv), + ""); Perl_dump_indent(aTHX_ level, file, " LINE = %"IVdf"\n", (IV)GvLINE(sv)); Perl_dump_indent(aTHX_ level, file, " FILE = \"%s\"\n", GvFILE(sv)); - Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%"UVxf"\n", (UV)GvFLAGS(sv)); do_gv_dump (level, file, " EGV", GvEGV(sv)); break; case SVt_PVIO: @@ -2210,6 +2209,8 @@ Perl_runops_debug(pTHX) ++PL_op_exec_cnt[PL_op->op_type]; #endif if (PL_debug) { + ENTER; + SAVETMPS; if (PL_watchaddr && (*PL_watchaddr != PL_watchok)) PerlIO_printf(Perl_debug_log, "WARNING: %"UVxf" changed from %"UVxf" to %"UVxf"\n", @@ -2227,9 +2228,11 @@ Perl_runops_debug(pTHX) if (DEBUG_t_TEST_) debop(PL_op); if (DEBUG_P_TEST_) debprof(PL_op); + FREETMPS; + LEAVE; } - OP_ENTRY_PROBE(OP_NAME(PL_op)); + PERL_DTRACE_PROBE_OP(PL_op); } while ((PL_op = PL_op->op_ppaddr(aTHX))); DEBUG_l(Perl_deb(aTHX_ "leaving RUNOPS level\n")); PERL_ASYNC_CHECK(); @@ -2238,11 +2241,242 @@ Perl_runops_debug(pTHX) return 0; } + +/* print the names of the n lexical vars starting at pad offset off */ + +STATIC void +S_deb_padvar(pTHX_ PADOFFSET off, int n, bool paren) +{ + PADNAME *sv; + CV * const cv = deb_curcv(cxstack_ix); + PADNAMELIST *comppad = NULL; + int i; + + if (cv) { + PADLIST * const padlist = CvPADLIST(cv); + comppad = PadlistNAMES(padlist); + } + if (paren) + PerlIO_printf(Perl_debug_log, "("); + for (i = 0; i < n; i++) { + if (comppad && (sv = padnamelist_fetch(comppad, off + i))) + PerlIO_printf(Perl_debug_log, "%"PNf, PNfARG(sv)); + else + PerlIO_printf(Perl_debug_log, "[%"UVuf"]", + (UV)(off+i)); + if (i < n - 1) + PerlIO_printf(Perl_debug_log, ","); + } + if (paren) + PerlIO_printf(Perl_debug_log, ")"); +} + + +/* append to the out SV, the name of the lexical at offset off in the CV + * cv */ + +static void +S_append_padvar(pTHX_ PADOFFSET off, CV *cv, SV *out, int n, + bool paren, bool is_scalar) +{ + PADNAME *sv; + PADNAMELIST *namepad = NULL; + int i; + + if (cv) { + PADLIST * const padlist = CvPADLIST(cv); + namepad = PadlistNAMES(padlist); + } + + if (paren) + sv_catpvs_nomg(out, "("); + for (i = 0; i < n; i++) { + if (namepad && (sv = padnamelist_fetch(namepad, off + i))) + { + STRLEN cur = SvCUR(out); + Perl_sv_catpvf(aTHX_ out, "[%"UTF8f, + UTF8fARG(1, PadnameLEN(sv) - 1, + PadnamePV(sv) + 1)); + if (is_scalar) + SvPVX(out)[cur] = '$'; + } + else + Perl_sv_catpvf(aTHX_ out, "[%"UVuf"]", (UV)(off+i)); + if (i < n - 1) + sv_catpvs_nomg(out, ","); + } + if (paren) + sv_catpvs_nomg(out, "("); +} + + +static void +S_append_gv_name(pTHX_ GV *gv, SV *out) +{ + SV *sv; + if (!gv) { + sv_catpvs_nomg(out, ""); + return; + } + sv = newSV(0); + gv_fullname4(sv, gv, NULL, FALSE); + Perl_sv_catpvf(aTHX_ out, "$%"SVf, SVfARG(sv)); + SvREFCNT_dec_NN(sv); +} + +#ifdef USE_ITHREADS +# define ITEM_SV(item) (comppad ? \ + *av_fetch(comppad, (item)->pad_offset, FALSE) : NULL); +#else +# define ITEM_SV(item) UNOP_AUX_item_sv(item) +#endif + + +/* return a temporary SV containing a stringified representation of + * the op_aux field of a MULTIDEREF op, associated with CV cv + */ + +SV* +Perl_multideref_stringify(pTHX_ const OP *o, CV *cv) +{ + UNOP_AUX_item *items = cUNOP_AUXo->op_aux; + UV actions = items->uv; + SV *sv; + bool last = 0; + bool is_hash = FALSE; + int derefs = 0; + SV *out = newSVpvn_flags("",0,SVs_TEMP); +#ifdef USE_ITHREADS + PAD *comppad; + + if (cv) { + PADLIST *padlist = CvPADLIST(cv); + comppad = PadlistARRAY(padlist)[1]; + } + else + comppad = NULL; +#endif + + PERL_ARGS_ASSERT_MULTIDEREF_STRINGIFY; + + while (!last) { + switch (actions & MDEREF_ACTION_MASK) { + + case MDEREF_reload: + actions = (++items)->uv; + continue; + NOT_REACHED; /* NOTREACHED */ + + case MDEREF_HV_padhv_helem: + is_hash = TRUE; + /* FALLTHROUGH */ + case MDEREF_AV_padav_aelem: + derefs = 1; + S_append_padvar(aTHX_ (++items)->pad_offset, cv, out, 1, 0, 1); + goto do_elem; + NOT_REACHED; /* NOTREACHED */ + + case MDEREF_HV_gvhv_helem: + is_hash = TRUE; + /* FALLTHROUGH */ + case MDEREF_AV_gvav_aelem: + derefs = 1; + items++; + sv = ITEM_SV(items); + S_append_gv_name(aTHX_ (GV*)sv, out); + goto do_elem; + NOT_REACHED; /* NOTREACHED */ + + case MDEREF_HV_gvsv_vivify_rv2hv_helem: + is_hash = TRUE; + /* FALLTHROUGH */ + case MDEREF_AV_gvsv_vivify_rv2av_aelem: + items++; + sv = ITEM_SV(items); + S_append_gv_name(aTHX_ (GV*)sv, out); + goto do_vivify_rv2xv_elem; + NOT_REACHED; /* NOTREACHED */ + + case MDEREF_HV_padsv_vivify_rv2hv_helem: + is_hash = TRUE; + /* FALLTHROUGH */ + case MDEREF_AV_padsv_vivify_rv2av_aelem: + S_append_padvar(aTHX_ (++items)->pad_offset, cv, out, 1, 0, 1); + goto do_vivify_rv2xv_elem; + NOT_REACHED; /* NOTREACHED */ + + case MDEREF_HV_pop_rv2hv_helem: + case MDEREF_HV_vivify_rv2hv_helem: + is_hash = TRUE; + /* FALLTHROUGH */ + do_vivify_rv2xv_elem: + case MDEREF_AV_pop_rv2av_aelem: + case MDEREF_AV_vivify_rv2av_aelem: + if (!derefs++) + sv_catpvs_nomg(out, "->"); + do_elem: + if ((actions & MDEREF_INDEX_MASK)== MDEREF_INDEX_none) { + sv_catpvs_nomg(out, "->"); + last = 1; + break; + } + + sv_catpvn_nomg(out, (is_hash ? "{" : "["), 1); + switch (actions & MDEREF_INDEX_MASK) { + case MDEREF_INDEX_const: + if (is_hash) { + items++; + sv = ITEM_SV(items); + if (!sv) + sv_catpvs_nomg(out, "???"); + else { + STRLEN cur; + char *s; + s = SvPV(sv, cur); + pv_pretty(out, s, cur, 30, + NULL, NULL, + (PERL_PV_PRETTY_NOCLEAR + |PERL_PV_PRETTY_QUOTE + |PERL_PV_PRETTY_ELLIPSES)); + } + } + else + Perl_sv_catpvf(aTHX_ out, "%"IVdf, (++items)->iv); + break; + case MDEREF_INDEX_padsv: + S_append_padvar(aTHX_ (++items)->pad_offset, cv, out, 1, 0, 1); + break; + case MDEREF_INDEX_gvsv: + items++; + sv = ITEM_SV(items); + S_append_gv_name(aTHX_ (GV*)sv, out); + break; + } + sv_catpvn_nomg(out, (is_hash ? "}" : "]"), 1); + + if (actions & MDEREF_FLAG_last) + last = 1; + is_hash = FALSE; + + break; + + default: + PerlIO_printf(Perl_debug_log, "UNKNOWN(%d)", + (int)(actions & MDEREF_ACTION_MASK)); + last = 1; + break; + + } /* switch */ + + actions >>= MDEREF_SHIFT; + } /* while */ + return out; +} + + I32 Perl_debop(pTHX_ const OP *o) { - int count; - PERL_ARGS_ASSERT_DEBOP; if (CopSTASH_eq(PL_curcop, PL_debstash) && !DEBUG_J_TEST_) @@ -2263,12 +2497,20 @@ Perl_debop(pTHX_ const OP *o) break; case OP_GVSV: case OP_GV: - if (cGVOPo_gv) { + if (cGVOPo_gv && isGV(cGVOPo_gv)) { SV * const sv = newSV(0); gv_fullname3(sv, cGVOPo_gv, NULL); PerlIO_printf(Perl_debug_log, "(%s)", SvPV_nolen_const(sv)); SvREFCNT_dec_NN(sv); } + else if (cGVOPo_gv) { + SV * const sv = newSV(0); + assert(SvROK(cGVOPo_gv)); + assert(SvTYPE(SvRV(cGVOPo_gv)) == SVt_PVCV); + PerlIO_printf(Perl_debug_log, "(cv ref: %s)", + SvPV_nolen_const(cv_name((CV *)SvRV(cGVOPo_gv),sv,0))); + SvREFCNT_dec_NN(sv); + } else PerlIO_printf(Perl_debug_log, "(NULL)"); break; @@ -2276,35 +2518,18 @@ Perl_debop(pTHX_ const OP *o) case OP_PADSV: case OP_PADAV: case OP_PADHV: - count = 1; - goto dump_padop; + case OP_ARGELEM: + S_deb_padvar(aTHX_ o->op_targ, 1, 1); + break; + case OP_PADRANGE: - count = o->op_private & OPpPADRANGE_COUNTMASK; - dump_padop: - /* print the lexical's name */ - { - CV * const cv = deb_curcv(cxstack_ix); - SV *sv; - PAD * comppad = NULL; - int i; - - if (cv) { - PADLIST * const padlist = CvPADLIST(cv); - comppad = *PadlistARRAY(padlist); - } - PerlIO_printf(Perl_debug_log, "("); - for (i = 0; i < count; i++) { - if (comppad && - (sv = *av_fetch(comppad, o->op_targ + i, FALSE))) - PerlIO_printf(Perl_debug_log, "%s", SvPV_nolen_const(sv)); - else - PerlIO_printf(Perl_debug_log, "[%"UVuf"]", - (UV)o->op_targ+i); - if (i < count-1) - PerlIO_printf(Perl_debug_log, ","); - } - PerlIO_printf(Perl_debug_log, ")"); - } + S_deb_padvar(aTHX_ o->op_targ, + o->op_private & OPpPADRANGE_COUNTMASK, 1); + break; + + case OP_MULTIDEREF: + PerlIO_printf(Perl_debug_log, "(%"SVf")", + SVfARG(multideref_stringify(o, deb_curcv(cxstack_ix)))); break; default: @@ -2315,19 +2540,27 @@ Perl_debop(pTHX_ const OP *o) } STATIC CV* -S_deb_curcv(pTHX_ const I32 ix) +S_deb_curcv(pTHX_ I32 ix) { - const PERL_CONTEXT * const cx = &cxstack[ix]; - if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT) - return cx->blk_sub.cv; - else if (CxTYPE(cx) == CXt_EVAL && !CxTRYBLOCK(cx)) - return cx->blk_eval.cv; - else if (ix == 0 && PL_curstackinfo->si_type == PERLSI_MAIN) - return PL_main_cv; - else if (ix <= 0) - return NULL; - else - return deb_curcv(ix - 1); + PERL_SI *si = PL_curstackinfo; + for (; ix >=0; ix--) { + const PERL_CONTEXT * const cx = &(si->si_cxstack)[ix]; + + if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT) + return cx->blk_sub.cv; + else if (CxTYPE(cx) == CXt_EVAL && !CxTRYBLOCK(cx)) + return cx->blk_eval.cv; + else if (ix == 0 && si->si_type == PERLSI_MAIN) + return PL_main_cv; + else if (ix == 0 && CxTYPE(cx) == CXt_NULL + && si->si_type == PERLSI_SORT) + { + /* fake sort sub; use CV of caller */ + si = si->si_prev; + ix = si->si_cxix + 1; + } + } + return NULL; } void @@ -2369,11 +2602,5 @@ Perl_debprofdump(pTHX) /* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * * ex: set ts=8 sts=4 sw=4 et: */