[asperl] various tweaks

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

diff --git a/scope.c b/scope.c
index 3fc1a0e..0705922 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -16,29 +16,33 @@
 #include "perl.h"
 
 SV**
-stack_grow(sp, p, n)
-SV** sp;
-SV** p;
-int n;
+stack_grow(SV **sp, SV **p, int n)
 {
     dTHR;
+#if defined(DEBUGGING) && !defined(USE_THREADS)
+    static int growing = 0;
+    if (growing++)
+      abort();
+#endif
     stack_sp = sp;
     av_extend(curstack, (p - stack_base) + (n) + 128);
+#if defined(DEBUGGING) && !defined(USE_THREADS)
+    growing--;
+#endif
     return stack_sp;
 }
 
 I32
-cxinc()
+cxinc(void)
 {
     dTHR;
     cxstack_max = cxstack_max * 3 / 2;
-    Renew(cxstack, cxstack_max + 1, CONTEXT);  /* XXX should fix CXINC macro */
+    Renew(cxstack, cxstack_max + 1, PERL_CONTEXT);     /* XXX should fix CXINC macro */
     return cxstack_ix + 1;
 }
 
 void
-push_return(retop)
-OP *retop;
+push_return(OP *retop)
 {
     dTHR;
     if (retstack_ix == retstack_max) {
@@ -49,7 +53,7 @@ OP *retop;
 }
 
 OP *
-pop_return()
+pop_return(void)
 {
     dTHR;
     if (retstack_ix > 0)
@@ -59,7 +63,7 @@ pop_return()
 }
 
 void
-push_scope()
+push_scope(void)
 {
     dTHR;
     if (scopestack_ix == scopestack_max) {
@@ -71,7 +75,7 @@ push_scope()
 }
 
 void
-pop_scope()
+pop_scope(void)
 {
     dTHR;
     I32 oldsave = scopestack[--scopestack_ix];
@@ -79,7 +83,7 @@ pop_scope()
 }
 
 void
-markstack_grow()
+markstack_grow(void)
 {
     dTHR;
     I32 oldmax = markstack_max - markstack;
@@ -91,7 +95,7 @@ markstack_grow()
 }
 
 void
-savestack_grow()
+savestack_grow(void)
 {
     dTHR;
     savestack_max = savestack_max * 3 / 2;
@@ -99,7 +103,7 @@ savestack_grow()
 }
 
 void
-free_tmps()
+free_tmps(void)
 {
     dTHR;
     /* XXX should tmps_floor live in cxstack? */
@@ -116,9 +120,8 @@ free_tmps()
     }
 }
 
-static SV *
-save_scalar_at(sptr)
-SV **sptr;
+STATIC SV *
+save_scalar_at(SV **sptr)
 {
     dTHR;
     register SV *sv;
@@ -149,8 +152,7 @@ SV **sptr;
 }
 
 SV *
-save_scalar(gv)
-GV *gv;
+save_scalar(GV *gv)
 {
     dTHR;
     SSCHECK(3);
@@ -161,8 +163,7 @@ GV *gv;
 }
 
 SV*
-save_svref(sptr)
-SV **sptr;
+save_svref(SV **sptr)
 {
     dTHR;
     SSCHECK(3);
@@ -173,9 +174,7 @@ SV **sptr;
 }
 
 void
-save_gp(gv, empty)
-GV *gv;
-I32 empty;
+save_gp(GV *gv, I32 empty)
 {
     dTHR;
     SSCHECK(6);
@@ -203,15 +202,17 @@ I32 empty;
 }
 
 AV *
-save_ary(gv)
-GV *gv;
+save_ary(GV *gv)
 {
     dTHR;
-    AV *oav, *av;
+    AV *oav = GvAVn(gv);
+    AV *av;
 
+    if (!AvREAL(oav) && AvREIFY(oav))
+       av_reify(oav);
     SSCHECK(3);
     SSPUSHPTR(gv);
-    SSPUSHPTR(oav = GvAVn(gv));
+    SSPUSHPTR(oav);
     SSPUSHINT(SAVEt_AV);
 
     GvAV(gv) = Null(AV*);
@@ -229,8 +230,7 @@ GV *gv;
 }
 
 HV *
-save_hash(gv)
-GV *gv;
+save_hash(GV *gv)
 {
     dTHR;
     HV *ohv, *hv;
@@ -255,8 +255,7 @@ GV *gv;
 }
 
 void
-save_item(item)
-register SV *item;
+save_item(register SV *item)
 {
     dTHR;
     register SV *sv;
@@ -270,8 +269,7 @@ register SV *item;
 }
 
 void
-save_int(intp)
-int *intp;
+save_int(int *intp)
 {
     dTHR;
     SSCHECK(3);
@@ -281,8 +279,7 @@ int *intp;
 }
 
 void
-save_long(longp)
-long *longp;
+save_long(long int *longp)
 {
     dTHR;
     SSCHECK(3);
@@ -292,8 +289,7 @@ long *longp;
 }
 
 void
-save_I32(intp)
-I32 *intp;
+save_I32(I32 *intp)
 {
     dTHR;
     SSCHECK(3);
@@ -303,8 +299,7 @@ I32 *intp;
 }
 
 void
-save_I16(intp)
-I16 *intp;
+save_I16(I16 *intp)
 {
     dTHR;
     SSCHECK(3);
@@ -314,8 +309,7 @@ I16 *intp;
 }
 
 void
-save_iv(ivp)
-IV *ivp;
+save_iv(IV *ivp)
 {
     dTHR;
     SSCHECK(3);
@@ -328,8 +322,7 @@ IV *ivp;
  * force word-alignment and we'll miss the pointer.
  */
 void
-save_pptr(pptr)
-char **pptr;
+save_pptr(char **pptr)
 {
     dTHR;
     SSCHECK(3);
@@ -339,8 +332,7 @@ char **pptr;
 }
 
 void
-save_sptr(sptr)
-SV **sptr;
+save_sptr(SV **sptr)
 {
     dTHR;
     SSCHECK(3);
@@ -349,9 +341,24 @@ SV **sptr;
     SSPUSHINT(SAVEt_SPTR);
 }
 
+SV **
+save_threadsv(PADOFFSET i)
+{
+#ifdef USE_THREADS
+    dTHR;
+    SV **svp = av_fetch(thr->threadsv, i, FALSE);
+    DEBUG_L(PerlIO_printf(PerlIO_stderr(), "save_threadsv %u: %p %p:%s\n",
+                         i, svp, *svp, SvPEEK(*svp)));
+    save_svref(svp);
+    return svp;
+#else
+    croak("panic: save_threadsv called in non-threaded perl");
+    return 0;
+#endif /* USE_THREADS */
+}
+
 void
-save_nogv(gv)
-GV *gv;
+save_nogv(GV *gv)
 {
     dTHR;
     SSCHECK(2);
@@ -360,8 +367,7 @@ GV *gv;
 }
 
 void
-save_hptr(hptr)
-HV **hptr;
+save_hptr(HV **hptr)
 {
     dTHR;
     SSCHECK(3);
@@ -371,8 +377,7 @@ HV **hptr;
 }
 
 void
-save_aptr(aptr)
-AV **aptr;
+save_aptr(AV **aptr)
 {
     dTHR;
     SSCHECK(3);
@@ -382,8 +387,7 @@ AV **aptr;
 }
 
 void
-save_freesv(sv)
-SV *sv;
+save_freesv(SV *sv)
 {
     dTHR;
     SSCHECK(2);
@@ -392,8 +396,7 @@ SV *sv;
 }
 
 void
-save_freeop(o)
-OP *o;
+save_freeop(OP *o)
 {
     dTHR;
     SSCHECK(2);
@@ -402,8 +405,7 @@ OP *o;
 }
 
 void
-save_freepv(pv)
-char *pv;
+save_freepv(char *pv)
 {
     dTHR;
     SSCHECK(2);
@@ -412,8 +414,7 @@ char *pv;
 }
 
 void
-save_clearsv(svp)
-SV** svp;
+save_clearsv(SV **svp)
 {
     dTHR;
     SSCHECK(2);
@@ -422,10 +423,7 @@ SV** svp;
 }
 
 void
-save_delete(hv,key,klen)
-HV *hv;
-char *key;
-I32 klen;
+save_delete(HV *hv, char *key, I32 klen)
 {
     dTHR;
     SSCHECK(4);
@@ -436,9 +434,7 @@ I32 klen;
 }
 
 void
-save_list(sarg,maxsarg)
-register SV **sarg;
-I32 maxsarg;
+save_list(register SV **sarg, I32 maxsarg)
 {
     dTHR;
     register SV *sv;
@@ -455,9 +451,11 @@ I32 maxsarg;
 }
 
 void
-save_destructor(f,p)
-void (*f) _((void*));
-void* p;
+#ifdef PERL_OBJECT
+save_destructor(void (*f) (void*, void*), void* p)
+#else
+save_destructor(void (*f) (void *), void *p)
+#endif
 {
     dTHR;
     SSCHECK(3);
@@ -467,7 +465,7 @@ void* p;
 }
 
 void
-save_op()
+save_op(void)
 {
     dTHR;
     SSCHECK(2);
@@ -476,8 +474,7 @@ save_op()
 }
 
 void
-leave_scope(base)
-I32 base;
+leave_scope(I32 base)
 {
     dTHR;
     register SV *sv;
@@ -509,6 +506,9 @@ I32 base;
            ptr = SSPOPPTR;
        restore_sv:
            sv = *(SV**)ptr;
+           DEBUG_L(PerlIO_printf(PerlIO_stderr(),
+                                 "restore svref: %p %p:%s -> %p:%s\n",
+                                 ptr, sv, SvPEEK(sv), value, SvPEEK(value)));
            if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv) &&
                SvTYPE(sv) != SVt_PVGV)
            {
@@ -673,12 +673,12 @@ I32 base;
            }
            else {      /* Someone has a claim on this, so abandon it. */
                U32 padflags = SvFLAGS(sv) & (SVs_PADBUSY|SVs_PADMY|SVs_PADTMP);
-               SvREFCNT_dec(sv);       /* Cast current value to the winds. */
                switch (SvTYPE(sv)) {   /* Console ourselves with a new value */
                case SVt_PVAV:  *(SV**)ptr = (SV*)newAV();      break;
                case SVt_PVHV:  *(SV**)ptr = (SV*)newHV();      break;
                default:        *(SV**)ptr = NEWSV(0,0);        break;
                }
+               SvREFCNT_dec(sv);       /* Cast current value to the winds. */
                SvFLAGS(*(SV**)ptr) |= padflags; /* preserve pad nature */
            }
            break;
@@ -691,7 +691,7 @@ I32 base;
            break;
        case SAVEt_DESTRUCTOR:
            ptr = SSPOPPTR;
-           (*SSPOPDPTR)(ptr);
+           (*SSPOPDPTR)(THIS_ ptr);
            break;
        case SAVEt_REGCONTEXT:
            {
@@ -717,8 +717,7 @@ I32 base;
 #ifdef DEBUGGING
 
 void
-cx_dump(cx)
-CONTEXT* cx;
+cx_dump(PERL_CONTEXT *cx)
 {
     dTHR;
     PerlIO_printf(Perl_debug_log, "CX %ld = %s\n", (long)(cx - cxstack), block_type[cx->cx_type]);