Change 13110 by jhi@alpha on 2001/11/20 00:39:02
Create a per-interpeter debug scratchpad container
and use that for the regexec debugging.
Affected files ...
.... //depot/perl/embedvar.h#133 edit
.... //depot/perl/intrpvar.h#94 edit
.... //depot/perl/perl.c#389 edit
.... //depot/perl/perl.h#413 edit
.... //depot/perl/perlapi.h#55 edit
.... //depot/perl/regexec.c#206 edit
Differences ...
==== //depot/perl/embedvar.h#133 (text+w) ====
Index: perl/embedvar.h
--- perl/embedvar.h.~1~ Mon Nov 19 17:45:06 2001
+++ perl/embedvar.h Mon Nov 19 17:45:06 2001
@@ -223,6 +223,7 @@
#define PL_dbargs (PERL_GET_INTERP->Idbargs)
#define PL_debstash (PERL_GET_INTERP->Idebstash)
#define PL_debug (PERL_GET_INTERP->Idebug)
+#define PL_debug_pad (PERL_GET_INTERP->Idebug_pad)
#define PL_def_layerlist (PERL_GET_INTERP->Idef_layerlist)
#define PL_defgv (PERL_GET_INTERP->Idefgv)
#define PL_diehook (PERL_GET_INTERP->Idiehook)
@@ -516,6 +517,7 @@
#define PL_dbargs (vTHX->Idbargs)
#define PL_debstash (vTHX->Idebstash)
#define PL_debug (vTHX->Idebug)
+#define PL_debug_pad (vTHX->Idebug_pad)
#define PL_def_layerlist (vTHX->Idef_layerlist)
#define PL_defgv (vTHX->Idefgv)
#define PL_diehook (vTHX->Idiehook)
@@ -812,6 +814,7 @@
#define PL_Idbargs PL_dbargs
#define PL_Idebstash PL_debstash
#define PL_Idebug PL_debug
+#define PL_Idebug_pad PL_debug_pad
#define PL_Idef_layerlist PL_def_layerlist
#define PL_Idefgv PL_defgv
#define PL_Idiehook PL_diehook
==== //depot/perl/intrpvar.h#94 (text) ====
Index: perl/intrpvar.h
--- perl/intrpvar.h.~1~ Mon Nov 19 17:45:06 2001
+++ perl/intrpvar.h Mon Nov 19 17:45:06 2001
@@ -502,6 +502,10 @@
PERLVARI(Iencoding, SV*, Nullsv) /* character encoding */
+#ifdef DEBUGGING
+PERLVAR(Idebug_pad, struct perl_debug_pad)
+#endif
+
/* New variables must be added to the very end for binary compatibility.
* XSUB.h provides wrapper functions via perlapi.h that make this
* irrelevant, but not all code may be expected to #include XSUB.h. */
==== //depot/perl/perl.c#389 (text) ====
Index: perl/perl.c
--- perl/perl.c.~1~ Mon Nov 19 17:45:06 2001
+++ perl/perl.c Mon Nov 19 17:45:06 2001
@@ -273,6 +273,12 @@
New(31337, PL_reentrant_buffer->tmbuff,1, struct tm);
#endif
+#ifdef DEBUGGING
+ sv_setpvn(PERL_DEBUG_PAD(0), "", 0);
+ sv_setpvn(PERL_DEBUG_PAD(1), "", 0);
+ sv_setpvn(PERL_DEBUG_PAD(2), "", 0);
+#endif
+
/* Note that strtab is a rather special HV. Assumptions are made
about not iterating on it, and not adding tie magic to it.
It is properly deallocated in perl_destruct() */
==== //depot/perl/perl.h#413 (text) ====
Index: perl/perl.h
--- perl/perl.h.~1~ Mon Nov 19 17:45:06 2001
+++ perl/perl.h Mon Nov 19 17:45:06 2001
@@ -3106,6 +3106,18 @@
#define RsPARA(sv) (SvPOK(sv) && ! SvCUR(sv))
#define RsRECORD(sv) (SvROK(sv) && (SvIV(SvRV(sv)) > 0))
+#ifdef DEBUGGING
+/* A struct for keeping various DEBUGGING related stuff
+ * neatly packed. Currently only scratch variables for
+ * constructing debug output are included. */
+struct perl_debug_pad {
+ SV pad[3];
+};
+
+#define PERL_DEBUG_PAD(i) &(PL_debug_pad.pad[i])
+#define PERL_DEBUG_PAD_ZERO(i) (sv_setpvn(PERL_DEBUG_PAD(i), "", 0),
+PERL_DEBUG_PAD(i))
+#endif
+
/* Enable variables which are pointers to functions */
typedef void (CPERLscope(*peep_t))(pTHX_ OP* o);
typedef regexp*(CPERLscope(*regcomp_t)) (pTHX_ char* exp, char* xend, PMOP* pm);
==== //depot/perl/perlapi.h#55 (text+w) ====
Index: perl/perlapi.h
--- perl/perlapi.h.~1~ Mon Nov 19 17:45:06 2001
+++ perl/perlapi.h Mon Nov 19 17:45:06 2001
@@ -183,6 +183,8 @@
#define PL_debstash (*Perl_Idebstash_ptr(aTHX))
#undef PL_debug
#define PL_debug (*Perl_Idebug_ptr(aTHX))
+#undef PL_debug_pad
+#define PL_debug_pad (*Perl_Idebug_pad_ptr(aTHX))
#undef PL_def_layerlist
#define PL_def_layerlist (*Perl_Idef_layerlist_ptr(aTHX))
#undef PL_defgv
==== //depot/perl/regexec.c#206 (text) ====
Index: perl/regexec.c
--- perl/regexec.c.~1~ Mon Nov 19 17:45:06 2001
+++ perl/regexec.c Mon Nov 19 17:45:06 2001
@@ -390,7 +390,7 @@
char *check_at = Nullch; /* check substr found at this pos */
#ifdef DEBUGGING
char *i_strpos = strpos;
- SV *dsv = sv_2mortal(newSVpvn("", 0));
+ SV *dsv = PERL_DEBUG_PAD_ZERO(0);
#endif
DEBUG_r({
@@ -1465,7 +1465,7 @@
SV* oreplsv = GvSV(PL_replgv);
bool do_utf8 = DO_UTF8(sv);
#ifdef DEBUGGING
- SV *dsv = sv_2mortal(newSVpvn("", 0));
+ SV *dsv = PERL_DEBUG_PAD_ZERO(0);
#endif
PL_regcc = 0;
@@ -2050,9 +2050,9 @@
#endif
register bool do_utf8 = PL_reg_match_utf8;
#ifdef DEBUGGING
- SV *dsv0 = sv_2mortal(newSVpvn("", 0));
- SV *dsv1 = sv_2mortal(newSVpvn("", 0));
- SV *dsv2 = sv_2mortal(newSVpvn("", 0));
+ SV *dsv0 = PERL_DEBUG_PAD_ZERO(0);
+ SV *dsv1 = PERL_DEBUG_PAD_ZERO(1);
+ SV *dsv2 = PERL_DEBUG_PAD_ZERO(2);
#endif
#ifdef DEBUGGING
End of Patch.
