embed.pl now reads *var*.h to do its stuff.

Split generated embed.h into two - new embedvar.h
is #included when 'op' etc. will not mess up proto.h etc.
Removed #define foo (thr->Tfoo) from thread.h
Added some 'missing' symbols to global.sym, removed
those in the *var*.h files
Has build all MULTIPLICITY/USE_THREADS options on win32
with VC++ (and passed tests), but not with exactly this set
of files.

p4raw-id: //depot/ansiperl@338

1 files changed, 26 insertions, 60 deletions

diff --git a/intrpvar.h b/intrpvar.h
index 0393b8f4d2..b724e414e6 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -5,19 +5,17 @@
 /* pseudo environmental stuff */
 PERLVAR(Iorigargc,	int)		
 PERLVAR(Iorigargv,	char **)		
-PERLVAR(Ienvgv,	GV *)		
-PERLVAR(Isiggv,	GV *)		
-PERLVAR(Iincgv,	GV *)		
+PERLVAR(Ienvgv,		GV *)		
+PERLVAR(Isiggv,		GV *)		
+PERLVAR(Iincgv,		GV *)		
 PERLVAR(Iorigfilename,	char *)		
 PERLVAR(Idiehook,	SV *)		
 PERLVAR(Iwarnhook,	SV *)		
 PERLVAR(Iparsehook,	SV *)		
-/* switches */
-PERLVAR(Icddir,	char *)		
+PERLVAR(Icddir,		char *)		/* switches */
 PERLVAR(Iminus_c,	bool)		
-PERLVAR(Ipatchlevel[10],	char)		
+PERLVAR(Ipatchlevel[10],char)		
 PERLVAR(Ilocalpatches,	char **)		
-PERLVAR(Inrs,	SV *)		
 PERLVARI(Isplitstr,	char *,	" ")	
 PERLVAR(Ipreprocess,	bool)		
 PERLVAR(Iminus_n,	bool)		
@@ -34,21 +32,18 @@ PERLVAR(Isawvec,	bool)
 PERLVAR(Iunsafe,	bool)		
 PERLVAR(Iinplace,	char *)		
 PERLVAR(Ie_tmpname,	char *)		
-PERLVAR(Ie_fp,	PerlIO *)		
+PERLVAR(Ie_fp,		PerlIO *)		
 PERLVAR(Iperldb,	U32)		
-	/* This value may be raised by extensions for testing purposes */
-PERLVARI(Iperl_destruct_level,	int,	0)	/* 0=none, 1=full, 2=full with checks */
+
+/* This value may be raised by extensions for testing purposes */
+/* 0=none, 1=full, 2=full with checks */
+PERLVARI(Iperl_destruct_level,	int,	0)	
 
 /* magical thingies */
 PERLVAR(Ibasetime,	Time_t)		/* $^T */
 PERLVAR(Iformfeed,	SV *)		/* $^L */
-PERLVARI(Ichopset,	char *,	" \n-")	/* $: */
-PERLVAR(Irs,	SV *)		/* $/ */
-PERLVAR(Iofs,	char *)		/* $, */
-PERLVAR(Iofslen,	STRLEN)		
-PERLVAR(Iors,	char *)		/* $\ */
-PERLVAR(Iorslen,	STRLEN)		
-PERLVAR(Iofmt,	char *)		/* $# */
+
+
 PERLVARI(Imaxsysfd,	I32,	MAXSYSFD)	/* top fd to pass to subprocesses */
 PERLVAR(Imultiline,	int)		/* $*--do strings hold >1 line? */
 PERLVAR(Istatusvalue,	I32)		/* $? */
@@ -56,35 +51,32 @@ PERLVAR(Istatusvalue,	I32)		/* $? */
 PERLVAR(Istatusvalue_vms,	U32)		
 #endif
 
-PERLVAR(Istatcache,	struct stat)		/* _ */
+PERLVAR(Istatcache,	struct stat)	/* _ */
 PERLVAR(Istatgv,	GV *)		
 PERLVARI(Istatname,	SV *,	Nullsv)	
 
 /* shortcuts to various I/O objects */
 PERLVAR(Istdingv,	GV *)		
-PERLVAR(Ilast_in_gv,	GV *)		
-PERLVAR(Idefgv,	GV *)		
+PERLVAR(Idefgv,		GV *)		
 PERLVAR(Iargvgv,	GV *)		
-PERLVAR(Idefoutgv,	GV *)		
 PERLVAR(Iargvoutgv,	GV *)		
 
 /* shortcuts to regexp stuff */
 PERLVAR(Ileftgv,	GV *)		
 PERLVAR(Iampergv,	GV *)		
 PERLVAR(Irightgv,	GV *)		
-PERLVAR(Icurpm,	PMOP *)		/* what to do \ interps from */
 PERLVAR(Iscreamfirst,	I32 *)		
 PERLVAR(Iscreamnext,	I32 *)		
 PERLVARI(Imaxscream,	I32,	-1)	
 PERLVAR(Ilastscream,	SV *)		
 
 /* shortcuts to misc objects */
-PERLVAR(Ierrgv,	GV *)		
+PERLVAR(Ierrgv,		GV *)		
 
 /* shortcuts to debugging objects */
-PERLVAR(IDBgv,	GV *)		
+PERLVAR(IDBgv,		GV *)		
 PERLVAR(IDBline,	GV *)		
-PERLVAR(IDBsub,	GV *)		
+PERLVAR(IDBsub,		GV *)		
 PERLVAR(IDBsingle,	SV *)		
 PERLVAR(IDBtrace,	SV *)		
 PERLVAR(IDBsignal,	SV *)		
@@ -92,21 +84,15 @@ PERLVAR(Ilineary,	AV *)		/* lines of script for debugger */
 PERLVAR(Idbargs,	AV *)		/* args to call listed by caller function */
 
 /* symbol tables */
-PERLVAR(Idefstash,	HV *)		/* main symbol table */
-PERLVAR(Icurstash,	HV *)		/* symbol table for current package */
 PERLVAR(Idebstash,	HV *)		/* symbol table for perldb package */
 PERLVAR(Iglobalstash,	HV *)		/* global keyword overrides imported here */
 PERLVAR(Icurstname,	SV *)		/* name of current package */
 PERLVAR(Ibeginav,	AV *)		/* names of BEGIN subroutines */
-PERLVAR(Iendav,	AV *)		/* names of END subroutines */
+PERLVAR(Iendav,		AV *)		/* names of END subroutines */
 PERLVAR(Iinitav,	AV *)		/* names of INIT subroutines */
 PERLVAR(Istrtab,	HV *)		/* shared string table */
 
 /* memory management */
-PERLVAR(Itmps_stack,	SV **)		
-PERLVARI(Itmps_ix,	I32,	-1)	
-PERLVARI(Itmps_floor,	I32,	-1)	
-PERLVAR(Itmps_max,	I32)		
 PERLVAR(Isv_count,	I32)		/* how many SV* are currently allocated */
 PERLVAR(Isv_objcount,	I32)		/* how many objects are currently allocated */
 PERLVAR(Isv_root,	SV*)		/* storage for SVs belonging to interp */
@@ -118,15 +104,9 @@ PERLVAR(Ilastsize,	I32)
 PERLVAR(Iforkprocess,	int)		/* so do_open |- can return proc# */
 
 /* subprocess state */
-PERLVAR(Ifdpid,	AV *)		/* keep fd-to-pid mappings for my_popen */
+PERLVAR(Ifdpid,		AV *)		/* keep fd-to-pid mappings for my_popen */
 
 /* internal state */
-PERLVAR(Iin_eval,	VOL int)		/* trap "fatal" errors? */
-PERLVAR(Irestartop,	OP *)		/* Are we propagating an error from croak? */
-PERLVAR(Idelaymagic,	int)		/* ($<,$>) = ... */
-PERLVAR(Idirty,	bool)		/* In the middle of tearing things down? */
-PERLVAR(Ilocalizing,	U8)		/* are we processing a local() list? */
-PERLVAR(Itainted,	bool)		/* using variables controlled by $< */
 PERLVAR(Itainting,	bool)		/* doing taint checks */
 PERLVARI(Iop_mask,	char *,	NULL)	/* masked operations for safe evals */
 
@@ -144,31 +124,16 @@ PERLVAR(Ieval_root,	OP *)
 PERLVAR(Ieval_start,	OP *)		
 
 /* runtime control stuff */
-PERLVARI(Icurcop,	COP * VOL,	&compiling)	
 PERLVARI(Icurcopdb,	COP *,	NULL)	
 PERLVARI(Icopline,	line_t,	NOLINE)	
-PERLVAR(Icxstack,	PERL_CONTEXT *)		
-PERLVARI(Icxstack_ix,	I32,	-1)	
-PERLVARI(Icxstack_max,	I32,	128)	
-PERLVAR(Istart_env,	JMPENV)		/* empty startup sigjmp() environment */
-PERLVAR(Itop_env,	JMPENV *)		/* ptr. to current sigjmp() environment */
-
-/* stack stuff */
-PERLVAR(Icurstack,	AV *)		/* THE STACK */
-PERLVAR(Imainstack,	AV *)		/* the stack when nothing funny is happening */
-
-/* format accumulators */
-PERLVAR(Iformtarget,	SV *)		
-PERLVAR(Ibodytarget,	SV *)		
-PERLVAR(Itoptarget,	SV *)		
 
 /* statics moved here for shared library purposes */
 PERLVAR(Istrchop,	SV)		/* return value from chop */
 PERLVAR(Ifilemode,	int)		/* so nextargv() can preserve mode */
 PERLVAR(Ilastfd,	int)		/* what to preserve mode on */
 PERLVAR(Ioldname,	char *)		/* what to preserve mode on */
-PERLVAR(IArgv,	char **)		/* stuff to free from do_aexec, vfork safe */
-PERLVAR(ICmd,	char *)		/* stuff to free from do_aexec, vfork safe */
+PERLVAR(IArgv,		char **)	/* stuff to free from do_aexec, vfork safe */
+PERLVAR(ICmd,		char *)		/* stuff to free from do_aexec, vfork safe */
 PERLVAR(Isortcop,	OP *)		/* user defined sort routine */
 PERLVAR(Isortstash,	HV *)		/* which is in some package or other */
 PERLVAR(Ifirstgv,	GV *)		/* $a */
@@ -185,9 +150,10 @@ PERLVARI(Ilaststatval,	int,	-1)
 PERLVARI(Ilaststype,	I32,	OP_STAT)	
 PERLVAR(Imess_sv,	SV *)		
 
+PERLVAR(Iors,		char *)		/* $\ */
+PERLVAR(Iorslen,	STRLEN)		
+PERLVAR(Iofmt,		char *)		/* $# */
+
 #ifdef USE_THREADS
-/* threads stuff */
-PERLVAR(Ithrsv,	SV *)		/* holds struct perl_thread for main thread */
+PERLVAR(Ithrsv,		SV *)		/* holds struct perl_thread for main thread */
 #endif /* USE_THREADS */
-
-