finish more implementing -DB vs. -Dx

diff --git a/mg.c b/mg.c
index 15ae6ce..2f9b017 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -2334,7 +2334,8 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
 #ifdef DEBUGGING
        s = SvPV_nolen_const(sv);
        PL_debug = get_debug_opts(&s, 0) | DEBUG_TOP_FLAG;
-       DEBUG_B(dump_all());
+       if (DEBUG_x_TEST || DEBUG_B_TEST)
+           dump_all_perl(!DEBUG_B_TEST);
 #else
        PL_debug = (SvIV(sv)) | DEBUG_TOP_FLAG;
 #endif

diff --git a/op.c b/op.c
index cb46cd6..e31c050 100644 (file)
--- a/op.c
+++ b/op.c
@@ -5896,7 +5896,7 @@ S_process_special_blocks(pTHX_ const char *const fullname, GV *const gv,
            SAVECOPFILE(&PL_compiling);
            SAVECOPLINE(&PL_compiling);
 
-           DEBUG_B( dump_sub(gv) );
+           DEBUG_x( dump_sub(gv) );
            Perl_av_create_and_push(aTHX_ &PL_beginav, MUTABLE_SV(cv));
            GvCV(gv) = 0;               /* cv has been hijacked */
            call_list(oldscope, PL_beginav);
@@ -5910,7 +5910,7 @@ S_process_special_blocks(pTHX_ const char *const fullname, GV *const gv,
     } else {
        if (*name == 'E') {
            if strEQ(name, "END") {
-               DEBUG_B( dump_sub(gv) );
+               DEBUG_x( dump_sub(gv) );
                Perl_av_create_and_unshift_one(aTHX_ &PL_endav, MUTABLE_SV(cv));
            } else
                return;
@@ -5941,7 +5941,7 @@ S_process_special_blocks(pTHX_ const char *const fullname, GV *const gv,
                return;
        } else
            return;
-       DEBUG_B( dump_sub(gv) );
+       DEBUG_x( dump_sub(gv) );
        GvCV(gv) = 0;           /* cv has been hijacked */
     }
 }