perl5.005_03 (stock)

1 files changed, 860 insertions, 507 deletions

diff --git a/gnu/usr.bin/perl/perl.h b/gnu/usr.bin/perl/perl.h
index fefceeda816..cab0bbc2981 100644
--- a/gnu/usr.bin/perl/perl.h
+++ b/gnu/usr.bin/perl/perl.h
@@ -1,6 +1,6 @@
 /*    perl.h
  *
- *    Copyright (c) 1987-1997, Larry Wall
+ *    Copyright (c) 1987-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,11 +24,145 @@
 #define USE_STDIO
 #endif /* PERL_FOR_X2P */
 
+#ifdef PERL_OBJECT
+
+/* PERL_OBJECT explained  - DickH and DougL @ ActiveState.com
+
+Defining PERL_OBJECT turns on creation of a C++ object that
+contains all writable core perl global variables and functions.
+Stated another way, all necessary global variables and functions
+are members of a big C++ object. This object's class is CPerlObj.
+This allows a Perl Host to have multiple, independent perl
+interpreters in the same process space. This is very important on
+Win32 systems as the overhead of process creation is quite high --
+this could be even higher than the script compile and execute time
+for small scripts.
+
+The perl executable implementation on Win32 is composed of perl.exe
+(the Perl Host) and perlX.dll. (the Perl Core). This allows the
+same Perl Core to easily be embedded in other applications that use
+the perl interpreter.
+
++-----------+
+| Perl Host |
++-----------+
+      ^
+	  |
+	  v
++-----------+   +-----------+
+| Perl Core |<->| Extension |
++-----------+   +-----------+ ...
+
+Defining PERL_OBJECT has the following effects:
+
+PERL CORE
+1. CPerlObj is defined (this is the PERL_OBJECT)
+2. all static functions that needed to access either global
+variables or functions needed are made member functions
+3. all writable static variables are made member variables
+4. all global variables and functions are defined as:
+	#define var CPerlObj::Perl_var
+	#define func CPerlObj::Perl_func
+	* these are in objpp.h
+This necessitated renaming some local variables and functions that
+had the same name as a global variable or function. This was
+probably a _good_ thing anyway.
+
+
+EXTENSIONS
+1. Access to global variables and perl functions is through a
+pointer to the PERL_OBJECT. This pointer type is CPerlObj*. This is
+made transparent to extension developers by the following macros:
+	#define var pPerl->Perl_var
+	#define func pPerl->Perl_func
+	* these are done in objXSUB.h
+This requires that the extension be compiled as C++, which means
+that the code must be ANSI C and not K&R C. For K&R extensions,
+please see the C API notes located in Win32/GenCAPI.pl. This script
+creates a perlCAPI.lib that provides a K & R compatible C interface
+to the PERL_OBJECT.
+2. Local variables and functions cannot have the same name as perl's
+variables or functions since the macros will redefine these. Look for
+this if you get some strange error message and it does not look like
+the code that you had written. This often happens with variables that
+are local to a function.
+
+PERL HOST
+1. The perl host is linked with perlX.lib to get perl_alloc. This
+function will return a pointer to CPerlObj (the PERL_OBJECT). It
+takes pointers to the various PerlXXX_YYY interfaces (see iperlsys.h
+for more information on this).
+2. The perl host calls the same functions as normally would be
+called in setting up and running a perl script, except that the
+functions are now member functions of the PERL_OBJECT.
+
+*/
+
+
+class CPerlObj;
+
+#define STATIC
+#define CPERLscope(x) CPerlObj::x
+#define CPERLproto CPerlObj *
+#define _CPERLproto ,CPERLproto
+#define CPERLarg CPerlObj *pPerl
+#define CPERLarg_ CPERLarg,
+#define _CPERLarg ,CPERLarg
+#define PERL_OBJECT_THIS this
+#define _PERL_OBJECT_THIS ,this
+#define PERL_OBJECT_THIS_ this,
+#define CALLRUNOPS (this->*PL_runops)
+#define CALLREGCOMP (this->*PL_regcompp)
+#define CALLREGEXEC (this->*PL_regexecp)
+
+#else /* !PERL_OBJECT */
+
+#define STATIC static
+#define CPERLscope(x) x
+#define CPERLproto
+#define _CPERLproto
+#define CPERLarg void
+#define CPERLarg_
+#define _CPERLarg
+#define PERL_OBJECT_THIS
+#define _PERL_OBJECT_THIS
+#define PERL_OBJECT_THIS_
+#define CALLRUNOPS PL_runops
+#define CALLREGCOMP (*PL_regcompp)
+#define CALLREGEXEC (*PL_regexecp)
+
+#endif /* PERL_OBJECT */
+
 #define VOIDUSED 1
 #include "config.h"
 
 #include "embed.h"
 
+#undef START_EXTERN_C
+#undef END_EXTERN_C
+#undef EXTERN_C
+#ifdef __cplusplus
+#  define START_EXTERN_C extern "C" {
+#  define END_EXTERN_C }
+#  define EXTERN_C extern "C"
+#else
+#  define START_EXTERN_C 
+#  define END_EXTERN_C 
+#  define EXTERN_C
+#endif
+
+#ifdef OP_IN_REGISTER
+#  ifdef __GNUC__
+#    define stringify_immed(s) #s
+#    define stringify(s) stringify_immed(s)
+#ifdef EMBED
+register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
+#else
+register struct op *op asm(stringify(OP_IN_REGISTER));
+#endif
+#  endif
+#endif
+
 /*
  * STMT_START { statements; } STMT_END;
  * can be used as a single statement, as in
@@ -52,6 +186,10 @@
 # endif
 #endif
 
+#define NOOP (void)0
+
+#define WITH_THR(s) STMT_START { dTHR; s; } STMT_END
+
 /*
  * SOFT_CAST can be used for args to prototyped functions to retain some
  * type checking; it only casts if the compiler does not know prototypes.
@@ -62,7 +200,7 @@
 #define SOFT_CAST(type)	(type)
 #endif
 
-#ifndef BYTEORDER
+#ifndef BYTEORDER  /* Should never happen -- byteorder is in config.h */
 #   define BYTEORDER 0x1234
 #endif
 
@@ -71,6 +209,12 @@
 #   define LIBERAL 1
 #endif
 
+#if 'A' == 65 && 'I' == 73 && 'J' == 74 && 'Z' == 90
+#define ASCIIish
+#else
+#undef  ASCIIish
+#endif
+
 /*
  * The following contortions are brought to you on behalf of all the
  * standards, semi-standards, de facto standards, not-so-de-facto standards
@@ -88,7 +232,7 @@
 # define STANDARD_C 1
 #endif
 
-#if defined(__cplusplus) || defined(WIN32)
+#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(OS2) || defined(__DGUX)
 # define DONT_DECLARE_STD 1
 #endif
 
@@ -102,11 +246,11 @@
 #   define VOL
 #endif
 
-#define TAINT		(tainted = TRUE)
-#define TAINT_NOT	(tainted = FALSE)
-#define TAINT_IF(c)	if (c) { tainted = TRUE; }
-#define TAINT_ENV()	if (tainting) { taint_env(); }
-#define TAINT_PROPER(s)	if (tainting) { taint_proper(no_security, s); }
+#define TAINT		(PL_tainted = TRUE)
+#define TAINT_NOT	(PL_tainted = FALSE)
+#define TAINT_IF(c)	if (c) { PL_tainted = TRUE; }
+#define TAINT_ENV()	if (PL_tainting) { taint_env(); }
+#define TAINT_PROPER(s)	if (PL_tainting) { taint_proper(Nullch, s); }
 
 /* XXX All process group stuff is handled in pp_sys.c.  Should these 
    defines move there?  If so, I could simplify this a lot. --AD  9/96.
@@ -178,7 +322,7 @@
 #  endif
 #endif
 
-#include "perlio.h"
+#include "iperlsys.h"
 
 #ifdef USE_NEXT_CTYPE
 
@@ -229,6 +373,8 @@
 #   include <stdlib.h>
 #endif
 
+#define MEM_SIZE Size_t
+
 /* This comes after <stdlib.h> so we don't try to change the standard
  * library prototypes; we'll use our own in proto.h instead. */
 
@@ -237,14 +383,32 @@
 #   ifdef HIDEMYMALLOC
 #	define malloc  Mymalloc
 #	define calloc  Mycalloc
-#	define realloc Myremalloc
+#	define realloc Myrealloc
 #	define free    Myfree
+Malloc_t Mymalloc _((MEM_SIZE nbytes));
+Malloc_t Mycalloc _((MEM_SIZE elements, MEM_SIZE size));
+Malloc_t Myrealloc _((Malloc_t where, MEM_SIZE nbytes));
+Free_t   Myfree _((Malloc_t where));
 #   endif
 #   ifdef EMBEDMYMALLOC
 #	define malloc  Perl_malloc
 #	define calloc  Perl_calloc
 #	define realloc Perl_realloc
+/* VMS' external symbols are case-insensitive, and there's already a */
+/* perl_free in perl.h */
+#ifdef VMS
+#	define free    Perl_myfree
+#else
 #	define free    Perl_free
+#endif
+Malloc_t Perl_malloc _((MEM_SIZE nbytes));
+Malloc_t Perl_calloc _((MEM_SIZE elements, MEM_SIZE size));
+Malloc_t Perl_realloc _((Malloc_t where, MEM_SIZE nbytes));
+#ifdef VMS
+Free_t   Perl_myfree _((Malloc_t where));
+#else
+Free_t   Perl_free _((Malloc_t where));
+#endif
 #   endif
 
 #   undef safemalloc
@@ -258,8 +422,6 @@
 
 #endif /* MYMALLOC */
 
-#define MEM_SIZE Size_t
-
 #if defined(STANDARD_C) && defined(I_STDDEF)
 #   include <stddef.h>
 #   define STRUCT_OFFSET(s,m)  offsetof(s,m)
@@ -361,6 +523,10 @@
 #   include <netinet/in.h>
 #endif
 
+#ifdef I_ARPA_INET
+#   include <arpa/inet.h>
+#endif
+
 #if defined(SF_APPEND) && defined(USE_SFIO) && defined(I_SFIO)
 /* <sfio.h> defines SF_APPEND and <sys/stat.h> might define SF_APPEND
  * (the neo-BSD seem to do this).  */
@@ -411,12 +577,6 @@
 #   undef HAS_STRERROR
 #endif
 
-#ifndef HAS_MKFIFO
-#  ifndef mkfifo
-#    define mkfifo(path, mode) (mknod((path), (mode) | S_IFIFO, 0))
-#  endif
-#endif /* !HAS_MKFIFO */
-
 #include <errno.h>
 #ifdef HAS_SOCKET
 #   ifdef I_NET_ERRNO
@@ -431,9 +591,21 @@
 	    set_vaxc_errno(vmserrcode);	\
 	} STMT_END
 #else
-#   define SETERRNO(errcode,vmserrcode) errno = (errcode)
+#   define SETERRNO(errcode,vmserrcode) (errno = (errcode))
 #endif
 
+#ifdef USE_THREADS
+#  define ERRSV (thr->errsv)
+#  define ERRHV (thr->errhv)
+#  define DEFSV THREADSV(0)
+#  define SAVE_DEFSV save_threadsv(0)
+#else
+#  define ERRSV GvSV(PL_errgv)
+#  define ERRHV GvHV(PL_errgv)
+#  define DEFSV GvSV(PL_defgv)
+#  define SAVE_DEFSV SAVESPTR(GvSV(PL_defgv))
+#endif /* USE_THREADS */
+
 #ifndef errno
 	extern int errno;     /* ANSI allows errno to be an lvalue expr */
 #endif
@@ -641,12 +813,21 @@
 #   ifdef convex
 #	define Quad_t long long
 #   else
-#	if BYTEORDER > 0xFFFF
+#	if LONGSIZE == 8
 #	    define Quad_t long
 #	endif
 #   endif
 #endif
 
+/* XXX Experimental set-up for long long.  Just add -DUSE_LONG_LONG
+   to your ccflags.  --Andy Dougherty   4/1998
+*/
+#ifdef USE_LONG_LONG
+#  if defined(HAS_LONG_LONG) && LONGLONGSIZE == 8
+#    define Quad_t long long
+#  endif
+#endif
+
 #ifdef Quad_t
 #   define HAS_QUAD
     typedef Quad_t IV;
@@ -733,7 +914,11 @@
 #  ifdef MAXUSHORT
 #    define PERL_USHORT_MAX ((unsigned short)MAXUSHORT)
 #  else
-#    define PERL_USHORT_MAX       ((unsigned short)~(unsigned)0)
+#    ifdef USHRT_MAX
+#      define PERL_USHORT_MAX ((unsigned short)USHRT_MAX)
+#    else
+#      define PERL_USHORT_MAX       ((unsigned short)~(unsigned)0)
+#    endif
 #  endif
 #endif
 
@@ -743,7 +928,11 @@
 #  ifdef MAXSHORT    /* Often used in <values.h> */
 #    define PERL_SHORT_MAX ((short)MAXSHORT)
 #  else
-#    define PERL_SHORT_MAX      ((short) (PERL_USHORT_MAX >> 1))
+#    ifdef SHRT_MAX
+#      define PERL_SHORT_MAX ((short)SHRT_MAX)
+#    else
+#      define PERL_SHORT_MAX      ((short) (PERL_USHORT_MAX >> 1))
+#    endif
 #  endif
 #endif
 
@@ -753,7 +942,11 @@
 #  ifdef MINSHORT
 #    define PERL_SHORT_MIN ((short)MINSHORT)
 #  else
-#    define PERL_SHORT_MIN        (-PERL_SHORT_MAX - ((3 & -1) == 3))
+#    ifdef SHRT_MIN
+#      define PERL_SHORT_MIN ((short)SHRT_MIN)
+#    else
+#      define PERL_SHORT_MIN        (-PERL_SHORT_MAX - ((3 & -1) == 3))
+#    endif
 #  endif
 #endif
 
@@ -873,7 +1066,7 @@ typedef struct regexp REGEXP;
 typedef struct gp GP;
 typedef struct gv GV;
 typedef struct io IO;
-typedef struct context CONTEXT;
+typedef struct context PERL_CONTEXT;
 typedef struct block BLOCK;
 
 typedef struct magic MAGIC;
@@ -896,10 +1089,15 @@ typedef union any ANY;
 
 #include "handy.h"
 
+#ifdef PERL_OBJECT
+typedef I32 (*filter_t) _((CPerlObj*, int, SV *, int));
+#else
 typedef I32 (*filter_t) _((int, SV *, int));
+#endif
+
 #define FILTER_READ(idx, sv, len)  filter_read(idx, sv, len)
-#define FILTER_DATA(idx)	   (AvARRAY(rsfp_filters)[idx])
-#define FILTER_ISREADER(idx)	   (idx >= AvFILL(rsfp_filters))
+#define FILTER_DATA(idx)	   (AvARRAY(PL_rsfp_filters)[idx])
+#define FILTER_ISREADER(idx)	   (idx >= AvFILLp(PL_rsfp_filters))
 
 #ifdef DOSISH
 # if defined(OS2)
@@ -914,28 +1112,84 @@ typedef I32 (*filter_t) _((int, SV *, int));
 #   if defined(PLAN9)
 #     include "./plan9/plan9ish.h"
 #   else
-#     include "unixish.h"
+#     if defined(MPE)
+#       include "mpeix/mpeixish.h"
+#     else
+#       if defined(__VOS__)
+#         include "vosish.h"
+#       else
+#         include "unixish.h"
+#       endif
+#     endif
 #   endif
 # endif
+#endif         
+
+#ifndef FUNC_NAME_TO_PTR
+#define FUNC_NAME_TO_PTR(name)		name
 #endif
+
+/* 
+ * USE_THREADS needs to be after unixish.h as <pthread.h> includes
+ * <sys/signal.h> which defines NSIG - which will stop inclusion of <signal.h>
+ * this results in many functions being undeclared which bothers C++
+ * May make sense to have threads after "*ish.h" anyway
+ */
+
+#ifdef USE_THREADS
+   /* pending resolution of licensing issues, we avoid the erstwhile
+    * atomic.h everywhere */
+#  define EMULATE_ATOMIC_REFCOUNTS
+
+#  ifdef FAKE_THREADS
+#    include "fakethr.h"
+#  else
+#    ifdef WIN32
+#      include <win32thread.h>
+#    else
+#      ifdef OS2
+#        include "os2thread.h"
+#      else
+#        ifdef I_MACH_CTHREADS
+#          include <mach/cthreads.h>
+#          ifdef NeXT
+#            define MUTEX_INIT_CALLS_MALLOC
+#          endif
+typedef cthread_t	perl_os_thread;
+typedef mutex_t		perl_mutex;
+typedef condition_t	perl_cond;
+typedef void *		perl_key;
+#        else /* Posix threads */
+#          include <pthread.h>
+typedef pthread_t	perl_os_thread;
+typedef pthread_mutex_t	perl_mutex;
+typedef pthread_cond_t	perl_cond;
+typedef pthread_key_t	perl_key;
+#        endif /* I_MACH_CTHREADS */
+#      endif /* OS2 */
+#    endif /* WIN32 */
+#  endif /* FAKE_THREADS */
+#endif /* USE_THREADS */
+
+
   
 #ifdef VMS
-#   define STATUS_NATIVE	statusvalue_vms
+#   define STATUS_NATIVE	PL_statusvalue_vms
 #   define STATUS_NATIVE_EXPORT \
-	((I32)statusvalue_vms == -1 ? 44 : statusvalue_vms)
+	((I32)PL_statusvalue_vms == -1 ? 44 : PL_statusvalue_vms)
 #   define STATUS_NATIVE_SET(n)						\
 	STMT_START {							\
-	    statusvalue_vms = (n);					\
-	    if ((I32)statusvalue_vms == -1)				\
-		statusvalue = -1;					\
-	    else if (statusvalue_vms & STS$M_SUCCESS)			\
-		statusvalue = 0;					\
-	    else if ((statusvalue_vms & STS$M_SEVERITY) == 0)		\
-		statusvalue = 1 << 8;					\
+	    PL_statusvalue_vms = (n);					\
+	    if ((I32)PL_statusvalue_vms == -1)				\
+		PL_statusvalue = -1;					\
+	    else if (PL_statusvalue_vms & STS$M_SUCCESS)		\
+		PL_statusvalue = 0;					\
+	    else if ((PL_statusvalue_vms & STS$M_SEVERITY) == 0)	\
+		PL_statusvalue = 1 << 8;				\
 	    else							\
-		statusvalue = (statusvalue_vms & STS$M_SEVERITY) << 8;	\
+		PL_statusvalue = (PL_statusvalue_vms & STS$M_SEVERITY) << 8;	\
 	} STMT_END
-#   define STATUS_POSIX	statusvalue
+#   define STATUS_POSIX	PL_statusvalue
 #   ifdef VMSISH_STATUS
 #	define STATUS_CURRENT	(VMSISH_STATUS ? STATUS_NATIVE : STATUS_POSIX)
 #   else
@@ -943,29 +1197,29 @@ typedef I32 (*filter_t) _((int, SV *, int));
 #   endif
 #   define STATUS_POSIX_SET(n)				\
 	STMT_START {					\
-	    statusvalue = (n);				\
-	    if (statusvalue != -1) {			\
-		statusvalue &= 0xFFFF;			\
-		statusvalue_vms = statusvalue ? 44 : 1;	\
+	    PL_statusvalue = (n);				\
+	    if (PL_statusvalue != -1) {			\
+		PL_statusvalue &= 0xFFFF;			\
+		PL_statusvalue_vms = PL_statusvalue ? 44 : 1;	\
 	    }						\
-	    else statusvalue_vms = -1;			\
+	    else PL_statusvalue_vms = -1;			\
 	} STMT_END
-#   define STATUS_ALL_SUCCESS	(statusvalue = 0, statusvalue_vms = 1)
-#   define STATUS_ALL_FAILURE	(statusvalue = 1, statusvalue_vms = 44)
+#   define STATUS_ALL_SUCCESS	(PL_statusvalue = 0, PL_statusvalue_vms = 1)
+#   define STATUS_ALL_FAILURE	(PL_statusvalue = 1, PL_statusvalue_vms = 44)
 #else
 #   define STATUS_NATIVE	STATUS_POSIX
 #   define STATUS_NATIVE_EXPORT	STATUS_POSIX
 #   define STATUS_NATIVE_SET	STATUS_POSIX_SET
-#   define STATUS_POSIX		statusvalue
+#   define STATUS_POSIX		PL_statusvalue
 #   define STATUS_POSIX_SET(n)		\
 	STMT_START {			\
-	    statusvalue = (n);		\
-	    if (statusvalue != -1)	\
-		statusvalue &= 0xFFFF;	\
+	    PL_statusvalue = (n);		\
+	    if (PL_statusvalue != -1)	\
+		PL_statusvalue &= 0xFFFF;	\
 	} STMT_END
 #   define STATUS_CURRENT STATUS_POSIX
-#   define STATUS_ALL_SUCCESS	(statusvalue = 0)
-#   define STATUS_ALL_FAILURE	(statusvalue = 1)
+#   define STATUS_ALL_SUCCESS	(PL_statusvalue = 0)
+#   define STATUS_ALL_FAILURE	(PL_statusvalue = 1)
 #endif
 
 /* Some unistd.h's give a prototype for pause() even though
@@ -988,13 +1242,23 @@ typedef I32 (*filter_t) _((int, SV *, int));
 #   endif
 #endif
 
+#ifdef UNION_ANY_DEFINITION
+UNION_ANY_DEFINITION;
+#else
 union any {
     void*	any_ptr;
     I32		any_i32;
     IV		any_iv;
     long	any_long;
-    void	(*any_dptr) _((void*));
+    void	(CPERLscope(*any_dptr)) _((void*));
 };
+#endif
+
+#ifdef USE_THREADS
+#define ARGSproto struct perl_thread *thr
+#else
+#define ARGSproto void
+#endif /* USE_THREADS */
 
 /* Work around some cygwin32 problems with importing global symbols */
 #if defined(CYGWIN32) && defined(DLLIMPORT) 
@@ -1014,6 +1278,57 @@ union any {
 #include "hv.h"
 #include "mg.h"
 #include "scope.h"
+#include "bytecode.h"
+#include "byterun.h"
+
+/* Current curly descriptor */
+typedef struct curcur CURCUR;
+struct curcur {
+    int		parenfloor;	/* how far back to strip paren data */
+    int		cur;		/* how many instances of scan we've matched */
+    int		min;		/* the minimal number of scans to match */
+    int		max;		/* the maximal number of scans to match */
+    int		minmod;		/* whether to work our way up or down */
+    regnode *	scan;		/* the thing to match */
+    regnode *	next;		/* what has to match after it */
+    char *	lastloc;	/* where we started matching this scan */
+    CURCUR *	oldcc;		/* current curly before we started this one */
+};
+
+typedef struct _sublex_info SUBLEXINFO;
+struct _sublex_info {
+    I32 super_state;	/* lexer state to save */
+    I32 sub_inwhat;	/* "lex_inwhat" to use */
+    OP *sub_op;		/* "lex_op" to use */
+};
+
+#ifdef PERL_OBJECT
+struct magic_state {
+    SV* mgs_sv;
+    U32 mgs_flags;
+};
+typedef struct magic_state MGS;
+
+typedef struct {
+    I32 len_min;
+    I32 len_delta;
+    I32 pos_min;
+    I32 pos_delta;
+    SV *last_found;
+    I32 last_end;			/* min value, <0 unless valid. */
+    I32 last_start_min;
+    I32 last_start_max;
+    SV **longest;			/* Either &l_fixed, or &l_float. */
+    SV *longest_fixed;
+    I32 offset_fixed;
+    SV *longest_float;
+    I32 offset_float_min;
+    I32 offset_float_max;
+    I32 flags;
+} scan_data_t;
+
+typedef I32 CHECKPOINT;
+#endif /* PERL_OBJECT */
 
 /* work around some libPW problems */
 #ifdef DOINIT
@@ -1066,7 +1381,7 @@ EXT char Error[1];
 # define HAS_VTOHS
 # define HAS_HTOVL
 # define HAS_HTOVS
-# if BYTEORDER == 0x4321
+# if BYTEORDER == 0x4321 || BYTEORDER == 0x87654321
 #  define vtohl(x)	((((x)&0xFF)<<24)	\
 			+(((x)>>24)&0xFF)	\
 			+(((x)&0x0000FF00)<<8)	\
@@ -1083,13 +1398,7 @@ EXT char Error[1];
 #define U_I(what) ((unsigned int)(what))
 #define U_L(what) ((U32)(what))
 #else
-#  ifdef __cplusplus
-    extern "C" {
-#  endif
-U32 cast_ulong _((double));
-#  ifdef __cplusplus
-    }
-#  endif
+EXTERN_C U32 cast_ulong _((double));
 #define U_S(what) ((U16)cast_ulong((double)(what)))
 #define U_I(what) ((unsigned int)cast_ulong((double)(what)))
 #define U_L(what) (cast_ulong((double)(what)))
@@ -1100,15 +1409,11 @@ U32 cast_ulong _((double));
 #define I_V(what) ((IV)(what))
 #define U_V(what) ((UV)(what))
 #else
-#  ifdef __cplusplus
-    extern "C" {
-#  endif
+START_EXTERN_C
 I32 cast_i32 _((double));
 IV cast_iv _((double));
 UV cast_uv _((double));
-#  ifdef __cplusplus
-    }
-#  endif
+END_EXTERN_C
 #define I_32(what) (cast_i32((double)(what)))
 #define I_V(what) (cast_iv((double)(what)))
 #define U_V(what) (cast_uv((double)(what)))
@@ -1139,25 +1444,31 @@ Gid_t getegid _((void));
 #ifndef Perl_debug_log
 #define Perl_debug_log	PerlIO_stderr()
 #endif
+#undef  YYDEBUG
 #define YYDEBUG 1
 #define DEB(a)     			a
-#define DEBUG(a)   if (debug)		a
-#define DEBUG_p(a) if (debug & 1)	a
-#define DEBUG_s(a) if (debug & 2)	a
-#define DEBUG_l(a) if (debug & 4)	a
-#define DEBUG_t(a) if (debug & 8)	a
-#define DEBUG_o(a) if (debug & 16)	a
-#define DEBUG_c(a) if (debug & 32)	a
-#define DEBUG_P(a) if (debug & 64)	a
-#define DEBUG_m(a) if (curinterp && debug & 128)	a
-#define DEBUG_f(a) if (debug & 256)	a
-#define DEBUG_r(a) if (debug & 512)	a
-#define DEBUG_x(a) if (debug & 1024)	a
-#define DEBUG_u(a) if (debug & 2048)	a
-#define DEBUG_L(a) if (debug & 4096)	a
-#define DEBUG_H(a) if (debug & 8192)	a
-#define DEBUG_X(a) if (debug & 16384)	a
-#define DEBUG_D(a) if (debug & 32768)	a
+#define DEBUG(a)   if (PL_debug)		a
+#define DEBUG_p(a) if (PL_debug & 1)	a
+#define DEBUG_s(a) if (PL_debug & 2)	a
+#define DEBUG_l(a) if (PL_debug & 4)	a
+#define DEBUG_t(a) if (PL_debug & 8)	a
+#define DEBUG_o(a) if (PL_debug & 16)	a
+#define DEBUG_c(a) if (PL_debug & 32)	a
+#define DEBUG_P(a) if (PL_debug & 64)	a
+#define DEBUG_m(a) if (PL_curinterp && PL_debug & 128)	a
+#define DEBUG_f(a) if (PL_debug & 256)	a
+#define DEBUG_r(a) if (PL_debug & 512)	a
+#define DEBUG_x(a) if (PL_debug & 1024)	a
+#define DEBUG_u(a) if (PL_debug & 2048)	a
+#define DEBUG_L(a) if (PL_debug & 4096)	a
+#define DEBUG_H(a) if (PL_debug & 8192)	a
+#define DEBUG_X(a) if (PL_debug & 16384)	a
+#define DEBUG_D(a) if (PL_debug & 32768)	a
+#  ifdef USE_THREADS
+#    define DEBUG_S(a) if (PL_debug & (1<<16))	a
+#  else
+#    define DEBUG_S(a)
+#  endif
 #else
 #define DEB(a)
 #define DEBUG(a)
@@ -1173,10 +1484,11 @@ Gid_t getegid _((void));
 #define DEBUG_r(a)
 #define DEBUG_x(a)
 #define DEBUG_u(a)
-#define DEBUG_L(a)
+#define DEBUG_S(a)
 #define DEBUG_H(a)
 #define DEBUG_X(a)
 #define DEBUG_D(a)
+#define DEBUG_S(a)
 #endif
 #define YYMAXDEPTH 300
 
@@ -1185,7 +1497,7 @@ Gid_t getegid _((void));
 	if (!(what)) {							\
 	    croak("Assertion failed: file \"%s\", line %d",		\
 		__FILE__, __LINE__);					\
-	    exit(1);							\
+	    PerlProc_exit(1);							\
 	}})
 #endif
 
@@ -1205,17 +1517,20 @@ double atof _((const char*));
 /* All of these are in stdlib.h or time.h for ANSI C */
 Time_t time();
 struct tm *gmtime(), *localtime();
+#ifdef OEMVS
+char *(strchr)(), *(strrchr)();
+char *(strcpy)(), *(strcat)();
+#else
 char *strchr(), *strrchr();
 char *strcpy(), *strcat();
+#endif
 #endif /* ! STANDARD_C */
 
 
 #ifdef I_MATH
 #    include <math.h>
 #else
-#   ifdef __cplusplus
-	extern "C" {
-#   endif
+START_EXTERN_C
 	    double exp _((double));
 	    double log _((double));
 	    double log10 _((double));
@@ -1227,31 +1542,31 @@ char *strcpy(), *strcat();
 	    double cos _((double));
 	    double atan2 _((double,double));
 	    double pow _((double,double));
-#   ifdef __cplusplus
-	};
-#   endif
+END_EXTERN_C
 #endif
 
 #ifndef __cplusplus
-#ifdef __NeXT__ /* or whatever catches all NeXTs */
+#  ifdef __NeXT__ /* or whatever catches all NeXTs */
 char *crypt ();       /* Maybe more hosts will need the unprototyped version */
-#else
+#  else
+#    if !defined(WIN32) || !defined(HAVE_DES_FCRYPT)
 char *crypt _((const char*, const char*));
-#endif
-#ifndef DONT_DECLARE_STD
-#ifndef getenv
+#    endif /* !WIN32 && !HAVE_CRYPT_SOURCE */
+#  endif /* !__NeXT__ */
+#  ifndef DONT_DECLARE_STD
+#    ifndef getenv
 char *getenv _((const char*));
-#endif
+#    endif /* !getenv */
 Off_t lseek _((int,Off_t,int));
-#endif
+#  endif /* !DONT_DECLARE_STD */
 char *getlogin _((void));
-#endif
+#endif /* !__cplusplus */
 
 #ifdef UNLINK_ALL_VERSIONS /* Currently only makes sense for VMS */
 #define UNLINK unlnk
 I32 unlnk _((char*));
 #else
-#define UNLINK unlink
+#define UNLINK PerlLIO_unlink
 #endif
 
 #ifndef HAS_SETREUID
@@ -1284,19 +1599,56 @@ typedef Sighandler_t Sigsave_t;
 #  define register
 # endif
 # define PAD_SV(po) pad_sv(po)
+# define RUNOPS_DEFAULT runops_debug
 #else
-# define PAD_SV(po) curpad[po]
+# define PAD_SV(po) PL_curpad[po]
+# define RUNOPS_DEFAULT runops_standard
 #endif
 
-/****************/
-/* Truly global */
-/****************/
+#ifdef MYMALLOC
+#  ifdef MUTEX_INIT_CALLS_MALLOC
+#    define MALLOC_INIT					\
+	STMT_START {					\
+		PL_malloc_mutex = NULL;			\
+		MUTEX_INIT(&PL_malloc_mutex);		\
+	} STMT_END
+#    define MALLOC_TERM					\
+	STMT_START {					\
+		perl_mutex tmp = PL_malloc_mutex;	\
+		PL_malloc_mutex = NULL;			\
+		MUTEX_DESTROY(&tmp);			\
+	} STMT_END
+#  else
+#    define MALLOC_INIT MUTEX_INIT(&PL_malloc_mutex)
+#    define MALLOC_TERM MUTEX_DESTROY(&PL_malloc_mutex)
+#  endif
+#else
+#  define MALLOC_INIT
+#  define MALLOC_TERM
+#endif
+
+
+/*
+ * These need prototyping here because <proto.h> isn't
+ * included until after runops is initialised.
+ */
+
+#ifndef PERL_OBJECT
+typedef int runops_proc_t _((void));
+int runops_standard _((void));
+#ifdef DEBUGGING
+int runops_debug _((void));
+#endif
+#endif  /* PERL_OBJECT */
+
+/* _ (for $_) must be first in the following list (DEFSV requires it) */
+#define THREADSV_NAMES "_123456789&`'+/.,\\\";^-%=|~:\001\005!@"
 
-/* global state */
-EXT PerlInterpreter *	curinterp;	/* currently running interpreter */
 /* VMS doesn't use environ array and NeXT has problems with crt0.o globals */
 #if !defined(VMS) && !(defined(NeXT) && defined(__DYNAMIC__))
-#ifndef DONT_DECLARE_STD
+#if !defined(DONT_DECLARE_STD) \
+	|| (defined(__svr4__) && defined(__GNUC__) && defined(sun)) \
+	|| defined(__sgi) || defined(__DGUX)
 extern char **	environ;	/* environment variables supplied via exec */
 #endif
 #else
@@ -1308,69 +1660,6 @@ EXT char *** environ_pointer;
 #  endif
 #endif /* environ processing */
 
-EXT int		uid;		/* current real user id */
-EXT int		euid;		/* current effective user id */
-EXT int		gid;		/* current real group id */
-EXT int		egid;		/* current effective group id */
-EXT bool	nomemok;	/* let malloc context handle nomem */
-EXT U32		an;		/* malloc sequence number */
-EXT U32		cop_seqmax;	/* statement sequence number */
-EXT U16		op_seqmax;	/* op sequence number */
-EXT U32		evalseq;	/* eval sequence number */
-EXT U32		sub_generation;	/* inc to force methods to be looked up again */
-EXT char **	origenviron;
-EXT U32		origalen;
-EXT HV *	pidstatus;	/* pid-to-status mappings for waitpid */
-EXT U32 *	profiledata;
-EXT int		maxo INIT(MAXO);/* Number of ops */
-EXT char *	osname;		/* operating system */
-EXT char *	sh_path INIT(SH_PATH); /* full path of shell */
-
-EXT XPV*	xiv_arenaroot;	/* list of allocated xiv areas */
-EXT IV **	xiv_root;	/* free xiv list--shared by interpreters */
-EXT double *	xnv_root;	/* free xnv list--shared by interpreters */
-EXT XRV *	xrv_root;	/* free xrv list--shared by interpreters */
-EXT XPV *	xpv_root;	/* free xpv list--shared by interpreters */
-EXT HE *	he_root;	/* free he list--shared by interpreters */
-EXT char *	nice_chunk;	/* a nice chunk of memory to reuse */
-EXT U32		nice_chunk_size;/* how nice the chunk of memory is */
-
-/* Stack for currently executing thread--context switch must handle this.     */
-EXT SV **	stack_base;	/* stack->array_ary */
-EXT SV **	stack_sp;	/* stack pointer now */
-EXT SV **	stack_max;	/* stack->array_ary + stack->array_max */
-
-/* likewise for these */
-
-EXT OP *	op;		/* current op--oughta be in a global register */
-
-EXT I32 *	scopestack;	/* blocks we've entered */
-EXT I32		scopestack_ix;
-EXT I32		scopestack_max;
-
-EXT ANY*	savestack;	/* to save non-local values on */
-EXT I32		savestack_ix;
-EXT I32		savestack_max;
-
-EXT OP **	retstack;	/* returns we've pushed */
-EXT I32		retstack_ix;
-EXT I32		retstack_max;
-
-EXT I32 *	markstack;	/* stackmarks we're remembering */
-EXT I32 *	markstack_ptr;	/* stackmarks we're remembering */
-EXT I32 *	markstack_max;	/* stackmarks we're remembering */
-
-EXT SV **	curpad;
-
-/* temp space */
-EXT SV *	Sv;
-EXT XPV *	Xpv;
-EXT char	tokenbuf[256];
-EXT struct stat	statbuf;
-#ifdef HAS_TIMES
-EXT struct tms	timesbuf;
-#endif
-EXT STRLEN na;		/* for use in SvPV when length is Not Applicable */
 
 /* for tmp use in stupid debuggers */
 EXT int *	di;
@@ -1378,12 +1667,6 @@ EXT short *	ds;
 EXT char *	dc;
 
 /* handy constants */
-EXTCONST char *	Yes INIT("1");
-EXTCONST char *	No INIT("");
-EXTCONST char *	hexdigit INIT("0123456789abcdef0123456789ABCDEFx");
-EXTCONST char *	patleave INIT("\\.^$@dDwWsSbB+*?|()-nrtfeaxc0123456789[{]}");
-EXTCONST char *	vert INIT("|");
-
 EXTCONST char warn_uninit[]
   INIT("Use of uninitialized value");
 EXTCONST char warn_nosemi[]
@@ -1417,14 +1700,6 @@ EXTCONST char no_func[]
 EXTCONST char no_myglob[]
   INIT("\"my\" variable %s can't be in a package");
 
-EXT SV		sv_undef;
-EXT SV		sv_no;
-EXT SV		sv_yes;
-#ifdef CSH
-    EXT char *	cshname INIT(CSH);
-    EXT I32	cshlen;
-#endif
-
 #ifdef DOINIT
 EXT char *sig_name[] = { SIG_NAME };
 EXT int   sig_num[]  = { SIG_NUM };
@@ -1440,6 +1715,42 @@ EXT SV  * psig_name[];
 /* fast case folding tables */
 
 #ifdef DOINIT
+#ifdef EBCDIC
+EXT unsigned char fold[] = { /* fast EBCDIC case folding table */
+    0,      1,      2,      3,      4,      5,      6,      7,
+    8,      9,      10,     11,     12,     13,     14,     15,
+    16,     17,     18,     19,     20,     21,     22,     23,
+    24,     25,     26,     27,     28,     29,     30,     31,
+    32,     33,     34,     35,     36,     37,     38,     39,
+    40,     41,     42,     43,     44,     45,     46,     47,
+    48,     49,     50,     51,     52,     53,     54,     55,
+    56,     57,     58,     59,     60,     61,     62,     63,
+    64,     65,     66,     67,     68,     69,     70,     71,
+    72,     73,     74,     75,     76,     77,     78,     79,
+    80,     81,     82,     83,     84,     85,     86,     87,
+    88,     89,     90,     91,     92,     93,     94,     95,
+    96,     97,     98,     99,     100,    101,    102,    103,
+    104,    105,    106,    107,    108,    109,    110,    111,
+    112,    113,    114,    115,    116,    117,    118,    119,
+    120,    121,    122,    123,    124,    125,    126,    127,
+    128,    'A',    'B',    'C',    'D',    'E',    'F',    'G',
+    'H',    'I',    138,    139,    140,    141,    142,    143,
+    144,    'J',    'K',    'L',    'M',    'N',    'O',    'P',
+    'Q',    'R',    154,    155,    156,    157,    158,    159,
+    160,    161,    'S',    'T',    'U',    'V',    'W',    'X',
+    'Y',    'Z',    170,    171,    172,    173,    174,    175,
+    176,    177,    178,    179,    180,    181,    182,    183,
+    184,    185,    186,    187,    188,    189,    190,    191,
+    192,    'a',    'b',    'c',    'd',    'e',    'f',    'g',
+    'h',    'i',    202,    203,    204,    205,    206,    207,
+    208,    'j',    'k',    'l',    'm',    'n',    'o',    'p',
+    'q',    'r',    218,    219,    220,    221,    222,    223,
+    224,    225,    's',    't',    'u',    'v',    'w',    'x',
+    'y',    'z',    234,    235,    236,    237,    238,    239,
+    240,    241,    242,    243,    244,    245,    246,    247,
+    248,    249,    250,    251,    252,    253,    254,    255
+};
+#else   /* ascii rather than ebcdic */
 EXTCONST  unsigned char fold[] = {
 	0,	1,	2,	3,	4,	5,	6,	7,
 	8,	9,	10,	11,	12,	13,	14,	15,
@@ -1474,6 +1785,7 @@ EXTCONST  unsigned char fold[] = {
 	240,	241,	242,	243,	244,	245,	246,	247,
 	248,	249,	250,	251,	252,	253,	254,	255
 };
+#endif  /* !EBCDIC */
 #else
 EXTCONST unsigned char fold[];
 #endif
@@ -1518,6 +1830,42 @@ EXT unsigned char fold_locale[];
 #endif
 
 #ifdef DOINIT
+#ifdef EBCDIC
+EXT unsigned char freq[] = {/* EBCDIC frequencies for mixed English/C */
+    1,      2,      84,     151,    154,    155,    156,    157,
+    165,    246,    250,    3,      158,    7,      18,     29,
+    40,     51,     62,     73,     85,     96,     107,    118,
+    129,    140,    147,    148,    149,    150,    152,    153,
+    255,      6,      8,      9,     10,     11,     12,     13,
+     14,     15,     24,     25,     26,     27,     28,    226,
+     29,     30,     31,     32,     33,     43,     44,     45,
+     46,     47,     48,     49,     50,     76,     77,     78,
+     79,     80,     81,     82,     83,     84,     85,     86,
+     87,     94,     95,    234,    181,    233,    187,    190,
+    180,     96,     97,     98,     99,    100,    101,    102,
+    104,    112,    182,    174,    236,    232,    229,    103,
+    228,    226,    114,    115,    116,    117,    118,    119,
+    120,    121,    122,    235,    176,    230,    194,    162,
+    130,    131,    132,    133,    134,    135,    136,    137,
+    138,    139,    201,    205,    163,    217,    220,    224,
+    5,      248,    227,    244,    242,    255,    241,    231,
+    240,    253,    16,     197,    19,     20,     21,     187,
+    23,     169,    210,    245,    237,    249,    247,    239,
+    168,    252,    34,     196,    36,     37,     38,     39,
+    41,     42,     251,    254,    238,    223,    221,    213,
+    225,    177,    52,     53,     54,     55,     56,     57,
+    58,     59,     60,     61,     63,     64,     65,     66,
+    67,     68,     69,     70,     71,     72,     74,     75,
+    205,    208,    186,    202,    200,    218,    198,    179,
+    178,    214,    88,     89,     90,     91,     92,     93,
+    217,    166,    170,    207,    199,    209,    206,    204,
+    160,    212,    105,    106,    108,    109,    110,    111,
+    203,    113,    216,    215,    192,    175,    193,    243,
+    172,    161,    123,    124,    125,    126,    127,    128,
+    222,    219,    211,    195,    188,    193,    185,    184,
+    191,    183,    141,    142,    143,    144,    145,    146
+};
+#else  /* ascii rather than ebcdic */
 EXTCONST unsigned char freq[] = {	/* letter frequencies for mixed English/C */
 	1,	2,	84,	151,	154,	155,	156,	157,
 	165,	246,	250,	3,	158,	7,	18,	29,
@@ -1552,6 +1900,7 @@ EXTCONST unsigned char freq[] = {	/* letter frequencies for mixed English/C */
 	130,	131,	132,	133,	134,	135,	136,	137,
 	138,	139,	141,	142,	143,	144,	145,	146
 };
+#endif
 #else
 EXTCONST unsigned char freq[];
 #endif
@@ -1589,69 +1938,39 @@ typedef enum {
     XTERMBLOCK
 } expectation;
 
-EXT U32		lex_state;	/* next token is determined */
-EXT U32		lex_defer;	/* state after determined token */
-EXT expectation	lex_expect;	/* expect after determined token */
-EXT I32		lex_brackets;	/* bracket count */
-EXT I32		lex_formbrack;	/* bracket count at outer format level */
-EXT I32		lex_fakebrack;	/* outer bracket is mere delimiter */
-EXT I32		lex_casemods;	/* casemod count */
-EXT I32		lex_dojoin;	/* doing an array interpolation */
-EXT I32		lex_starts;	/* how many interps done on level */
-EXT SV *	lex_stuff;	/* runtime pattern from m// or s/// */
-EXT SV *	lex_repl;	/* runtime replacement from s/// */
-EXT OP *	lex_op;		/* extra info to pass back on op */
-EXT OP *	lex_inpat;	/* in pattern $) and $| are special */
-EXT I32		lex_inwhat;	/* what kind of quoting are we in */
-EXT char *	lex_brackstack;	/* what kind of brackets to pop */
-EXT char *	lex_casestack;	/* what kind of case mods in effect */
-
-/* What we know when we're in LEX_KNOWNEXT state. */
-EXT YYSTYPE	nextval[5];	/* value of next token, if any */
-EXT I32		nexttype[5];	/* type of next token */
-EXT I32		nexttoke;
-
-EXT PerlIO * VOL	rsfp INIT(Nullfp);
-EXT SV *	linestr;
-EXT char *	bufptr;
-EXT char *	oldbufptr;
-EXT char *	oldoldbufptr;
-EXT char *	bufend;
-EXT expectation expect INIT(XSTATE);	/* how to interpret ambiguous tokens */
-EXT AV * 	rsfp_filters;
-
-EXT I32		multi_start;	/* 1st line of multi-line string */
-EXT I32		multi_end;	/* last line of multi-line string */
-EXT I32		multi_open;	/* delimiter of said string */
-EXT I32		multi_close;	/* delimiter of said string */
-
-EXT GV *	scrgv;
-EXT I32		error_count;	/* how many errors so far, max 10 */
-EXT I32		subline;	/* line this subroutine began on */
-EXT SV *	subname;	/* name of current subroutine */
-
-EXT CV *	compcv;		/* currently compiling subroutine */
-EXT AV *	comppad;	/* storage for lexically scoped temporaries */
-EXT AV *	comppad_name;	/* variable names for "my" variables */
-EXT I32		comppad_name_fill;/* last "introduced" variable offset */
-EXT I32		comppad_name_floor;/* start of vars in innermost block */
-EXT I32		min_intro_pending;/* start of vars to introduce */
-EXT I32		max_intro_pending;/* end of vars to introduce */
-EXT I32		padix;		/* max used index in current "register" pad */
-EXT I32		padix_floor;	/* how low may inner block reset padix */
-EXT I32		pad_reset_pending; /* reset pad on next attempted alloc */
-EXT COP		compiling;
-
-EXT I32		thisexpr;	/* name id for nothing_in_common() */
-EXT char *	last_uni;	/* position of last named-unary operator */
-EXT char *	last_lop;	/* position of last list operator */
-EXT OPCODE	last_lop_op;	/* last list operator */
-EXT bool	in_my;		/* we're compiling a "my" declaration */
-#ifdef FCRYPT
-EXT I32		cryptseen;	/* has fast crypt() been initialized? */
-#endif
-
-EXT U32		hints;		/* various compilation flags */
+enum {		/* pass one of these to get_vtbl */
+    want_vtbl_sv,
+    want_vtbl_env,
+    want_vtbl_envelem,
+    want_vtbl_sig,
+    want_vtbl_sigelem,
+    want_vtbl_pack,
+    want_vtbl_packelem,
+    want_vtbl_dbline,
+    want_vtbl_isa,
+    want_vtbl_isaelem,
+    want_vtbl_arylen,
+    want_vtbl_glob,
+    want_vtbl_mglob,
+    want_vtbl_nkeys,
+    want_vtbl_taint,
+    want_vtbl_substr,
+    want_vtbl_vec,
+    want_vtbl_pos,
+    want_vtbl_bm,
+    want_vtbl_fm,
+    want_vtbl_uvar,
+    want_vtbl_defelem,
+    want_vtbl_regexp,
+    want_vtbl_collxfrm,
+    want_vtbl_amagic,
+    want_vtbl_amagicelem
+#ifdef USE_THREADS
+    ,
+    want_vtbl_mutex
+#endif
+};
+
 
 				/* Note: the lowest 8 bits are reserved for
 				   stuffing into op->op_private */
@@ -1663,253 +1982,130 @@ EXT U32		hints;		/* various compilation flags */
 #define HINT_STRICT_VARS	0x00000400
 #define HINT_LOCALE		0x00000800
 
-/**************************************************************************/
-/* This regexp stuff is global since it always happens within 1 expr eval */
-/**************************************************************************/
-
-EXT char *	regprecomp;	/* uncompiled string. */
-EXT char *	regparse;	/* Input-scan pointer. */
-EXT char *	regxend;	/* End of input for compile */
-EXT I32		regnpar;	/* () count. */
-EXT char *	regcode;	/* Code-emit pointer; &regdummy = don't. */
-EXT I32		regsize;	/* Code size. */
-EXT I32		regnaughty;	/* How bad is this pattern? */
-EXT I32		regsawback;	/* Did we see \1, ...? */
-
-EXT char *	reginput;	/* String-input pointer. */
-EXT char *	regbol;		/* Beginning of input, for ^ check. */
-EXT char *	regeol;		/* End of input, for $ check. */
-EXT char **	regstartp;	/* Pointer to startp array. */
-EXT char **	regendp;	/* Ditto for endp. */
-EXT U32 *	reglastparen;	/* Similarly for lastparen. */
-EXT char *	regtill;	/* How far we are required to go. */
-EXT U16		regflags;	/* are we folding, multilining? */
-EXT char	regprev;	/* char before regbol, \n if none */
-
-EXT bool	do_undump;	/* -u or dump seen? */
-EXT VOL U32	debug;
-
-/***********************************************/
-/* Global only to current interpreter instance */
-/***********************************************/
+#define HINT_NEW_INTEGER	0x00001000
+#define HINT_NEW_FLOAT		0x00002000
+#define HINT_NEW_BINARY		0x00004000
+#define HINT_NEW_STRING		0x00008000
+#define HINT_NEW_RE		0x00010000
+#define HINT_LOCALIZE_HH	0x00020000 /* %^H needs to be copied */
 
-#ifdef MULTIPLICITY
-#define IEXT
-#define IINIT(x)
-struct interpreter {
-#else
-#define IEXT EXT
-#define IINIT(x) INIT(x)
-#endif
-
-/* pseudo environmental stuff */
-IEXT int	Iorigargc;
-IEXT char **	Iorigargv;
-IEXT GV *	Ienvgv;
-IEXT GV *	Isiggv;
-IEXT GV *	Iincgv;
-IEXT char *	Iorigfilename;
-IEXT SV *	Idiehook;
-IEXT SV *	Iwarnhook;
-IEXT SV *	Iparsehook;
+#define HINT_RE_TAINT		0x00100000
+#define HINT_RE_EVAL		0x00200000
 
 /* Various states of an input record separator SV (rs, nrs) */
 #define RsSNARF(sv)   (! SvOK(sv))
 #define RsSIMPLE(sv)  (SvOK(sv) && SvCUR(sv))
 #define RsPARA(sv)    (SvOK(sv) && ! SvCUR(sv))
+#define RsRECORD(sv)  (SvROK(sv) && (SvIV(SvRV(sv)) > 0))
+
+/* Enable variables which are pointers to functions */
+#ifdef PERL_OBJECT
+typedef regexp*(CPerlObj::*regcomp_t) _((char* exp, char* xend, PMOP* pm));
+typedef I32 (CPerlObj::*regexec_t) _((regexp* prog, char* stringarg,
+				      char* strend, char* strbeg,
+				      I32 minend, SV* screamer, void* data,
+				      U32 flags));
+#else
+typedef regexp*(*regcomp_t) _((char* exp, char* xend, PMOP* pm));
+typedef I32 (*regexec_t) _((regexp* prog, char* stringarg, char* strend, char*
+			    strbeg, I32 minend, SV* screamer, void* data, 
+			    U32 flags));
 
-/* switches */
-IEXT char *	Icddir;
-IEXT bool	Iminus_c;
-IEXT char	Ipatchlevel[10];
-IEXT char **	Ilocalpatches;
-IEXT SV *	Inrs;
-IEXT char *	Isplitstr IINIT(" ");
-IEXT bool	Ipreprocess;
-IEXT bool	Iminus_n;
-IEXT bool	Iminus_p;
-IEXT bool	Iminus_l;
-IEXT bool	Iminus_a;
-IEXT bool	Iminus_F;
-IEXT bool	Idoswitches;
-IEXT bool	Idowarn;
-IEXT bool	Idoextract;
-IEXT bool	Isawampersand;	/* must save all match strings */
-IEXT bool	Isawstudy;	/* do fbm_instr on all strings */
-IEXT bool	Isawvec;
-IEXT bool	Iunsafe;
-IEXT char *	Iinplace;
-IEXT char *	Ie_tmpname;
-IEXT PerlIO *	Ie_fp;
-IEXT U32	Iperldb;
-	/* This value may be raised by extensions for testing purposes */
-IEXT int	Iperl_destruct_level IINIT(0);	/* 0=none, 1=full, 2=full with checks */
-
-/* magical thingies */
-IEXT Time_t	Ibasetime;		/* $^T */
-IEXT SV *	Iformfeed;		/* $^L */
-IEXT char *	Ichopset IINIT(" \n-");	/* $: */
-IEXT SV *	Irs;			/* $/ */
-IEXT char *	Iofs;			/* $, */
-IEXT STRLEN	Iofslen;
-IEXT char *	Iors;			/* $\ */
-IEXT STRLEN	Iorslen;
-IEXT char *	Iofmt;			/* $# */
-IEXT I32	Imaxsysfd IINIT(MAXSYSFD); /* top fd to pass to subprocesses */
-IEXT int	Imultiline;		/* $*--do strings hold >1 line? */
-IEXT I32	Istatusvalue;		/* $? */
-#ifdef VMS
-IEXT U32	Istatusvalue_vms;
-#endif
-
-IEXT struct stat Istatcache;		/* _ */
-IEXT GV *	Istatgv;
-IEXT SV *	Istatname IINIT(Nullsv);
-
-/* shortcuts to various I/O objects */
-IEXT GV *	Istdingv;
-IEXT GV *	Ilast_in_gv;
-IEXT GV *	Idefgv;
-IEXT GV *	Iargvgv;
-IEXT GV *	Idefoutgv;
-IEXT GV *	Iargvoutgv;
-
-/* shortcuts to regexp stuff */
-IEXT GV *	Ileftgv;
-IEXT GV *	Iampergv;
-IEXT GV *	Irightgv;
-IEXT PMOP *	Icurpm;		/* what to do \ interps from */
-IEXT I32 *	Iscreamfirst;
-IEXT I32 *	Iscreamnext;
-IEXT I32	Imaxscream IINIT(-1);
-IEXT SV *	Ilastscream;
-
-/* shortcuts to misc objects */
-IEXT GV *	Ierrgv;
-
-/* shortcuts to debugging objects */
-IEXT GV *	IDBgv;
-IEXT GV *	IDBline;
-IEXT GV *	IDBsub;
-IEXT SV *	IDBsingle;
-IEXT SV *	IDBtrace;
-IEXT SV *	IDBsignal;
-IEXT AV *	Ilineary;	/* lines of script for debugger */
-IEXT AV *	Idbargs;	/* args to call listed by caller function */
-
-/* symbol tables */
-IEXT HV *	Idefstash;	/* main symbol table */
-IEXT HV *	Icurstash;	/* symbol table for current package */
-IEXT HV *	Idebstash;	/* symbol table for perldb package */
-IEXT SV *	Icurstname;	/* name of current package */
-IEXT AV *	Ibeginav;	/* names of BEGIN subroutines */
-IEXT AV *	Iendav;		/* names of END subroutines */
-IEXT HV *	Istrtab;	/* shared string table */
-
-/* memory management */
-IEXT SV **	Itmps_stack;
-IEXT I32	Itmps_ix IINIT(-1);
-IEXT I32	Itmps_floor IINIT(-1);
-IEXT I32	Itmps_max;
-IEXT I32	Isv_count;	/* how many SV* are currently allocated */
-IEXT I32	Isv_objcount;	/* how many objects are currently allocated */
-IEXT SV*	Isv_root;	/* storage for SVs belonging to interp */
-IEXT SV*	Isv_arenaroot;	/* list of areas for garbage collection */
-
-/* funky return mechanisms */
-IEXT I32	Ilastspbase;
-IEXT I32	Ilastsize;
-IEXT int	Iforkprocess;	/* so do_open |- can return proc# */
-
-/* subprocess state */
-IEXT AV *	Ifdpid;		/* keep fd-to-pid mappings for my_popen */
-
-/* internal state */
-IEXT VOL int	Iin_eval;	/* trap "fatal" errors? */
-IEXT OP *	Irestartop;	/* Are we propagating an error from croak? */
-IEXT int	Idelaymagic;	/* ($<,$>) = ... */
-IEXT bool	Idirty;		/* In the middle of tearing things down? */
-IEXT U8		Ilocalizing;	/* are we processing a local() list? */
-IEXT bool	Itainted;	/* using variables controlled by $< */
-IEXT bool	Itainting;	/* doing taint checks */
-IEXT char *	Iop_mask IINIT(NULL);	/* masked operations for safe evals */
-
-/* trace state */
-IEXT I32	Idlevel;
-IEXT I32	Idlmax IINIT(128);
-IEXT char *	Idebname;
-IEXT char *	Idebdelim;
-
-/* current interpreter roots */
-IEXT CV *	Imain_cv;
-IEXT OP *	Imain_root;
-IEXT OP *	Imain_start;
-IEXT OP *	Ieval_root;
-IEXT OP *	Ieval_start;
-
-/* runtime control stuff */
-IEXT COP * VOL	Icurcop IINIT(&compiling);
-IEXT COP *	Icurcopdb IINIT(NULL);
-IEXT line_t	Icopline IINIT(NOLINE);
-IEXT CONTEXT *	Icxstack;
-IEXT I32	Icxstack_ix IINIT(-1);
-IEXT I32	Icxstack_max IINIT(128);
-IEXT JMPENV 	Istart_env;	/* empty startup sigjmp() environment */
-IEXT JMPENV *	Itop_env;	/* ptr. to current sigjmp() environment */
-IEXT I32	Irunlevel;
-
-/* stack stuff */
-IEXT AV *	Icurstack;		/* THE STACK */
-IEXT AV *	Imainstack;	/* the stack when nothing funny is happening */
-IEXT SV **	Imystack_base;	/* stack->array_ary */
-IEXT SV **	Imystack_sp;	/* stack pointer now */
-IEXT SV **	Imystack_max;	/* stack->array_ary + stack->array_max */
-
-/* format accumulators */
-IEXT SV *	Iformtarget;
-IEXT SV *	Ibodytarget;
-IEXT SV *	Itoptarget;
-
-/* statics moved here for shared library purposes */
-IEXT SV		Istrchop;	/* return value from chop */
-IEXT int	Ifilemode;	/* so nextargv() can preserve mode */
-IEXT int	Ilastfd;	/* what to preserve mode on */
-IEXT char *	Ioldname;	/* what to preserve mode on */
-IEXT char **	IArgv;		/* stuff to free from do_aexec, vfork safe */
-IEXT char *	ICmd;		/* stuff to free from do_aexec, vfork safe */
-IEXT OP *	Isortcop;	/* user defined sort routine */
-IEXT HV *	Isortstash;	/* which is in some package or other */
-IEXT GV *	Ifirstgv;	/* $a */
-IEXT GV *	Isecondgv;	/* $b */
-IEXT AV *	Isortstack;	/* temp stack during pp_sort() */
-IEXT AV *	Isignalstack;	/* temp stack during sighandler() */
-IEXT SV *	Imystrk;	/* temp key string for do_each() */
-IEXT I32	Idumplvl;	/* indentation level on syntax tree dump */
-IEXT PMOP *	Ioldlastpm;	/* for saving regexp context during debugger */
-IEXT I32	Igensym;	/* next symbol for getsym() to define */
-IEXT bool	Ipreambled;
-IEXT AV *	Ipreambleav;
-IEXT int	Ilaststatval IINIT(-1);
-IEXT I32	Ilaststype IINIT(OP_STAT);
-IEXT SV *	Imess_sv;
-
-#undef IEXT
-#undef IINIT
+#endif
+
+/* Set up PERLVAR macros for populating structs */
+#define PERLVAR(var,type) type var;
+#define PERLVARI(var,type,init) type var;
+#define PERLVARIC(var,type,init) type var;
+
+/* Interpreter exitlist entry */
+typedef struct exitlistentry {
+#ifdef PERL_OBJECT
+    void (*fn) _((CPerlObj*, void*));
+#else
+    void (*fn) _((void*));
+#endif
+    void *ptr;
+} PerlExitListEntry;
+
+#ifdef PERL_OBJECT
+extern "C" CPerlObj* perl_alloc _((IPerlMem*, IPerlEnv*, IPerlStdIO*, IPerlLIO*, IPerlDir*, IPerlSock*, IPerlProc*));
+
+typedef int (CPerlObj::*runops_proc_t) _((void));
+#undef EXT
+#define EXT
+#undef EXTCONST
+#define EXTCONST
+#undef INIT
+#define INIT(x)
+
+class CPerlObj {
+public:
+	CPerlObj(IPerlMem*, IPerlEnv*, IPerlStdIO*, IPerlLIO*, IPerlDir*, IPerlSock*, IPerlProc*);
+	void Init(void);
+	void* operator new(size_t nSize, IPerlMem *pvtbl);
+#endif /* PERL_OBJECT */
+
+#ifdef PERL_GLOBAL_STRUCT
+struct perl_vars {
+#include "perlvars.h"
+};
+
+#ifdef PERL_CORE
+EXT struct perl_vars PL_Vars;
+EXT struct perl_vars *PL_VarsPtr INIT(&PL_Vars);
+#else /* PERL_CORE */
+#if !defined(__GNUC__) || !defined(WIN32)
+EXT
+#endif /* WIN32 */
+struct perl_vars *PL_VarsPtr;
+#define PL_Vars (*((PL_VarsPtr) ? PL_VarsPtr : (PL_VarsPtr =  Perl_GetVars())))
+#endif /* PERL_CORE */
+#endif /* PERL_GLOBAL_STRUCT */
 
 #ifdef MULTIPLICITY
+/* If we have multiple interpreters define a struct 
+   holding variables which must be per-interpreter
+   If we don't have threads anything that would have 
+   be per-thread is per-interpreter.
+*/
+
+struct interpreter {
+#ifndef USE_THREADS
+#include "thrdvar.h"
+#endif
+#include "intrpvar.h"
 };
+
 #else
 struct interpreter {
     char broiled;
 };
 #endif
 
-#include "pp.h"
+#ifdef USE_THREADS
+/* If we have threads define a struct with all the variables
+ * that have to be per-thread
+ */
 
-#ifdef __cplusplus
-extern "C" {
+
+struct perl_thread {
+#include "thrdvar.h"
+};
+
+typedef struct perl_thread *Thread;
+
+#else
+typedef void *Thread;
 #endif
 
+/* Done with PERLVAR macros for now ... */
+#undef PERLVAR
+#undef PERLVARI
+#undef PERLVARIC
+
+#include "thread.h"
+#include "pp.h"
 #include "proto.h"
 
 #ifdef EMBED
@@ -1920,11 +2116,109 @@ extern "C" {
 #define sv_setptrref(rv,ptr) sv_setref_iv(rv,Nullch,(IV)ptr)
 #endif
 
-#ifdef __cplusplus
+/* The following must follow proto.h as #defines mess up syntax */
+
+#include "embedvar.h"
+
+/* Now include all the 'global' variables 
+ * If we don't have threads or multiple interpreters
+ * these include variables that would have been their struct-s 
+ */
+                         
+#define PERLVAR(var,type) EXT type PL_##var;
+#define PERLVARI(var,type,init) EXT type  PL_##var INIT(init);
+#define PERLVARIC(var,type,init) EXTCONST type PL_##var INIT(init);
+
+#ifndef PERL_GLOBAL_STRUCT
+#include "perlvars.h"
+#endif
+
+#ifndef MULTIPLICITY
+
+#  include "intrpvar.h"
+#  ifndef USE_THREADS
+#    include "thrdvar.h"
+#  endif
+
+#endif
+
+#ifdef PERL_OBJECT
+/* from perly.c */
+#undef  yydebug
+#undef  yynerrs
+#undef  yyerrflag
+#undef  yychar
+#undef  yyssp
+#undef  yyvsp
+#undef  yyval
+#undef  yylval
+#define yydebug	    PL_yydebug
+#define yynerrs	    PL_yynerrs
+#define yyerrflag   PL_yyerrflag
+#define yychar	    PL_yychar
+#define yyssp	    PL_yyssp
+#define yyvsp	    PL_yyvsp
+#define yyval	    PL_yyval
+#define yylval	    PL_yylval
+PERLVAR(yydebug,		int)
+PERLVAR(yynerrs,		int)
+PERLVAR(yyerrflag,		int)
+PERLVAR(yychar,			int)
+PERLVAR(yyssp,			short*)
+PERLVAR(yyvsp,			YYSTYPE*)
+PERLVAR(yyval,			YYSTYPE)
+PERLVAR(yylval,			YYSTYPE)
+
+#define efloatbuf		PL_efloatbuf
+#define efloatsize		PL_efloatsize
+PERLVAR(efloatbuf,		char *)
+PERLVAR(efloatsize,		STRLEN)
+
+#define glob_index		PL_glob_index
+#define srand_called	PL_srand_called
+#define uudmap			PL_uudmap
+#define bitcount		PL_bitcount
+#define filter_debug	PL_filter_debug
+PERLVAR(glob_index,		int)
+PERLVAR(srand_called,	bool)
+PERLVAR(uudmap[256],	char)
+PERLVAR(bitcount,		char*)
+PERLVAR(filter_debug,	int)
+PERLVAR(super_bufptr,	char*)	/* PL_bufptr that was */
+PERLVAR(super_bufend,	char*)	/* PL_bufend that was */
+
+/*
+ * The following is a buffer where new variables must
+ * be defined to maintain binary compatibility with PERL_OBJECT
+ * for 5.005
+ */
+PERLVAR(object_compatibility[30],	char)
 };
+
+#include "objpp.h"
+#ifdef DOINIT
+#include "INTERN.h"
+#else
+#include "EXTERN.h"
 #endif
+#endif  /* PERL_OBJECT */
+
 
-/* The following must follow proto.h */
+#undef PERLVAR
+#undef PERLVARI
+#undef PERLVARIC
+
+#if defined(HASATTRIBUTE) && defined(WIN32)
+/*
+ * This provides a layer of functions and macros to ensure extensions will
+ * get to use the same RTL functions as the core.
+ * It has to go here or #define of printf messes up __attribute__
+ * stuff in proto.h  
+ */
+#ifndef PERL_OBJECT
+#  include <win32iop.h>
+#endif  /* PERL_OBJECT */
+#endif	/* WIN32 */
 
 #ifdef DOINIT
 
@@ -1943,7 +2237,7 @@ EXT MGVTBL vtbl_sigelem =	{magic_getsig,
 					magic_setsig,
 					0,	magic_clearsig,
 							0};
-EXT MGVTBL vtbl_pack =	{0,	0,	0,	magic_wipepack,
+EXT MGVTBL vtbl_pack =	{0,	0,	magic_sizepack,	magic_wipepack,
 							0};
 EXT MGVTBL vtbl_packelem =	{magic_getpack,
 				magic_setpack,
@@ -1964,13 +2258,15 @@ EXT MGVTBL vtbl_glob =	{magic_getglob,
 					0,	0,	0};
 EXT MGVTBL vtbl_mglob =	{0,	magic_setmglob,
 					0,	0,	0};
-EXT MGVTBL vtbl_nkeys =	{0,	magic_setnkeys,
+EXT MGVTBL vtbl_nkeys =	{magic_getnkeys,
+				magic_setnkeys,
 					0,	0,	0};
 EXT MGVTBL vtbl_taint =	{magic_gettaint,magic_settaint,
 					0,	0,	0};
-EXT MGVTBL vtbl_substr =	{0,	magic_setsubstr,
+EXT MGVTBL vtbl_substr =	{magic_getsubstr, magic_setsubstr,
 					0,	0,	0};
-EXT MGVTBL vtbl_vec =	{0,	magic_setvec,
+EXT MGVTBL vtbl_vec =	{magic_getvec,
+				magic_setvec,
 					0,	0,	0};
 EXT MGVTBL vtbl_pos =	{magic_getpos,
 				magic_setpos,
@@ -1982,8 +2278,13 @@ EXT MGVTBL vtbl_fm =	{0,	magic_setfm,
 EXT MGVTBL vtbl_uvar =	{magic_getuvar,
 				magic_setuvar,
 					0,	0,	0};
+#ifdef USE_THREADS
+EXT MGVTBL vtbl_mutex =	{0,	0,	0,	0,	magic_mutexfree};
+#endif /* USE_THREADS */
 EXT MGVTBL vtbl_defelem = {magic_getdefelem,magic_setdefelem,
-					0,	0,	magic_freedefelem};
+					0,	0,	0};
+
+EXT MGVTBL vtbl_regexp = {0,0,0,0, magic_freeregexp};
 
 #ifdef USE_LOCALE_COLLATE
 EXT MGVTBL vtbl_collxfrm = {0,
@@ -2021,7 +2322,13 @@ EXT MGVTBL vtbl_pos;
 EXT MGVTBL vtbl_bm;
 EXT MGVTBL vtbl_fm;
 EXT MGVTBL vtbl_uvar;
+
+#ifdef USE_THREADS
+EXT MGVTBL vtbl_mutex;
+#endif /* USE_THREADS */
+
 EXT MGVTBL vtbl_defelem;
+EXT MGVTBL vtbl_regexp;
 
 #ifdef USE_LOCALE_COLLATE
 EXT MGVTBL vtbl_collxfrm;
@@ -2036,8 +2343,6 @@ EXT MGVTBL vtbl_amagicelem;
 
 #ifdef OVERLOAD
 
-EXT long amagic_generation;
-
 #define NofAMmeth 58
 #ifdef DOINIT
 EXTCONST char * AMG_names[NofAMmeth] = {
@@ -2107,7 +2412,7 @@ enum {
   subtr_amg,	subtr_ass_amg,
   mult_amg,	mult_ass_amg,
   div_amg,	div_ass_amg,
-  mod_amg,	mod_ass_amg,
+  modulo_amg,	modulo_ass_amg,
   pow_amg,	pow_ass_amg,
   lshift_amg,	lshift_ass_amg,
   rshift_amg,	rshift_ass_amg,
@@ -2164,7 +2469,7 @@ enum {
 
 #endif /* OVERLOAD */
 
-#define PERLDB_ALL	0xff
+#define PERLDB_ALL	0x3f		/* No _NONAME, _GOTO */
 #define PERLDBf_SUB	0x01		/* Debug sub enter/exit. */
 #define PERLDBf_LINE	0x02		/* Keep line #. */
 #define PERLDBf_NOOPT	0x04		/* Switch off optimizations. */
@@ -2172,37 +2477,30 @@ enum {
 					   later inspections.  */
 #define PERLDBf_SUBLINE	0x10		/* Keep subr source lines. */
 #define PERLDBf_SINGLE	0x20		/* Start with single-step on. */
+#define PERLDBf_NONAME	0x40		/* For _SUB: no name of the subr. */
+#define PERLDBf_GOTO	0x80		/* Report goto: call DB::goto. */
 
-#define PERLDB_SUB	(perldb && (perldb & PERLDBf_SUB))
-#define PERLDB_LINE	(perldb && (perldb & PERLDBf_LINE))
-#define PERLDB_NOOPT	(perldb && (perldb & PERLDBf_NOOPT))
-#define PERLDB_INTER	(perldb && (perldb & PERLDBf_INTER))
-#define PERLDB_SUBLINE	(perldb && (perldb & PERLDBf_SUBLINE))
-#define PERLDB_SINGLE	(perldb && (perldb & PERLDBf_SINGLE))
+#define PERLDB_SUB	(PL_perldb && (PL_perldb & PERLDBf_SUB))
+#define PERLDB_LINE	(PL_perldb && (PL_perldb & PERLDBf_LINE))
+#define PERLDB_NOOPT	(PL_perldb && (PL_perldb & PERLDBf_NOOPT))
+#define PERLDB_INTER	(PL_perldb && (PL_perldb & PERLDBf_INTER))
+#define PERLDB_SUBLINE	(PL_perldb && (PL_perldb & PERLDBf_SUBLINE))
+#define PERLDB_SINGLE	(PL_perldb && (PL_perldb & PERLDBf_SINGLE))
+#define PERLDB_SUB_NN	(PL_perldb && (PL_perldb & (PERLDBf_NONAME)))
+#define PERLDB_GOTO	(PL_perldb && (PL_perldb & PERLDBf_GOTO))
 
-#ifdef USE_LOCALE_COLLATE
-EXT U32		collation_ix;		/* Collation generation index */
-EXT char *	collation_name;		/* Name of current collation */
-EXT bool	collation_standard INIT(TRUE); /* Assume simple collation */
-EXT Size_t	collxfrm_base;		/* Basic overhead in *xfrm() */
-EXT Size_t	collxfrm_mult INIT(2);	/* Expansion factor in *xfrm() */
-#endif /* USE_LOCALE_COLLATE */
 
 #ifdef USE_LOCALE_NUMERIC
 
-EXT char *	numeric_name;		/* Name of current numeric locale */
-EXT bool	numeric_standard INIT(TRUE); /* Assume simple numerics */
-EXT bool	numeric_local INIT(TRUE);    /* Assume local numerics */
-
 #define SET_NUMERIC_STANDARD() \
     STMT_START {				\
-	if (! numeric_standard)			\
+	if (! PL_numeric_standard)			\
 	    perl_set_numeric_standard();	\
     } STMT_END
 
 #define SET_NUMERIC_LOCAL() \
     STMT_START {				\
-	if (! numeric_local)			\
+	if (! PL_numeric_local)			\
 	    perl_set_numeric_local();		\
     } STMT_END
 
@@ -2213,7 +2511,7 @@ EXT bool	numeric_local INIT(TRUE);    /* Assume local numerics */
 
 #endif /* !USE_LOCALE_NUMERIC */
 
-#if !defined(PERLIO_IS_STDIO) && defined(HAS_ATTRIBUTE)
+#if !defined(PERLIO_IS_STDIO) && defined(HASATTRIBUTE)
 /* 
  * Now we have __attribute__ out of the way 
  * Remap printf 
@@ -2221,5 +2519,60 @@ EXT bool	numeric_local INIT(TRUE);    /* Assume local numerics */
 #define printf PerlIO_stdoutf
 #endif
 
-#endif /* Include guard */
+#ifndef PERL_SCRIPT_MODE
+#define PERL_SCRIPT_MODE "r"
+#endif
 
+/*
+ * nice_chunk and nice_chunk size need to be set
+ * and queried under the protection of sv_mutex
+ */
+#define offer_nice_chunk(chunk, chunk_size) do {	\
+	LOCK_SV_MUTEX;					\
+	if (!PL_nice_chunk) {				\
+	    PL_nice_chunk = (char*)(chunk);		\
+	    PL_nice_chunk_size = (chunk_size);		\
+	}						\
+	else {						\
+	    Safefree(chunk);				\
+	}						\
+	UNLOCK_SV_MUTEX;				\
+    } while (0)
+
+#ifdef HAS_SEM
+#   include <sys/ipc.h>
+#   include <sys/sem.h>
+#   ifndef HAS_UNION_SEMUN	/* Provide the union semun. */
+    union semun {
+	int val;
+	struct semid_ds *buf;
+	unsigned short *array;
+    };
+#   endif
+#   ifdef USE_SEMCTL_SEMUN
+#       define Semctl(id, num, cmd, semun) semctl(id, num, cmd, semun)
+#   else
+#       ifdef USE_SEMCTL_SEMID_DS
+#           define Semctl(id, num, cmd, semun) semctl(id, num, cmd, semun.buf)
+#       endif
+#   endif
+#   ifndef Semctl	/* Place our bets on the semun horse. */
+#       define Semctl(id, num, cmd, semun) semctl(id, num, cmd, semun)
+#   endif
+#endif
+
+#ifdef IAMSUID
+
+#ifdef I_SYS_STATVFS
+#   include <sys/statvfs.h>     /* for f?statvfs() */
+#endif
+#ifdef I_SYS_MOUNT
+#   include <sys/mount.h>       /* for *BSD f?statfs() */
+#endif
+#ifdef I_MNTENT
+#   include <mntent.h>          /* for getmntent() */
+#endif
+
+#endif /* IAMSUID */
+
+#endif /* Include guard */