Configure updates for intsize and ssizetype

[p5sagit/p5-mst-13.2.git] / scope.h

diff --git a/scope.h b/scope.h
index e2e2004..53081a3 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -3,24 +3,70 @@
 #define SAVEt_AV       2
 #define SAVEt_HV       3
 #define SAVEt_INT      4
-#define SAVEt_I32      5
-#define SAVEt_SPTR     6
-#define SAVEt_HPTR     7
-#define SAVEt_APTR     8
-#define SAVEt_NSTAB    9
-#define SAVEt_SVREF    10
-#define SAVEt_GP       11
-#define SAVEt_FREESV   12
-#define SAVEt_FREEOP   13
-#define SAVEt_FREEPV   14
-#define SAVEt_CLEARSV  15
-#define SAVEt_DELETE   16
+#define SAVEt_LONG     5
+#define SAVEt_I32      6
+#define SAVEt_IV       7
+#define SAVEt_SPTR     8
+#define SAVEt_APTR     9
+#define SAVEt_HPTR     10
+#define SAVEt_PPTR     11
+#define SAVEt_NSTAB    12
+#define SAVEt_SVREF    13
+#define SAVEt_GP       14
+#define SAVEt_FREESV   15
+#define SAVEt_FREEOP   16
+#define SAVEt_FREEPV   17
+#define SAVEt_CLEARSV  18
+#define SAVEt_DELETE   19
+#define SAVEt_DESTRUCTOR 20
+#define SAVEt_REGCONTEXT 21
+#define SAVEt_STACK_POS  22
+#define SAVEt_I16      23
 
 #define SSCHECK(need) if (savestack_ix + need > savestack_max) savestack_grow()
 #define SSPUSHINT(i) (savestack[savestack_ix++].any_i32 = (I32)(i))
+#define SSPUSHLONG(i) (savestack[savestack_ix++].any_long = (long)(i))
+#define SSPUSHIV(i) (savestack[savestack_ix++].any_iv = (IV)(i))
 #define SSPUSHPTR(p) (savestack[savestack_ix++].any_ptr = (void*)(p))
+#define SSPUSHDPTR(p) (savestack[savestack_ix++].any_dptr = (p))
 #define SSPOPINT (savestack[--savestack_ix].any_i32)
+#define SSPOPLONG (savestack[--savestack_ix].any_long)
+#define SSPOPIV (savestack[--savestack_ix].any_iv)
 #define SSPOPPTR (savestack[--savestack_ix].any_ptr)
+#define SSPOPDPTR (savestack[--savestack_ix].any_dptr)
 
-#define FREE_TMPS() if (tmps_ix > tmps_floor) free_tmps()
+#define SAVETMPS save_int((int*)&tmps_floor), tmps_floor = tmps_ix
+#define FREETMPS if (tmps_ix > tmps_floor) free_tmps()
+#ifdef DEPRECATED
+#define FREE_TMPS() FREETMPS
+#endif
+
+#define ENTER push_scope()
+#define LEAVE pop_scope()
 #define LEAVE_SCOPE(old) if (savestack_ix > old) leave_scope(old)
+
+/*
+ * Not using SOFT_CAST on SAVEFREESV and SAVEFREESV
+ * because these are used for several kinds of pointer values
+ */
+#define SAVEI16(i)     save_I16(SOFT_CAST(I16*)&(i));
+#define SAVEI32(i)     save_I32(SOFT_CAST(I32*)&(i));
+#define SAVEINT(i)     save_int(SOFT_CAST(int*)&(i));
+#define SAVEIV(i)      save_iv(SOFT_CAST(IV*)&(i));
+#define SAVELONG(l)    save_long(SOFT_CAST(long*)&(l));
+#define SAVESPTR(s)    save_sptr((SV**)&(s))
+#define SAVEPPTR(s)    save_pptr(SOFT_CAST(char**)&(s))
+#define SAVEFREESV(s)  save_freesv((SV*)(s))
+#define SAVEFREEOP(o)  save_freeop(SOFT_CAST(OP*)(o))
+#define SAVEFREEPV(p)  save_freepv(SOFT_CAST(char*)(p))
+#define SAVECLEARSV(sv)        save_clearsv(SOFT_CAST(SV**)&(sv))
+#define SAVEDELETE(h,k,l) \
+         save_delete(SOFT_CAST(HV*)(h), SOFT_CAST(char*)(k), (I32)(l))
+#define SAVEDESTRUCTOR(f,p) \
+         save_destructor(SOFT_CAST(void(*)_((void*)))(f),SOFT_CAST(void*)(p))
+#define SAVESTACK_POS() STMT_START {   \
+    SSCHECK(2);                                \
+    SSPUSHINT(stack_sp - stack_base);  \
+    SSPUSHINT(SAVEt_STACK_POS);                \
+ } STMT_END
+