[win32] merge change#985 from maintbranch

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

diff --git a/scope.c b/scope.c
index 1dfb25a..8d6ee70 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -25,18 +25,48 @@ stack_grow(SV **sp, SV **p, int n)
       abort();
 #endif
     stack_sp = sp;
+#ifndef STRESS_REALLOC
     av_extend(curstack, (p - stack_base) + (n) + 128);
+#else
+    av_extend(curstack, (p - stack_base) + (n) + 1);
+#endif
 #if defined(DEBUGGING) && !defined(USE_THREADS)
     growing--;
 #endif
     return stack_sp;
 }
 
+#ifndef STRESS_REALLOC
+#define GROW(old) ((old) * 3 / 2)
+#else
+#define GROW(old) ((old) + 1)
+#endif
+
+PERL_SI *
+new_stackinfo(I32 stitems, I32 cxitems)
+{
+    PERL_SI *si;
+    PERL_CONTEXT *cxt;
+    New(56, si, 1, PERL_SI);
+    si->si_stack = newAV();
+    AvREAL_off(si->si_stack);
+    av_extend(si->si_stack, stitems > 0 ? stitems-1 : 0);
+    AvALLOC(si->si_stack)[0] = &sv_undef;
+    AvFILLp(si->si_stack) = 0;
+    si->si_prev = 0;
+    si->si_next = 0;
+    si->si_cxmax = cxitems - 1;
+    si->si_cxix = -1;
+    si->si_type = SI_UNDEF;
+    New(56, si->si_cxstack, cxitems, PERL_CONTEXT);
+    return si;
+}
+
 I32
 cxinc(void)
 {
     dTHR;
-    cxstack_max = cxstack_max * 3 / 2;
+    cxstack_max = GROW(cxstack_max);
     Renew(cxstack, cxstack_max + 1, PERL_CONTEXT);     /* XXX should fix CXINC macro */
     return cxstack_ix + 1;
 }
@@ -46,7 +76,7 @@ push_return(OP *retop)
 {
     dTHR;
     if (retstack_ix == retstack_max) {
-       retstack_max = retstack_max * 3 / 2;
+       retstack_max = GROW(retstack_max);
        Renew(retstack, retstack_max, OP*);
     }
     retstack[retstack_ix++] = retop;
@@ -67,7 +97,7 @@ push_scope(void)
 {
     dTHR;
     if (scopestack_ix == scopestack_max) {
-       scopestack_max = scopestack_max * 3 / 2;
+       scopestack_max = GROW(scopestack_max);
        Renew(scopestack, scopestack_max, I32);
     }
     scopestack[scopestack_ix++] = savestack_ix;
@@ -87,7 +117,7 @@ markstack_grow(void)
 {
     dTHR;
     I32 oldmax = markstack_max - markstack;
-    I32 newmax = oldmax * 3 / 2;
+    I32 newmax = GROW(oldmax);
 
     Renew(markstack, newmax, I32);
     markstack_ptr = markstack + oldmax;
@@ -98,10 +128,12 @@ void
 savestack_grow(void)
 {
     dTHR;
-    savestack_max = savestack_max * 3 / 2;
+    savestack_max = GROW(savestack_max) + 4; 
     Renew(savestack, savestack_max, ANY);
 }
 
+#undef GROW
+
 void
 free_tmps(void)
 {