X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.h;h=60f7dd56050026b4549d6a14fbb213eda7f2abcb;hb=0c815be9f490bd7db5177b102e9ec25d74b97f4f;hp=7f69913d090a02cbc03e8c268313379b7f8deb03;hpb=c6af95f61decbba4d08b75e0ff2fadd33009bd72;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perl.h b/perl.h index 7f69913..60f7dd5 100644 --- a/perl.h +++ b/perl.h @@ -24,6 +24,111 @@ #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 ipdir.h for +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->*runops) + +#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 runops + +#endif /* PERL_OBJECT */ + #define VOIDUSED 1 #include "config.h" @@ -46,7 +151,11 @@ # 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 @@ -75,7 +184,7 @@ register struct op *op asm(stringify(OP_IN_REGISTER)); #define NOOP (void)0 -#define WITH_THR(s) do { dTHR; s; } while (0) +#define WITH_THR(s) STMT_START { dTHR; s; } STMT_END /* * SOFT_CAST can be used for args to prototyped functions to retain some @@ -87,7 +196,7 @@ register struct op *op asm(stringify(OP_IN_REGISTER)); #define SOFT_CAST(type) (type) #endif -#ifndef BYTEORDER +#ifndef BYTEORDER /* Should never happen -- byteorder is in config.h */ # define BYTEORDER 0x1234 #endif @@ -113,7 +222,7 @@ register struct op *op asm(stringify(OP_IN_REGISTER)); # define STANDARD_C 1 #endif -#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) +#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(OS2) || defined(__DGUX) # define DONT_DECLARE_STD 1 #endif @@ -204,6 +313,12 @@ register struct op *op asm(stringify(OP_IN_REGISTER)); #endif #include "perlio.h" +#include "perlmem.h" +#include "perllio.h" +#include "perlsock.h" +#include "perlproc.h" +#include "perlenv.h" +#include "perldir.h" #ifdef USE_NEXT_CTYPE @@ -470,8 +585,8 @@ Free_t Perl_free _((Malloc_t where)); #ifdef USE_THREADS # define ERRSV (thr->errsv) # define ERRHV (thr->errhv) -# define DEFSV *av_fetch(thr->threadsv, find_threadsv("_"), FALSE) -# define SAVE_DEFSV save_threadsv(find_threadsv("_")) +# define DEFSV THREADSV(0) +# define SAVE_DEFSV save_threadsv(0) #else # define ERRSV GvSV(errgv) # define ERRHV GvHV(errgv) @@ -686,12 +801,21 @@ Free_t Perl_free _((Malloc_t where)); # 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; @@ -778,7 +902,11 @@ Free_t Perl_free _((Malloc_t where)); # 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 @@ -788,7 +916,11 @@ Free_t Perl_free _((Malloc_t where)); # ifdef MAXSHORT /* Often used in */ # 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 @@ -798,7 +930,11 @@ Free_t Perl_free _((Malloc_t where)); # 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 @@ -941,10 +1077,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_ISREADER(idx) (idx >= AvFILLp(rsfp_filters)) #ifdef DOSISH # if defined(OS2) @@ -964,9 +1105,13 @@ typedef I32 (*filter_t) _((int, SV *, int)); # endif #endif +#ifndef FUNC_NAME_TO_PTR +#define FUNC_NAME_TO_PTR(name) name +#endif + /* - * USE_THREADS needs to be after unixish.h as includes - * which defines NSIG - which will stop inclusion of + * USE_THREADS needs to be after unixish.h as includes + * which defines NSIG - which will stop inclusion of * this results in many functions being undeclared which bothers C++ * May make sense to have threads after "*ish.h" anyway */ @@ -978,10 +1123,15 @@ typedef I32 (*filter_t) _((int, SV *, int)); # ifdef WIN32 # include # else -# include +# ifdef OS2 +# include "os2thread.h" +# else +# include +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 /* OS2 */ # endif /* WIN32 */ # endif /* FAKE_THREADS */ #endif /* USE_THREADS */ @@ -1062,7 +1212,11 @@ union any { I32 any_i32; IV any_iv; long any_long; - void (*any_dptr) _((void*)); + void (CPERLscope(*any_dptr)) _((void*)); +#if defined(WIN32) && !defined(PERL_OBJECT) + /* Visual C thinks that a pointer to a member variable is 16 bytes in size. */ + char handle_VC_problem[16]; +#endif }; #ifdef USE_THREADS @@ -1089,6 +1243,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 @@ -1250,7 +1455,7 @@ Gid_t getegid _((void)); if (!(what)) { \ croak("Assertion failed: file \"%s\", line %d", \ __FILE__, __LINE__); \ - exit(1); \ + PerlProc_exit(1); \ }}) #endif @@ -1294,19 +1499,21 @@ 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 @@ -1359,43 +1566,28 @@ typedef Sighandler_t Sigsave_t; # define MALLOC_TERM #endif + /* * These need prototyping here because 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!@" -/****************/ -/* Truly global */ -/****************/ - -/* global state */ -EXT PerlInterpreter * curinterp; /* currently running interpreter */ -#ifdef USE_THREADS -EXT perl_key thr_key; /* For per-thread struct perl_thread* */ -EXT perl_mutex sv_mutex; /* Mutex for allocating SVs in sv.c */ -EXT perl_mutex malloc_mutex; /* Mutex for malloc */ -EXT perl_mutex eval_mutex; /* Mutex for doeval */ -EXT perl_cond eval_cond; /* Condition variable for doeval */ -EXT struct perl_thread * eval_owner; /* Owner thread for doeval */ -EXT int nthreads; /* Number of threads currently */ -EXT perl_mutex threads_mutex; /* Mutex for nthreads and thread list */ -EXT perl_cond nthreads_cond; /* Condition variable for nthreads */ -EXT char * threadsv_names INIT(THREADSV_NAMES); -#ifdef FAKE_THREADS -EXT struct perl_thread * thr; /* Currently executing (fake) thread */ -#endif -#endif /* USE_THREADS */ - /* VMS doesn't use environ array and NeXT has problems with crt0.o globals */ #if !defined(VMS) && !(defined(NeXT) && defined(__DYNAMIC__)) -#if !defined(DONT_DECLARE_STD) || (defined(__svr4__) && defined(__GNUC__) && defined(sun)) || defined(__sgi) +#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 @@ -1407,74 +1599,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 Sighandler_t sighandlerp; - -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 */ - -#ifdef OP_IN_REGISTER -EXT OP * opsave; /* save current op register across longjmps */ -#else -EXT OP * op; /* current op--when not in a global register */ -#endif -EXT int (*runops) _((void)) INIT(RUNOPS_DEFAULT); -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; @@ -1482,12 +1606,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[] @@ -1521,14 +1639,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 }; @@ -1693,70 +1803,6 @@ 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 */ -EXT HV * in_my_stash; /* declared class of this "my" declaration */ -#ifdef FCRYPT -EXT I32 cryptseen; /* has fast crypt() been initialized? */ -#endif - -EXT U32 hints; /* various compilation flags */ /* Note: the lowest 8 bits are reserved for stuffing into op->op_private */ @@ -1768,231 +1814,105 @@ EXT U32 hints; /* various compilation flags */ #define HINT_STRICT_VARS 0x00000400 #define HINT_LOCALE 0x00000800 -EXT bool do_undump; /* -u or dump seen? */ -EXT VOL U32 debug; - -/***********************************************/ -/* Global only to current interpreter instance */ -/***********************************************/ - -#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; - /* 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)) -/* 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 HV * Iglobalstash; /* global keyword overrides imported here */ -IEXT SV * Icurstname; /* name of current package */ -IEXT AV * Ibeginav; /* names of BEGIN subroutines */ -IEXT AV * Iendav; /* names of END subroutines */ -IEXT AV * Iinitav; /* names of INIT 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 PERL_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 */ - -/* stack stuff */ -IEXT AV * Icurstack; /* THE STACK */ -IEXT AV * Imainstack; /* the stack when nothing funny is happening */ - -/* 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; +/* 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; -#ifdef USE_THREADS -/* threads stuff */ -IEXT SV * Ithrsv; /* holds struct perl_thread for main thread */ -#endif /* USE_THREADS */ +/* 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" +}; -#undef IEXT -#undef IINIT +#ifdef PERL_CORE +EXT struct perl_vars Perl_Vars; +EXT struct perl_vars *Perl_VarsPtr INIT(&Perl_Vars); +#else +#if !defined(__GNUC__) || !defined(WIN32) +EXT +#endif +struct perl_vars *Perl_VarsPtr; +#define Perl_Vars (*((Perl_VarsPtr) ? Perl_VarsPtr : (Perl_VarsPtr = Perl_GetVars()))) +#endif +#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 +#ifdef USE_THREADS +/* If we have threads define a struct with all the variables + * that have to be per-thread + */ + + +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" - -START_EXTERN_C #include "proto.h" #ifdef EMBED @@ -2003,9 +1923,59 @@ START_EXTERN_C #define sv_setptrref(rv,ptr) sv_setref_iv(rv,Nullch,(IV)ptr) #endif -END_EXTERN_C +/* 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 var; +#define PERLVARI(var,type,init) EXT type var INIT(init); +#define PERLVARIC(var,type,init) EXTCONST type var INIT(init); + +#ifndef PERL_GLOBAL_STRUCT +#include "perlvars.h" +#endif -/* The following must follow proto.h */ +#ifndef MULTIPLICITY + +#ifndef USE_THREADS +#include "thrdvar.h" +#endif + +#include "intrpvar.h" +#endif + +#ifdef PERL_OBJECT +}; + +#include "objpp.h" +#ifdef DOINIT +#include "INTERN.h" +#else +#include "EXTERN.h" +#endif +#endif /* PERL_OBJECT */ + + +#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 +#endif /* PERL_OBJECT */ +#endif /* WIN32 */ #ifdef DOINIT @@ -2024,7 +1994,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, @@ -2045,13 +2015,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, @@ -2069,7 +2041,7 @@ EXT MGVTBL vtbl_mutex = {0, 0, 0, 0, magic_mutexfree}; EXT MGVTBL vtbl_defelem = {magic_getdefelem,magic_setdefelem, 0, 0, magic_freedefelem}; -EXT MGVTBL vtbl_regexp = {0,0,0,0, magic_freeregexp}; +EXT MGVTBL vtbl_regexp = {0,magic_unchain,0,0, magic_freeregexp}; #ifdef USE_LOCALE_COLLATE EXT MGVTBL vtbl_collxfrm = {0, @@ -2128,8 +2100,6 @@ EXT MGVTBL vtbl_amagicelem; #ifdef OVERLOAD -EXT long amagic_generation; - #define NofAMmeth 58 #ifdef DOINIT EXTCONST char * AMG_names[NofAMmeth] = { @@ -2199,7 +2169,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, @@ -2256,7 +2226,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. */ @@ -2264,6 +2234,8 @@ 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)) @@ -2271,21 +2243,12 @@ enum { #define PERLDB_INTER (perldb && (perldb & PERLDBf_INTER)) #define PERLDB_SUBLINE (perldb && (perldb & PERLDBf_SUBLINE)) #define PERLDB_SINGLE (perldb && (perldb & PERLDBf_SINGLE)) +#define PERLDB_SUB_NN (perldb && (perldb & (PERLDBf_NONAME))) +#define PERLDB_GOTO (perldb && (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) \ @@ -2305,7 +2268,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 @@ -2317,22 +2280,42 @@ EXT bool numeric_local INIT(TRUE); /* Assume local numerics */ #define PERL_SCRIPT_MODE "r" #endif -#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 { \ - MUTEX_LOCK(&sv_mutex); \ + LOCK_SV_MUTEX; \ if (!nice_chunk) { \ nice_chunk = (char*)(chunk); \ nice_chunk_size = (chunk_size); \ } \ - MUTEX_UNLOCK(&sv_mutex); \ + else { \ + Safefree(chunk); \ + } \ + UNLOCK_SV_MUTEX; \ } while (0) -#endif /* Include guard */ +#ifdef HAS_SEM +# include +# include +# 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 +#endif /* Include guard */