X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=scope.c;h=4a2a778605b9aa276eb680132898a20620e769d5;hb=13e080377416312a935982b1a5c15673e6ce0d66;hp=548ebdc28a7822955269af6a1effbf3cd04eb596;hpb=e788e7d35b1f8979a002a1e994535be7aae30018;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/scope.c b/scope.c
index 548ebdc..4a2a778 100644
--- a/scope.c
+++ b/scope.c
@@ -1,6 +1,6 @@
 /*    scope.c
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (c) 1991-1999, 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.
@@ -24,16 +24,16 @@ stack_grow(SV **sp, SV **p, int n)
     if (growing++)
       abort();
 #endif
-    stack_sp = sp;
+    PL_stack_sp = sp;
 #ifndef STRESS_REALLOC
-    av_extend(curstack, (p - stack_base) + (n) + 128);
+    av_extend(PL_curstack, (p - PL_stack_base) + (n) + 128);
 #else
-    av_extend(curstack, (p - stack_base) + (n) + 1);
+    av_extend(PL_curstack, (p - PL_stack_base) + (n) + 1);
 #endif
 #if defined(DEBUGGING) && !defined(USE_THREADS)
     growing--;
 #endif
-    return stack_sp;
+    return PL_stack_sp;
 }
 
 #ifndef STRESS_REALLOC
@@ -51,7 +51,7 @@ new_stackinfo(I32 stitems, I32 cxitems)
     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;
+    AvALLOC(si->si_stack)[0] = &PL_sv_undef;
     AvFILLp(si->si_stack) = 0;
     si->si_prev = 0;
     si->si_next = 0;
@@ -75,19 +75,19 @@ void
 push_return(OP *retop)
 {
     dTHR;
-    if (retstack_ix == retstack_max) {
-	retstack_max = GROW(retstack_max);
-	Renew(retstack, retstack_max, OP*);
+    if (PL_retstack_ix == PL_retstack_max) {
+	PL_retstack_max = GROW(PL_retstack_max);
+	Renew(PL_retstack, PL_retstack_max, OP*);
     }
-    retstack[retstack_ix++] = retop;
+    PL_retstack[PL_retstack_ix++] = retop;
 }
 
 OP *
 pop_return(void)
 {
     dTHR;
-    if (retstack_ix > 0)
-	return retstack[--retstack_ix];
+    if (PL_retstack_ix > 0)
+	return PL_retstack[--PL_retstack_ix];
     else
 	return Nullop;
 }
@@ -96,11 +96,11 @@ void
 push_scope(void)
 {
     dTHR;
-    if (scopestack_ix == scopestack_max) {
-	scopestack_max = GROW(scopestack_max);
-	Renew(scopestack, scopestack_max, I32);
+    if (PL_scopestack_ix == PL_scopestack_max) {
+	PL_scopestack_max = GROW(PL_scopestack_max);
+	Renew(PL_scopestack, PL_scopestack_max, I32);
     }
-    scopestack[scopestack_ix++] = savestack_ix;
+    PL_scopestack[PL_scopestack_ix++] = PL_savestack_ix;
 
 }
 
@@ -108,7 +108,7 @@ void
 pop_scope(void)
 {
     dTHR;
-    I32 oldsave = scopestack[--scopestack_ix];
+    I32 oldsave = PL_scopestack[--PL_scopestack_ix];
     LEAVE_SCOPE(oldsave);
 }
 
@@ -116,20 +116,20 @@ void
 markstack_grow(void)
 {
     dTHR;
-    I32 oldmax = markstack_max - markstack;
+    I32 oldmax = PL_markstack_max - PL_markstack;
     I32 newmax = GROW(oldmax);
 
-    Renew(markstack, newmax, I32);
-    markstack_ptr = markstack + oldmax;
-    markstack_max = markstack + newmax;
+    Renew(PL_markstack, newmax, I32);
+    PL_markstack_ptr = PL_markstack + oldmax;
+    PL_markstack_max = PL_markstack + newmax;
 }
 
 void
 savestack_grow(void)
 {
     dTHR;
-    savestack_max = GROW(savestack_max) + 4; 
-    Renew(savestack, savestack_max, ANY);
+    PL_savestack_max = GROW(PL_savestack_max) + 4; 
+    Renew(PL_savestack, PL_savestack_max, ANY);
 }
 
 #undef GROW
@@ -139,14 +139,12 @@ free_tmps(void)
 {
     dTHR;
     /* XXX should tmps_floor live in cxstack? */
-    I32 myfloor = tmps_floor;
-    while (tmps_ix > myfloor) {      /* clean up after last statement */
-	SV* sv = tmps_stack[tmps_ix];
-	tmps_stack[tmps_ix--] = Nullsv;
+    I32 myfloor = PL_tmps_floor;
+    while (PL_tmps_ix > myfloor) {      /* clean up after last statement */
+	SV* sv = PL_tmps_stack[PL_tmps_ix];
+	PL_tmps_stack[PL_tmps_ix--] = Nullsv;
 	if (sv) {
-#ifdef DEBUGGING
 	    SvTEMP_off(sv);
-#endif
 	    SvREFCNT_dec(sv);		/* note, can modify tmps_ix!!! */
 	}
     }
@@ -164,21 +162,21 @@ save_scalar_at(SV **sptr)
 	sv_upgrade(sv, SvTYPE(osv));
 	if (SvGMAGICAL(osv)) {
 	    MAGIC* mg;
-	    bool oldtainted = tainted;
+	    bool oldtainted = PL_tainted;
 	    mg_get(osv);
-	    if (tainting && tainted && (mg = mg_find(osv, 't'))) {
+	    if (PL_tainting && PL_tainted && (mg = mg_find(osv, 't'))) {
 		SAVESPTR(mg->mg_obj);
 		mg->mg_obj = osv;
 	    }
 	    SvFLAGS(osv) |= (SvFLAGS(osv) &
 		(SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
-	    tainted = oldtainted;
+	    PL_tainted = oldtainted;
 	}
 	SvMAGIC(sv) = SvMAGIC(osv);
 	SvFLAGS(sv) |= SvMAGICAL(osv);
-	localizing = 1;
+	PL_localizing = 1;
 	SvSETMAGIC(sv);
-	localizing = 0;
+	PL_localizing = 0;
     }
     return sv;
 }
@@ -206,6 +204,18 @@ save_svref(SV **sptr)
     return save_scalar_at(sptr);
 }
 
+/* Like save_svref(), but doesn't deal with magic.  Can be used to
+ * restore a global SV to its prior contents, freeing new value. */
+void
+save_generic_svref(SV **sptr)
+{
+    dTHR;
+    SSCHECK(3);
+    SSPUSHPTR(sptr);
+    SSPUSHPTR(SvREFCNT_inc(*sptr));
+    SSPUSHINT(SAVEt_GENERIC_SVREF);
+}
+
 void
 save_gp(GV *gv, I32 empty)
 {
@@ -224,11 +234,11 @@ save_gp(GV *gv, I32 empty)
 	register GP *gp;
 
 	if (GvCVu(gv))
-	    sub_generation++;	/* taking a method out of circulation */
+	    PL_sub_generation++;	/* taking a method out of circulation */
 	Newz(602, gp, 1, GP);
 	GvGP(gv) = gp_ref(gp);
 	GvSV(gv) = NEWSV(72,0);
-	GvLINE(gv) = curcop->cop_line;
+	GvLINE(gv) = PL_curcop->cop_line;
 	GvEGV(gv) = gv;
     }
     else {
@@ -258,9 +268,9 @@ save_ary(GV *gv)
 	SvFLAGS(av) |= SvMAGICAL(oav);
 	SvMAGICAL_off(oav);
 	SvMAGIC(oav) = 0;
-	localizing = 1;
+	PL_localizing = 1;
 	SvSETMAGIC((SV*)av);
-	localizing = 0;
+	PL_localizing = 0;
     }
     return av;
 }
@@ -283,9 +293,9 @@ save_hash(GV *gv)
 	SvFLAGS(hv) |= SvMAGICAL(ohv);
 	SvMAGICAL_off(ohv);
 	SvMAGIC(ohv) = 0;
-	localizing = 1;
+	PL_localizing = 1;
 	SvSETMAGIC((SV*)hv);
-	localizing = 0;
+	PL_localizing = 0;
     }
     return hv;
 }
@@ -382,7 +392,7 @@ save_threadsv(PADOFFSET i)
 #ifdef USE_THREADS
     dTHR;
     SV **svp = &THREADSV(i);	/* XXX Change to save by offset */
-    DEBUG_L(PerlIO_printf(PerlIO_stderr(), "save_threadsv %u: %p %p:%s\n",
+    DEBUG_S(PerlIO_printf(PerlIO_stderr(), "save_threadsv %u: %p %p:%s\n",
 			  i, svp, *svp, SvPEEK(*svp)));
     save_svref(svp);
     return svp;
@@ -453,7 +463,7 @@ save_clearsv(SV **svp)
 {
     dTHR;
     SSCHECK(2);
-    SSPUSHLONG((long)(svp-curpad));
+    SSPUSHLONG((long)(svp-PL_curpad));
     SSPUSHINT(SAVEt_CLEARSV);
 }
 
@@ -528,10 +538,28 @@ save_op(void)
 {
     dTHR;
     SSCHECK(2);
-    SSPUSHPTR(op);
+    SSPUSHPTR(PL_op);
     SSPUSHINT(SAVEt_OP);
 }
 
+I32
+save_alloc(I32 size, I32 pad)
+{
+    dTHR;
+    register I32 start = pad + ((char*)&PL_savestack[PL_savestack_ix]
+                                - (char*)PL_savestack);
+    register I32 elems = 1 + ((size + pad - 1) / sizeof(*PL_savestack));
+
+    /* SSCHECK may not be good enough */
+    while (PL_savestack_ix + elems + 2 > PL_savestack_max)
+        savestack_grow();
+
+    PL_savestack_ix += elems;
+    SSPUSHINT(elems);
+    SSPUSHINT(SAVEt_ALLOC);
+    return start;
+}
+
 void
 leave_scope(I32 base)
 {
@@ -546,15 +574,15 @@ leave_scope(I32 base)
 
     if (base < -1)
 	croak("panic: corrupt saved stack index");
-    while (savestack_ix > base) {
+    while (PL_savestack_ix > base) {
 	switch (SSPOPINT) {
 	case SAVEt_ITEM:			/* normal string */
 	    value = (SV*)SSPOPPTR;
 	    sv = (SV*)SSPOPPTR;
 	    sv_replace(sv,value);
-	    localizing = 2;
+	    PL_localizing = 2;
 	    SvSETMAGIC(sv);
-	    localizing = 0;
+	    PL_localizing = 0;
 	    break;
         case SAVEt_SV:				/* scalar reference */
 	    value = (SV*)SSPOPPTR;
@@ -562,12 +590,22 @@ leave_scope(I32 base)
 	    ptr = &GvSV(gv);
 	    SvREFCNT_dec(gv);
 	    goto restore_sv;
+        case SAVEt_GENERIC_SVREF:		/* generic sv */
+	    value = (SV*)SSPOPPTR;
+	    ptr = SSPOPPTR;
+	    if (ptr) {
+		sv = *(SV**)ptr;
+		*(SV**)ptr = value;
+		SvREFCNT_dec(sv);
+	    }
+	    SvREFCNT_dec(value);
+	    break;
         case SAVEt_SVREF:			/* scalar reference */
 	    value = (SV*)SSPOPPTR;
 	    ptr = SSPOPPTR;
 	restore_sv:
 	    sv = *(SV**)ptr;
-	    DEBUG_L(PerlIO_printf(PerlIO_stderr(),
+	    DEBUG_S(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) &&
@@ -589,9 +627,9 @@ leave_scope(I32 base)
 	    }
             SvREFCNT_dec(sv);
 	    *(SV**)ptr = value;
-	    localizing = 2;
+	    PL_localizing = 2;
 	    SvSETMAGIC(value);
-	    localizing = 0;
+	    PL_localizing = 0;
 	    SvREFCNT_dec(value);
             break;
         case SAVEt_AV:				/* array reference */
@@ -607,9 +645,9 @@ leave_scope(I32 base)
 	    }
             GvAV(gv) = av;
 	    if (SvMAGICAL(av)) {
-		localizing = 2;
+		PL_localizing = 2;
 		SvSETMAGIC((SV*)av);
-		localizing = 0;
+		PL_localizing = 0;
 	    }
             break;
         case SAVEt_HV:				/* hash reference */
@@ -625,9 +663,9 @@ leave_scope(I32 base)
 	    }
             GvHV(gv) = hv;
 	    if (SvMAGICAL(hv)) {
-		localizing = 2;
+		PL_localizing = 2;
 		SvSETMAGIC((SV*)hv);
-		localizing = 0;
+		PL_localizing = 0;
 	    }
             break;
 	case SAVEt_INT:				/* int reference */
@@ -673,7 +711,7 @@ leave_scope(I32 base)
 	case SAVEt_GP:				/* scalar reference */
 	    ptr = SSPOPPTR;
 	    gv = (GV*)SSPOPPTR;
-            if (SvPOK(gv) && SvLEN(gv) > 0) {
+            if (SvPVX(gv) && SvLEN(gv) > 0) {
                 Safefree(SvPVX(gv));
             }
             SvPVX(gv) = (char *)SSPOPPTR;
@@ -682,7 +720,7 @@ leave_scope(I32 base)
             gp_free(gv);
             GvGP(gv) = (GP*)ptr;
 	    if (GvCVu(gv))
-		sub_generation++;  /* putting a method back into circulation */
+		PL_sub_generation++;  /* putting a method back into circulation */
 	    SvREFCNT_dec(gv);
             break;
 	case SAVEt_FREESV:
@@ -691,8 +729,8 @@ leave_scope(I32 base)
 	    break;
 	case SAVEt_FREEOP:
 	    ptr = SSPOPPTR;
-	    if (comppad)
-		curpad = AvARRAY(comppad);
+	    if (PL_comppad)
+		PL_curpad = AvARRAY(PL_comppad);
 	    op_free((OP*)ptr);
 	    break;
 	case SAVEt_FREEPV:
@@ -700,7 +738,7 @@ leave_scope(I32 base)
 	    Safefree((char*)ptr);
 	    break;
 	case SAVEt_CLEARSV:
-	    ptr = (void*)&curpad[SSPOPLONG];
+	    ptr = (void*)&PL_curpad[SSPOPLONG];
 	    sv = *(SV**)ptr;
 	    /* Can clear pad variable in place? */
 	    if (SvREFCNT(sv) <= 1 && !SvOBJECT(sv)) {
@@ -759,12 +797,13 @@ leave_scope(I32 base)
 	    (CALLDESTRUCTOR)(ptr);
 	    break;
 	case SAVEt_REGCONTEXT:
+	case SAVEt_ALLOC:
 	    i = SSPOPINT;
-	    savestack_ix -= i;  	/* regexp must have croaked */
+	    PL_savestack_ix -= i;  	/* regexp must have croaked */
 	    break;
 	case SAVEt_STACK_POS:		/* Position on Perl stack */
 	    i = SSPOPINT;
-	    stack_sp = stack_base + i;
+	    PL_stack_sp = PL_stack_base + i;
 	    break;
 	case SAVEt_AELEM:		/* array element */
 	    value = (SV*)SSPOPPTR;
@@ -773,8 +812,8 @@ leave_scope(I32 base)
 	    ptr = av_fetch(av,i,1);
 	    if (ptr) {
 		sv = *(SV**)ptr;
-		if (sv && sv != &sv_undef) {
-		    if (SvRMAGICAL(av) && mg_find((SV*)av, 'P'))
+		if (sv && sv != &PL_sv_undef) {
+		    if (SvTIED_mg((SV*)av, 'P'))
 			(void)SvREFCNT_inc(sv);
 		    SvREFCNT_dec(av);
 		    goto restore_sv;
@@ -790,9 +829,9 @@ leave_scope(I32 base)
 	    ptr = hv_fetch_ent(hv, sv, 1, 0);
 	    if (ptr) {
 		SV *oval = HeVAL((HE*)ptr);
-		if (oval && oval != &sv_undef) {
+		if (oval && oval != &PL_sv_undef) {
 		    ptr = &HeVAL((HE*)ptr);
-		    if (SvRMAGICAL(hv) && mg_find((SV*)hv, 'P'))
+		    if (SvTIED_mg((SV*)hv, 'P'))
 			(void)SvREFCNT_inc(*(SV**)ptr);
 		    SvREFCNT_dec(hv);
 		    SvREFCNT_dec(sv);
@@ -804,14 +843,14 @@ leave_scope(I32 base)
 	    SvREFCNT_dec(value);
 	    break;
 	case SAVEt_OP:
-	    op = (OP*)SSPOPPTR;
+	    PL_op = (OP*)SSPOPPTR;
 	    break;
 	case SAVEt_HINTS:
-	    if (GvHV(hintgv)) {
-		SvREFCNT_dec((SV*)GvHV(hintgv));
-		GvHV(hintgv) = NULL;
+	    if (GvHV(PL_hintgv)) {
+		SvREFCNT_dec((SV*)GvHV(PL_hintgv));
+		GvHV(PL_hintgv) = NULL;
 	    }
-	    *(I32*)&hints = (I32)SSPOPINT;
+	    *(I32*)&PL_hints = (I32)SSPOPINT;
 	    break;
 	default:
 	    croak("panic: leave_scope inconsistency");
@@ -824,8 +863,8 @@ cx_dump(PERL_CONTEXT *cx)
 {
 #ifdef DEBUGGING
     dTHR;
-    PerlIO_printf(Perl_debug_log, "CX %ld = %s\n", (long)(cx - cxstack), block_type[cx->cx_type]);
-    if (cx->cx_type != CXt_SUBST) {
+    PerlIO_printf(Perl_debug_log, "CX %ld = %s\n", (long)(cx - cxstack), PL_block_type[CxTYPE(cx)]);
+    if (CxTYPE(cx) != CXt_SUBST) {
 	PerlIO_printf(Perl_debug_log, "BLK_OLDSP = %ld\n", (long)cx->blk_oldsp);
 	PerlIO_printf(Perl_debug_log, "BLK_OLDCOP = 0x%lx\n", (long)cx->blk_oldcop);
 	PerlIO_printf(Perl_debug_log, "BLK_OLDMARKSP = %ld\n", (long)cx->blk_oldmarksp);
@@ -834,7 +873,7 @@ cx_dump(PERL_CONTEXT *cx)
 	PerlIO_printf(Perl_debug_log, "BLK_OLDPM = 0x%lx\n", (long)cx->blk_oldpm);
 	PerlIO_printf(Perl_debug_log, "BLK_GIMME = %s\n", cx->blk_gimme ? "LIST" : "SCALAR");
     }
-    switch (cx->cx_type) {
+    switch (CxTYPE(cx)) {
     case CXt_NULL:
     case CXt_BLOCK:
 	break;
@@ -854,8 +893,8 @@ cx_dump(PERL_CONTEXT *cx)
 	PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_IN_EVAL = %ld\n",
 		(long)cx->blk_eval.old_in_eval);
 	PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_OP_TYPE = %s (%s)\n",
-		op_name[cx->blk_eval.old_op_type],
-		op_desc[cx->blk_eval.old_op_type]);
+		PL_op_name[cx->blk_eval.old_op_type],
+		PL_op_desc[cx->blk_eval.old_op_type]);
 	PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_NAME = %s\n",
 		cx->blk_eval.old_name);
 	PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_EVAL_ROOT = 0x%lx\n",
@@ -891,8 +930,8 @@ cx_dump(PERL_CONTEXT *cx)
 		(long)cx->sb_iters);
 	PerlIO_printf(Perl_debug_log, "SB_MAXITERS = %ld\n",
 		(long)cx->sb_maxiters);
-	PerlIO_printf(Perl_debug_log, "SB_SAFEBASE = %ld\n",
-		(long)cx->sb_safebase);
+	PerlIO_printf(Perl_debug_log, "SB_RFLAGS = %ld\n",
+		(long)cx->sb_rflags);
 	PerlIO_printf(Perl_debug_log, "SB_ONCE = %ld\n",
 		(long)cx->sb_once);
 	PerlIO_printf(Perl_debug_log, "SB_ORIG = %s\n",