Introduce pp_lock.

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

diff --git a/scope.c b/scope.c
index 2fdea90..01b1fa9 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -1,6 +1,6 @@
 /*    scope.c
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -21,6 +21,7 @@ SV** sp;
 SV** p;
 int n;
 {
+    dTHR;
     stack_sp = sp;
     av_extend(curstack, (p - stack_base) + (n) + 128);
     return stack_sp;
@@ -29,6 +30,7 @@ int n;
 I32
 cxinc()
 {
+    dTHR;
     cxstack_max = cxstack_max * 3 / 2;
     Renew(cxstack, cxstack_max + 1, CONTEXT);  /* XXX should fix CXINC macro */
     return cxstack_ix + 1;
@@ -38,6 +40,7 @@ void
 push_return(retop)
 OP *retop;
 {
+    dTHR;
     if (retstack_ix == retstack_max) {
        retstack_max = retstack_max * 3 / 2;
        Renew(retstack, retstack_max, OP*);
@@ -48,6 +51,7 @@ OP *retop;
 OP *
 pop_return()
 {
+    dTHR;
     if (retstack_ix > 0)
        return retstack[--retstack_ix];
     else
@@ -57,6 +61,7 @@ pop_return()
 void
 push_scope()
 {
+    dTHR;
     if (scopestack_ix == scopestack_max) {
        scopestack_max = scopestack_max * 3 / 2;
        Renew(scopestack, scopestack_max, I32);
@@ -68,6 +73,7 @@ push_scope()
 void
 pop_scope()
 {
+    dTHR;
     I32 oldsave = scopestack[--scopestack_ix];
     LEAVE_SCOPE(oldsave);
 }
@@ -75,6 +81,7 @@ pop_scope()
 void
 markstack_grow()
 {
+    dTHR;
     I32 oldmax = markstack_max - markstack;
     I32 newmax = oldmax * 3 / 2;
 
@@ -86,6 +93,7 @@ markstack_grow()
 void
 savestack_grow()
 {
+    dTHR;
     savestack_max = savestack_max * 3 / 2;
     Renew(savestack, savestack_max, ANY);
 }
@@ -93,6 +101,7 @@ savestack_grow()
 void
 free_tmps()
 {
+    dTHR;
     /* XXX should tmps_floor live in cxstack? */
     I32 myfloor = tmps_floor;
     while (tmps_ix > myfloor) {      /* clean up after last statement */
@@ -111,6 +120,7 @@ static SV *
 save_scalar_at(sptr)
 SV **sptr;
 {
+    dTHR;
     register SV *sv;
     SV *osv = *sptr;
 
@@ -142,6 +152,7 @@ SV *
 save_scalar(gv)
 GV *gv;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(gv);
     SSPUSHPTR(GvSV(gv));
@@ -153,6 +164,7 @@ SV*
 save_svref(sptr)
 SV **sptr;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(sptr);
     SSPUSHPTR(*sptr);
@@ -165,6 +177,7 @@ save_gp(gv, empty)
 GV *gv;
 I32 empty;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(SvREFCNT_inc(gv));
     SSPUSHPTR(GvGP(gv));
@@ -173,14 +186,13 @@ I32 empty;
     if (empty) {
        register GP *gp;
        Newz(602, gp, 1, GP);
-       GvGP(gv) = gp;
-       GvREFCNT(gv) = 1;
+       GvGP(gv) = gp_ref(gp);
        GvSV(gv) = NEWSV(72,0);
        GvLINE(gv) = curcop->cop_line;
        GvEGV(gv) = gv;
     }
     else {
-       GvGP(gv)->gp_refcnt++;
+       gp_ref(GvGP(gv));
        GvINTRO_on(gv);
     }
 }
@@ -189,6 +201,7 @@ AV *
 save_ary(gv)
 GV *gv;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(gv);
     SSPUSHPTR(GvAVn(gv));
@@ -202,6 +215,7 @@ HV *
 save_hash(gv)
 GV *gv;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(gv);
     SSPUSHPTR(GvHVn(gv));
@@ -215,6 +229,7 @@ void
 save_item(item)
 register SV *item;
 {
+    dTHR;
     register SV *sv;
 
     SSCHECK(3);
@@ -229,6 +244,7 @@ void
 save_int(intp)
 int *intp;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHINT(*intp);
     SSPUSHPTR(intp);
@@ -239,6 +255,7 @@ void
 save_long(longp)
 long *longp;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHLONG(*longp);
     SSPUSHPTR(longp);
@@ -249,6 +266,7 @@ void
 save_I32(intp)
 I32 *intp;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHINT(*intp);
     SSPUSHPTR(intp);
@@ -259,6 +277,7 @@ void
 save_I16(intp)
 I16 *intp;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHINT(*intp);
     SSPUSHPTR(intp);
@@ -269,6 +288,7 @@ void
 save_iv(ivp)
 IV *ivp;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHIV(*ivp);
     SSPUSHPTR(ivp);
@@ -282,6 +302,7 @@ void
 save_pptr(pptr)
 char **pptr;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(*pptr);
     SSPUSHPTR(pptr);
@@ -292,6 +313,7 @@ void
 save_sptr(sptr)
 SV **sptr;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(*sptr);
     SSPUSHPTR(sptr);
@@ -302,6 +324,7 @@ void
 save_nogv(gv)
 GV *gv;
 {
+    dTHR;
     SSCHECK(2);
     SSPUSHPTR(gv);
     SSPUSHINT(SAVEt_NSTAB);
@@ -311,6 +334,7 @@ void
 save_hptr(hptr)
 HV **hptr;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(*hptr);
     SSPUSHPTR(hptr);
@@ -321,6 +345,7 @@ void
 save_aptr(aptr)
 AV **aptr;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHPTR(*aptr);
     SSPUSHPTR(aptr);
@@ -331,17 +356,19 @@ void
 save_freesv(sv)
 SV *sv;
 {
+    dTHR;
     SSCHECK(2);
     SSPUSHPTR(sv);
     SSPUSHINT(SAVEt_FREESV);
 }
 
 void
-save_freeop(op)
-OP *op;
+save_freeop(o)
+OP *o;
 {
+    dTHR;
     SSCHECK(2);
-    SSPUSHPTR(op);
+    SSPUSHPTR(o);
     SSPUSHINT(SAVEt_FREEOP);
 }
 
@@ -349,6 +376,7 @@ void
 save_freepv(pv)
 char *pv;
 {
+    dTHR;
     SSCHECK(2);
     SSPUSHPTR(pv);
     SSPUSHINT(SAVEt_FREEPV);
@@ -358,6 +386,7 @@ void
 save_clearsv(svp)
 SV** svp;
 {
+    dTHR;
     SSCHECK(2);
     SSPUSHLONG((long)(svp-curpad));
     SSPUSHINT(SAVEt_CLEARSV);
@@ -369,6 +398,7 @@ HV *hv;
 char *key;
 I32 klen;
 {
+    dTHR;
     SSCHECK(4);
     SSPUSHINT(klen);
     SSPUSHPTR(key);
@@ -381,6 +411,7 @@ save_list(sarg,maxsarg)
 register SV **sarg;
 I32 maxsarg;
 {
+    dTHR;
     register SV *sv;
     register I32 i;
 
@@ -399,6 +430,7 @@ save_destructor(f,p)
 void (*f) _((void*));
 void* p;
 {
+    dTHR;
     SSCHECK(3);
     SSPUSHDPTR(f);
     SSPUSHPTR(p);
@@ -406,9 +438,19 @@ void* p;
 }
 
 void
+save_op()
+{
+    dTHR;
+    SSCHECK(2);
+    SSPUSHPTR(op);
+    SSPUSHINT(SAVEt_OP);
+}
+
+void
 leave_scope(base)
 I32 base;
 {
+    dTHR;
     register SV *sv;
     register SV *value;
     register GV *gv;
@@ -526,7 +568,8 @@ I32 base;
            break;
        case SAVEt_FREEOP:
            ptr = SSPOPPTR;
-           curpad = AvARRAY(comppad);
+           if (comppad)
+               curpad = AvARRAY(comppad);
            op_free((OP*)ptr);
            break;
        case SAVEt_FREEPV:
@@ -556,13 +599,15 @@ I32 base;
                    hv_clear((HV*)sv);
                    break;
                case SVt_PVCV:
-                   sub_generation++;
-                   cv_undef((CV*)sv);
+                   croak("panic: leave_scope pad code");
+               case SVt_RV:
+               case SVt_IV:
+               case SVt_NV:
+                   (void)SvOK_off(sv);
                    break;
                default:
-                   if (SvPOK(sv) && SvLEN(sv))
-                       (void)SvOOK_off(sv);
                    (void)SvOK_off(sv);
+                   (void)SvOOK_off(sv);
                    break;
                }
            }
@@ -600,6 +645,9 @@ I32 base;
                stack_sp = stack_base + delta;
            }
            break;
+       case SAVEt_OP:
+           op = (OP*)SSPOPPTR;
+           break;
        default:
            croak("panic: leave_scope inconsistency");
        }
@@ -612,6 +660,7 @@ void
 cx_dump(cx)
 CONTEXT* cx;
 {
+    dTHR;
     PerlIO_printf(Perl_debug_log, "CX %d = %s\n", cx - cxstack, block_type[cx->cx_type]);
     if (cx->cx_type != CXt_SUBST) {
        PerlIO_printf(Perl_debug_log, "BLK_OLDSP = %ld\n", (long)cx->blk_oldsp);
@@ -695,8 +744,8 @@ CONTEXT* cx;
                (long)cx->sb_m);
        PerlIO_printf(Perl_debug_log, "SB_STREND = 0x%lx\n",
                (long)cx->sb_strend);
-       PerlIO_printf(Perl_debug_log, "SB_SUBBASE = 0x%lx\n",
-               (long)cx->sb_subbase);
+       PerlIO_printf(Perl_debug_log, "SB_RXRES = 0x%lx\n",
+               (long)cx->sb_rxres);
        break;
     }
 }