part 2 of PERL_OBJECT fixes (globals in bytecode.h moved to intrpvar.h)

p4raw-id: //depot/perl@1608

1 files changed, 21 insertions, 34 deletions

diff --git a/bytecode.h b/bytecode.h
index e19bb22db4..ce84c81e02 100644
--- a/bytecode.h
+++ b/bytecode.h
@@ -7,19 +7,6 @@ typedef SV *svindex;
 typedef OP *opindex;
 typedef IV IV64;
 
-EXT int iv_overflows INIT(0);
-
-EXT SV *sv;
-/*
-#ifndef USE_THREADS
-EXT OP *PL_op;
-#endif
-*/
-EXT XPV pv;
-
-EXT void **obj_list;
-EXT I32 obj_list_fill INIT(-1);
-
 #ifdef INDIRECT_BGET_MACROS
 #define BGET_FREAD(argp, len, nelem)	\
 	 bs.fread((char*)(argp),(len),(nelem),bs.data)
@@ -43,23 +30,23 @@ EXT I32 obj_list_fill INIT(-1);
 	if (arg)			\
 	    bs.freadpv(arg, bs.data);	\
 	else {				\
-	    pv.xpv_pv = 0;		\
-	    pv.xpv_len = 0;		\
-	    pv.xpv_cur = 0;		\
+	    PL_pv.xpv_pv = 0;		\
+	    PL_pv.xpv_len = 0;		\
+	    PL_pv.xpv_cur = 0;		\
 	}				\
     } STMT_END
 #else
 #define BGET_PV(arg)	STMT_START {		\
 	BGET_U32(arg);				\
 	if (arg) {				\
-	    New(666, pv.xpv_pv, arg, char);	\
-	    PerlIO_read(fp, pv.xpv_pv, arg);	\
-	    pv.xpv_len = arg;			\
-	    pv.xpv_cur = arg - 1;		\
+	    New(666, PL_pv.xpv_pv, arg, char);	\
+	    PerlIO_read(fp, PL_pv.xpv_pv, arg);	\
+	    PL_pv.xpv_len = arg;			\
+	    PL_pv.xpv_cur = arg - 1;		\
 	} else {				\
-	    pv.xpv_pv = 0;			\
-	    pv.xpv_len = 0;			\
-	    pv.xpv_cur = 0;			\
+	    PL_pv.xpv_pv = 0;			\
+	    PL_pv.xpv_len = 0;			\
+	    PL_pv.xpv_cur = 0;			\
 	}					\
     } STMT_END
 #endif /* INDIRECT_BGET_MACROS */
@@ -83,7 +70,7 @@ EXT I32 obj_list_fill INIT(-1);
 	    arg = (I32)lo;				\
 	}						\
 	else {						\
-	    iv_overflows++;				\
+	    PL_iv_overflows++;				\
 	    arg = 0;					\
 	}						\
     } STMT_END
@@ -98,7 +85,7 @@ EXT I32 obj_list_fill INIT(-1);
 	arg = (char *) ary;		\
     } while (0)
 
-#define BGET_pvcontents(arg)	arg = pv.xpv_pv
+#define BGET_pvcontents(arg)	arg = PL_pv.xpv_pv
 #define BGET_strconst(arg) STMT_START {	\
 	for (arg = PL_tokenbuf; (*arg = BGET_FGETC()); arg++) /* nothing */; \
 	arg = PL_tokenbuf;			\
@@ -113,7 +100,7 @@ EXT I32 obj_list_fill INIT(-1);
 #define BGET_objindex(arg, type) STMT_START {	\
 	U32 ix;					\
 	BGET_U32(ix);				\
-	arg = (type)obj_list[ix];		\
+	arg = (type)PL_obj_list[ix];		\
     } STMT_END
 #define BGET_svindex(arg) BGET_objindex(arg, svindex)
 #define BGET_opindex(arg) BGET_objindex(arg, opindex)
@@ -130,22 +117,22 @@ EXT I32 obj_list_fill INIT(-1);
 #define BSET_gv_fetchpv(sv, arg)	sv = (SV*)gv_fetchpv(arg, TRUE, SVt_PV)
 #define BSET_gv_stashpv(sv, arg)	sv = (SV*)gv_stashpv(arg, TRUE)
 #define BSET_sv_magic(sv, arg)		sv_magic(sv, Nullsv, arg, 0, 0)
-#define BSET_mg_pv(mg, arg)	mg->mg_ptr = arg; mg->mg_len = pv.xpv_cur
+#define BSET_mg_pv(mg, arg)	mg->mg_ptr = arg; mg->mg_len = PL_pv.xpv_cur
 #define BSET_sv_upgrade(sv, arg)	(void)SvUPGRADE(sv, arg)
 #define BSET_xpv(sv)	do {	\
-	SvPV_set(sv, pv.xpv_pv);	\
-	SvCUR_set(sv, pv.xpv_cur);	\
-	SvLEN_set(sv, pv.xpv_len);	\
+	SvPV_set(sv, PL_pv.xpv_pv);	\
+	SvCUR_set(sv, PL_pv.xpv_cur);	\
+	SvLEN_set(sv, PL_pv.xpv_len);	\
     } while (0)
 #define BSET_av_extend(sv, arg)	av_extend((AV*)sv, arg)
 
 #define BSET_av_push(sv, arg)	av_push((AV*)sv, arg)
 #define BSET_hv_store(sv, arg)	\
-	hv_store((HV*)sv, pv.xpv_pv, pv.xpv_cur, arg, 0)
+	hv_store((HV*)sv, PL_pv.xpv_pv, PL_pv.xpv_cur, arg, 0)
 #define BSET_pv_free(pv)	Safefree(pv.xpv_pv)
 #define BSET_pregcomp(o, arg) \
 	((PMOP*)o)->op_pmregexp = arg ? \
-		CALLREGCOMP(arg, arg + pv.xpv_cur, ((PMOP*)o)) : 0
+		CALLREGCOMP(arg, arg + PL_pv.xpv_cur, ((PMOP*)o)) : 0
 #define BSET_newsv(sv, arg)	sv = NEWSV(666,0); SvUPGRADE(sv, arg)
 #define BSET_newop(o, arg)	o = (OP*)safemalloc(optype_size[arg])
 #define BSET_newopn(o, arg) STMT_START {	\
@@ -170,5 +157,5 @@ EXT I32 obj_list_fill INIT(-1);
 #define BSET_curpad(pad, arg) pad = AvARRAY(arg)
 
 #define BSET_OBJ_STORE(obj, ix)		\
-	(I32)ix > obj_list_fill ?	\
-	bset_obj_store(obj, (I32)ix) : (obj_list[ix] = obj)
+	(I32)ix > PL_obj_list_fill ?	\
+	bset_obj_store(obj, (I32)ix) : (PL_obj_list[ix] = obj)