Change 34957 by [EMAIL PROTECTED] on 2008/11/30 23:16:09
Refactor all of the code of the form
SSCHECK(3);
SSPUSHPTR(ptr1);
SSPUSHPTR(ptr2);
SSPUSHINT(type);
into a static function S_save_pushptrptr().
It might be possible to make some of its callers trivial macros, and
so eliminate them as functions. But start with the easy part.
Affected files ...
... //depot/perl/embed.fnc#657 edit
... //depot/perl/embed.h#790 edit
... //depot/perl/proto.h#988 edit
... //depot/perl/scope.c#238 edit
Differences ...
==== //depot/perl/embed.fnc#657 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#656~34956~ 2008-11-30 14:46:37.000000000 -0800
+++ perl/embed.fnc 2008-11-30 15:16:09.000000000 -0800
@@ -923,6 +923,10 @@
Ap |void |save_sptr |NN SV** sptr
Ap |SV* |save_svref |NN SV** sptr
Ap |void |save_pushptr |NULLOK void *const ptr|const int type
+#if defined(PERL_IN_SCOPE_C)
+s |void |save_pushptrptr|NULLOK void *const ptr1 \
+ |NULLOK void *const ptr2|const int type
+#endif
: Used in perly.y
p |OP* |sawparens |NULLOK OP* o
: Used in perly.y
==== //depot/perl/embed.h#790 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#789~34956~ 2008-11-30 14:46:37.000000000 -0800
+++ perl/embed.h 2008-11-30 15:16:09.000000000 -0800
@@ -806,6 +806,11 @@
#define save_sptr Perl_save_sptr
#define save_svref Perl_save_svref
#define save_pushptr Perl_save_pushptr
+#if defined(PERL_IN_SCOPE_C)
+#ifdef PERL_CORE
+#define save_pushptrptr S_save_pushptrptr
+#endif
+#endif
#ifdef PERL_CORE
#define sawparens Perl_sawparens
#define scalar Perl_scalar
@@ -3150,6 +3155,11 @@
#define save_sptr(a) Perl_save_sptr(aTHX_ a)
#define save_svref(a) Perl_save_svref(aTHX_ a)
#define save_pushptr(a,b) Perl_save_pushptr(aTHX_ a,b)
+#if defined(PERL_IN_SCOPE_C)
+#ifdef PERL_CORE
+#define save_pushptrptr(a,b,c) S_save_pushptrptr(aTHX_ a,b,c)
+#endif
+#endif
#ifdef PERL_CORE
#define sawparens(a) Perl_sawparens(aTHX_ a)
#define scalar(a) Perl_scalar(aTHX_ a)
==== //depot/perl/proto.h#988 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#987~34956~ 2008-11-30 14:46:37.000000000 -0800
+++ perl/proto.h 2008-11-30 15:16:09.000000000 -0800
@@ -2913,6 +2913,9 @@
assert(sptr)
PERL_CALLCONV void Perl_save_pushptr(pTHX_ void *const ptr, const int
type);
+#if defined(PERL_IN_SCOPE_C)
+STATIC void S_save_pushptrptr(pTHX_ void *const ptr1, void *const ptr2,
const int type);
+#endif
PERL_CALLCONV OP* Perl_sawparens(pTHX_ OP* o);
PERL_CALLCONV OP* Perl_scalar(pTHX_ OP* o);
#if defined(PERL_IN_OP_C)
==== //depot/perl/scope.c#238 (text) ====
Index: perl/scope.c
--- perl/scope.c#237~34956~ 2008-11-30 14:46:37.000000000 -0800
+++ perl/scope.c 2008-11-30 15:16:09.000000000 -0800
@@ -184,6 +184,16 @@
return sv;
}
+static void
+S_save_pushptrptr(pTHX_ void *const ptr1, void *const ptr2, const int type)
+{
+ dVAR;
+ SSCHECK(3);
+ SSPUSHPTR(ptr1);
+ SSPUSHPTR(ptr2);
+ SSPUSHINT(type);
+}
+
SV *
Perl_save_scalar(pTHX_ GV *gv)
{
@@ -195,10 +205,7 @@
PL_localizing = 1;
SvGETMAGIC(*sptr);
PL_localizing = 0;
- SSCHECK(3);
- SSPUSHPTR(SvREFCNT_inc_simple(gv));
- SSPUSHPTR(SvREFCNT_inc(*sptr));
- SSPUSHINT(SAVEt_SV);
+ save_pushptrptr(SvREFCNT_inc_simple(gv), SvREFCNT_inc(*sptr), SAVEt_SV);
return save_scalar_at(sptr, SAVEf_SETMAGIC); /* XXX - FIXME - see #60360 */
}
@@ -211,10 +218,7 @@
PERL_ARGS_ASSERT_SAVE_GENERIC_SVREF;
- SSCHECK(3);
- SSPUSHPTR(sptr);
- SSPUSHPTR(SvREFCNT_inc(*sptr));
- SSPUSHINT(SAVEt_GENERIC_SVREF);
+ save_pushptrptr(sptr, SvREFCNT_inc(*sptr), SAVEt_GENERIC_SVREF);
}
/* Like save_pptr(), but also Safefree()s the new value if it is different
@@ -227,10 +231,7 @@
PERL_ARGS_ASSERT_SAVE_GENERIC_PVREF;
- SSCHECK(3);
- SSPUSHPTR(*str);
- SSPUSHPTR(str);
- SSPUSHINT(SAVEt_GENERIC_PVREF);
+ save_pushptrptr(*str, str, SAVEt_GENERIC_PVREF);
}
/* Like save_generic_pvref(), but uses PerlMemShared_free() rather than
Safefree().
@@ -243,10 +244,7 @@
PERL_ARGS_ASSERT_SAVE_SHARED_PVREF;
- SSCHECK(3);
- SSPUSHPTR(str);
- SSPUSHPTR(*str);
- SSPUSHINT(SAVEt_SHARED_PVREF);
+ save_pushptrptr(str, *str, SAVEt_SHARED_PVREF);
}
/* set the SvFLAGS specified by mask to the values in val */
@@ -272,10 +270,7 @@
PERL_ARGS_ASSERT_SAVE_GP;
- SSGROW(3);
- SSPUSHPTR(SvREFCNT_inc(gv));
- SSPUSHPTR(GvGP(gv));
- SSPUSHINT(SAVEt_GP);
+ save_pushptrptr(SvREFCNT_inc(gv), GvGP(gv), SAVEt_GP);
if (empty) {
GP *gp = Perl_newGP(aTHX_ gv);
@@ -313,10 +308,7 @@
if (!AvREAL(oav) && AvREIFY(oav))
av_reify(oav);
- SSCHECK(3);
- SSPUSHPTR(gv);
- SSPUSHPTR(oav);
- SSPUSHINT(SAVEt_AV);
+ save_pushptrptr(gv, oav, SAVEt_AV);
GvAV(gv) = NULL;
av = GvAVn(gv);
@@ -333,10 +325,7 @@
PERL_ARGS_ASSERT_SAVE_HASH;
- SSCHECK(3);
- SSPUSHPTR(gv);
- SSPUSHPTR(ohv = GvHVn(gv));
- SSPUSHINT(SAVEt_HV);
+ save_pushptrptr(gv, (ohv = GvHVn(gv)), SAVEt_HV);
GvHV(gv) = NULL;
hv = GvHVn(gv);
@@ -353,10 +342,9 @@
PERL_ARGS_ASSERT_SAVE_ITEM;
- SSCHECK(3);
- SSPUSHPTR(item); /* remember the pointer */
- SSPUSHPTR(sv); /* remember the value */
- SSPUSHINT(SAVEt_ITEM);
+ save_pushptrptr(item, /* remember the pointer */
+ sv, /* remember the value */
+ SAVEt_ITEM);
}
void
@@ -434,10 +422,7 @@
PERL_ARGS_ASSERT_SAVE_PPTR;
- SSCHECK(3);
- SSPUSHPTR(*pptr);
- SSPUSHPTR(pptr);
- SSPUSHINT(SAVEt_PPTR);
+ save_pushptrptr(*pptr, pptr, SAVEt_PPTR);
}
void
@@ -447,10 +432,7 @@
PERL_ARGS_ASSERT_SAVE_VPTR;
- SSCHECK(3);
- SSPUSHPTR(*(char**)ptr);
- SSPUSHPTR(ptr);
- SSPUSHINT(SAVEt_VPTR);
+ save_pushptrptr(*(char**)ptr, ptr, SAVEt_VPTR);
}
void
@@ -460,10 +442,7 @@
PERL_ARGS_ASSERT_SAVE_SPTR;
- SSCHECK(3);
- SSPUSHPTR(*sptr);
- SSPUSHPTR(sptr);
- SSPUSHINT(SAVEt_SPTR);
+ save_pushptrptr(*sptr, sptr, SAVEt_SPTR);
}
void
@@ -485,10 +464,7 @@
PERL_ARGS_ASSERT_SAVE_HPTR;
- SSCHECK(3);
- SSPUSHPTR(*hptr);
- SSPUSHPTR(hptr);
- SSPUSHINT(SAVEt_HPTR);
+ save_pushptrptr(*hptr, hptr, SAVEt_HPTR);
}
void
@@ -498,10 +474,7 @@
PERL_ARGS_ASSERT_SAVE_APTR;
- SSCHECK(3);
- SSPUSHPTR(*aptr);
- SSPUSHPTR(aptr);
- SSPUSHINT(SAVEt_APTR);
+ save_pushptrptr(*aptr, aptr, SAVEt_APTR);
}
void
@@ -623,10 +596,7 @@
PERL_ARGS_ASSERT_SAVE_SVREF;
SvGETMAGIC(*sptr);
- SSCHECK(3);
- SSPUSHPTR(sptr);
- SSPUSHPTR(SvREFCNT_inc(*sptr));
- SSPUSHINT(SAVEt_SVREF);
+ save_pushptrptr(sptr, SvREFCNT_inc(*sptr), SAVEt_SVREF);
return save_scalar_at(sptr, SAVEf_SETMAGIC); /* XXX - FIXME - see #60360 */
}
End of Patch.
