Mv all Perl_save* functions from mathoms to macros

into scope.h
Perl · Nov 17, 2024 · 354c4cb · 354c4cb
1 parent 6a3ea4b
commit 354c4cb
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 57 deletions.
diff --git a/embed.fnc b/embed.fnc
@@ -2910,10 +2910,10 @@ Cp	|void	|save_destructor_x					\
 				|DESTRUCTORFUNC_t f			\
 				|NULLOK void *p
 : Used in SAVEFREOP(), used in op.c, pp_ctl.c
-CMbp	|void	|save_freeop	|NULLOK OP *o
+Cmp	|void	|save_freeop	|NULLOK OP *o
 Cmp	|void	|save_freepv	|NULLOK char *pv
 Cdp	|void	|save_freercpv	|NN char *rcpv
-CMbp	|void	|save_freesv	|NULLOK SV *sv
+Cmp	|void	|save_freesv	|NULLOK SV *sv
 Cdp	|void	|save_generic_pvref					\
 				|NN char **str
 Cdp	|void	|save_generic_svref					\
@@ -2939,10 +2939,10 @@ Cp	|void	|save_I8	|NN I8 *bytep
 Cp	|void	|save_int	|NN int *intp
 Adhp	|void	|save_item	|NN SV *item
 Cp	|void	|save_iv	|NN IV *ivp
-CMbp	|void	|save_mortalizesv					\
+Cmp	|void	|save_mortalizesv					\
 				|NN SV *sv
 : Used in SAVEFREOP(), used in gv.c, op.c, perl.c, pp_ctl.c, pp_sort.c
-CMbdp	|void	|save_op
+Cdmp	|void	|save_op
 Cdp	|void	|save_padsv_and_mortalize				\
 				|PADOFFSET off
 Cp	|void	|save_pptr	|NN char **pptr

diff --git a/embed.h b/embed.h
@@ -618,8 +618,10 @@
 # define save_delete(a,b,c)                     Perl_save_delete(aTHX_ a,b,c)
 # define save_destructor(a,b)                   Perl_save_destructor(aTHX_ a,b)
 # define save_destructor_x(a,b)                 Perl_save_destructor_x(aTHX_ a,b)
+# define save_freeop(a)                         Perl_save_freeop(aTHX,a)
 # define save_freepv(a)                         Perl_save_freepv(aTHX,a)
 # define save_freercpv(a)                       Perl_save_freercpv(aTHX_ a)
+# define save_freesv(a)                         Perl_save_freesv(aTHX,a)
 # define save_generic_pvref(a)                  Perl_save_generic_pvref(aTHX_ a)
 # define save_generic_svref(a)                  Perl_save_generic_svref(aTHX_ a)
 # define save_gp(a,b)                           Perl_save_gp(aTHX_ a,b)
@@ -631,6 +633,8 @@
 # define save_int(a)                            Perl_save_int(aTHX_ a)
 # define save_item(a)                           Perl_save_item(aTHX_ a)
 # define save_iv(a)                             Perl_save_iv(aTHX_ a)
+# define save_mortalizesv(a)                    Perl_save_mortalizesv(aTHX,a)
+# define save_op()                              Perl_save_op(aTHX)
 # define save_padsv_and_mortalize(a)            Perl_save_padsv_and_mortalize(aTHX_ a)
 # define save_pptr(a)                           Perl_save_pptr(aTHX_ a)
 # define save_pushi32ptr(a,b,c)                 Perl_save_pushi32ptr(aTHX_ a,b,c)

diff --git a/mathoms.c b/mathoms.c
@@ -135,32 +135,6 @@ Perl_sv_nounlocking(pTHX_ SV *sv)
     PERL_UNUSED_ARG(sv);
 }
 
-void
-Perl_save_freesv(pTHX_ SV *sv)
-{
-    save_freesv(sv);
-}
-
-void
-Perl_save_mortalizesv(pTHX_ SV *sv)
-{
-    PERL_ARGS_ASSERT_SAVE_MORTALIZESV;
-
-    save_mortalizesv(sv);
-}
-
-void
-Perl_save_freeop(pTHX_ OP *o)
-{
-    save_freeop(o);
-}
-
-void
-Perl_save_op(pTHX)
-{
-    save_op();
-}
-
 IO *
 Perl_newIO(pTHX)
 {

diff --git a/proto.h b/proto.h
diff --git a/scope.h b/scope.h
@@ -294,15 +294,17 @@ casts it to a pointer of that C<type>.
 #define SSPTR(off,type)         (assert(sizeof(off) >= sizeof(SSize_t)), (type)  ((char*)PL_savestack + off))
 #define SSPTRt(off,type)        (assert(sizeof(off) >= sizeof(SSize_t)), (type*) ((char*)PL_savestack + off))
 
-#define save_freesv(op)		save_pushptr((void *)(op), SAVEt_FREESV)
-#define save_mortalizesv(op)	save_pushptr((void *)(op), SAVEt_MORTALIZESV)
-
-# define save_freeop(op)                    \
-STMT_START {                                 \
-      OP * const _o = (OP *)(op);             \
-      assert(!_o->op_savefree);               \
-      _o->op_savefree = 1;                     \
-      save_pushptr((void *)(_o), SAVEt_FREEOP); \
+#define Perl_save_freesv(mTHX, op)                                          \
+        Perl_save_pushptr(aTHX_ (void *)(op), SAVEt_FREESV)
+#define Perl_save_mortalizesv(mTHX, op)                                     \
+        Perl_save_pushptr(aTHX_ (void *)(op), SAVEt_MORTALIZESV)
+
+# define Perl_save_freeop(mTHX, op)                                         \
+STMT_START {                                                                \
+      OP * const _o = (OP *)(op);                                           \
+      assert(!_o->op_savefree);                                             \
+      _o->op_savefree = 1;                                                  \
+      Perl_save_pushptr(aTHX_ (void *)(_o), SAVEt_FREEOP);                  \
     } STMT_END
 #define Perl_save_freepv(mTHX, pv)                          \
         Perl_save_pushptr(aTHX_ (void *)(pv), SAVEt_FREEPV)
@@ -316,7 +318,7 @@ Implements C<SAVEOP>.
 =cut
  */
 
-#define save_op()		save_pushptr((void *)(PL_op), SAVEt_OP)
+#define Perl_save_op(mTHX)  Perl_save_pushptr(aTHX_ (void *)(PL_op), SAVEt_OP)
 
 /*
  * ex: set ts=8 sts=4 sw=4 et: