integrate mainline changes

p4raw-id: //depot/utfperl@4679

1 files changed, 178 insertions, 76 deletions

diff --git a/embed.pl b/embed.pl
index 48fb25745e..8419eea8c8 100755
--- a/embed.pl
+++ b/embed.pl
@@ -31,6 +31,7 @@ sub walk_table (&@) {
     seek DATA, $END, 0;		# so we may restart
     while (<DATA>) {
 	chomp;
+	next if /^:/;
 	while (s|\\$||) {
 	    $_ .= <DATA>;
 	    chomp;
@@ -106,8 +107,7 @@ sub write_protos {
     my $ret = "";
     if (@_ == 1) {
 	my $arg = shift;
-	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifdef|else|endif)\b/
-	    or $arg =~ /^\s*(public|protected|private):/;
+	$ret .= "$arg\n";
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
@@ -116,7 +116,7 @@ sub write_protos {
 	    $func = "S_$func";
 	}
 	else {
-	    $retval = "VIRTUAL $retval";
+	    $retval = "PERL_CALLCONV $retval";
 	    if ($flags =~ /p/) {
 		$func = "Perl_$func";
 	    }
@@ -144,7 +144,7 @@ sub write_global_sym {
     my $ret = "";
     if (@_ > 1) {
 	my ($flags,$retval,$func,@args) = @_;
-	unless ($flags =~ /s/) {
+	unless ($flags =~ /[sx]/) {
 	    $func = "Perl_$func" if $flags =~ /p/;
 	    $ret = "$func\n";
 	}
@@ -422,15 +422,15 @@ walk_table {
     else {
 	my ($flags,$retval,$func,@args) = @_;
 	if ($flags =~ /s/) {
-	    $ret .= hide("S_$func","CPerlObj::S_$func");
+	    $ret .= hide("S_$func","CPerlObj::S_$func") if $flags !~ /j/;
 	    $ret .= hide($func,"S_$func");
 	}
 	elsif ($flags =~ /p/) {
-	    $ret .= hide("Perl_$func","CPerlObj::Perl_$func");
+	    $ret .= hide("Perl_$func","CPerlObj::Perl_$func") if $flags !~ /j/;
 	    $ret .= hide($func,"Perl_$func");
 	}
 	else {
-	    $ret .= hide($func,"CPerlObj::$func");
+	    $ret .= hide($func,"CPerlObj::$func") if $flags !~ /j/;
 	}
     }
     $ret;
@@ -597,7 +597,26 @@ print EM <<'END';
 #  endif	/* USE_THREADS */
 
 #else	/* !MULTIPLICITY */
-/* cases 1, 4 and 6 above */
+
+#  if defined(PERL_OBJECT)
+/* case 6 above */
+
+END
+
+for $sym (sort keys %thread) {
+    print EM multon($sym,'T','aTHXo->interp.');
+}
+
+
+for $sym (sort keys %intrp) {
+    print EM multon($sym,'I','aTHXo->interp.');
+}
+
+print EM <<'END';
+
+#  else	/* !PERL_OBJECT */
+
+/* cases 1 and 4 above */
 
 END
 
@@ -607,7 +626,7 @@ for $sym (sort keys %intrp) {
 
 print EM <<'END';
 
-#  if defined(USE_THREADS)
+#    if defined(USE_THREADS)
 /* case 4 above */
 
 END
@@ -618,8 +637,8 @@ for $sym (sort keys %thread) {
 
 print EM <<'END';
 
-#  else		/* !USE_THREADS */
-/* cases 1 and 6 above */
+#    else	/* !USE_THREADS */
+/* case 1 above */
 
 END
 
@@ -629,7 +648,8 @@ for $sym (sort keys %thread) {
 
 print EM <<'END';
 
-#  endif	/* USE_THREADS */
+#    endif	/* USE_THREADS */
+#  endif	/* PERL_OBJECT */
 #endif	/* MULTIPLICITY */
 
 #if defined(PERL_GLOBAL_STRUCT)
@@ -716,7 +736,7 @@ walk_table {
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
-	unless ($flags =~ /s/) {
+	unless ($flags =~ /[js]/) {
 	    if ($flags =~ /p/) {
 		$ret .= undefine("Perl_$func") . hide("Perl_$func","pPerl->Perl_$func");
 		$ret .= undefine($func) . hide($func,"Perl_$func");
@@ -813,9 +833,9 @@ START_EXTERN_C
 #undef PERLVARI
 #undef PERLVARIC
 #define PERLVAR(v,t)	t* Perl_##v##_ptr(pTHXo)			\
-			{ return &(aTHXo->PL_##v); }
+			{ return &(aTHXo->interp.v); }
 #define PERLVARA(v,n,t)	PL_##v##_t* Perl_##v##_ptr(pTHXo)		\
-			{ return &(aTHXo->PL_##v); }
+			{ return &(aTHXo->interp.v); }
 #define PERLVARI(v,t,i)	PERLVAR(v,t)
 #define PERLVARIC(v,t,i) PERLVAR(v, const t)
 
@@ -928,7 +948,7 @@ walk_table {
     else {
 	my ($flags,$retval,$func,@args) = @_;
 	return $ret if exists $skipapi_funcs{$func};
-	unless ($flags =~ /s/) {
+	unless ($flags =~ /[js]/) {
 	    $ret .= "\n";
 	    my $addctx = 1 if $flags =~ /n/;
 	    if ($flags =~ /p/) {
@@ -965,7 +985,7 @@ Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
     dTHXo;
     va_list(arglist);
     va_start(arglist, format);
-    return (*pPerl->PL_StdIO->pVprintf)(pPerl->PL_StdIO, stream, format, arglist);
+    return (*PL_StdIO->pVprintf)(PL_StdIO, stream, format, arglist);
 }
 
 END_EXTERN_C
@@ -975,33 +995,88 @@ EOT
 
 __END__
 
-# Lines are of the form:
-#    flags|return_type|function_name|arg1|arg2|...|argN
-#
-# A line may be continued on another by ending it with a backslash.
-# Leading and trailing whitespace will be ignored in each component.
-#
-# flags are single letters with following meanings:
-#	s		static function, should have an S_ prefix in source
-#			file
-#	n		has no implicit interpreter/thread context argument
-#	p		function has a Perl_ prefix
-#	r		function never returns
-#       o		has no compatibility macro (#define foo Perl_foo)
-#
-# Individual flags may be separated by whitespace.
-#
-# New global functions should be added at the end for binary compatibility
-# in some configurations.
-#
-# TODO: 1) Add a flag to mark the functions that are part of the public API.
-#       2) Add a field for documentation, so that L<perlguts/"API LISTING">
-#          may be autogenerated.
-#
+: Lines are of the form:
+:    flags|return_type|function_name|arg1|arg2|...|argN
+:
+: A line may be continued on another by ending it with a backslash.
+: Leading and trailing whitespace will be ignored in each component.
+:
+: flags are single letters with following meanings:
+:	s		static function, should have an S_ prefix in source
+:			file
+:	n		has no implicit interpreter/thread context argument
+:	p		function has a Perl_ prefix
+:	r		function never returns
+:       o		has no compatibility macro (#define foo Perl_foo)
+:       j		not a member of CPerlObj
+:       x		not exported
+:
+: Individual flags may be separated by whitespace.
+:
+: New global functions should be added at the end for binary compatibility
+: in some configurations.
+:
+: TODO: 1) Add a flag to mark the functions that are part of the public API.
+:       2) Add a field for documentation, so that L<perlguts/"API LISTING">
+:          may be autogenerated.
+
+START_EXTERN_C
+
+#if defined(PERL_IMPLICIT_SYS)
+jno	|PerlInterpreter*	|perl_alloc_using \
+				|struct IPerlMem* m|struct IPerlMem* ms \
+				|struct IPerlMem* mp|struct IPerlEnv* e \
+				|struct IPerlStdIO* io|struct IPerlLIO* lio \
+				|struct IPerlDir* d|struct IPerlSock* s \
+				|struct IPerlProc* p
+#else
+jno	|PerlInterpreter*	|perl_alloc
+#endif
+jno	|void	|perl_construct	|PerlInterpreter* interp
+jno	|void	|perl_destruct	|PerlInterpreter* interp
+jno	|void	|perl_free	|PerlInterpreter* interp
+jno	|int	|perl_run	|PerlInterpreter* interp
+jno	|int	|perl_parse	|PerlInterpreter* interp|XSINIT_t xsinit \
+				|int argc|char** argv|char** env
+#if defined(USE_ITHREADS)
+jno	|PerlInterpreter*|perl_clone|PerlInterpreter* interp, UV flags
+#  if defined(PERL_IMPLICIT_SYS)
+jno	|PerlInterpreter*|perl_clone_using|PerlInterpreter *interp|UV flags \
+				|struct IPerlMem* m|struct IPerlMem* ms \
+				|struct IPerlMem* mp|struct IPerlEnv* e \
+				|struct IPerlStdIO* io|struct IPerlLIO* lio \
+				|struct IPerlDir* d|struct IPerlSock* s \
+				|struct IPerlProc* p
+#  endif
+#endif
+
+#if defined(MYMALLOC)
+jnop	|Malloc_t|malloc	|MEM_SIZE nbytes
+jnop	|Malloc_t|calloc	|MEM_SIZE elements|MEM_SIZE size
+jnop	|Malloc_t|realloc	|Malloc_t where|MEM_SIZE nbytes
+jnop	|Free_t	|mfree		|Malloc_t where
+jnp	|MEM_SIZE|malloced_size	|void *p
+#endif
 
+END_EXTERN_C
+
+/* functions with flag 'n' should come before here */
 #if defined(PERL_OBJECT)
+class CPerlObj {
 public:
+	struct interpreter interp;
+	CPerlObj(IPerlMem*, IPerlMem*, IPerlMem*, IPerlEnv*, IPerlStdIO*,
+	    IPerlLIO*, IPerlDir*, IPerlSock*, IPerlProc*);
+	void* operator new(size_t nSize, IPerlMem *pvtbl);
+	static void operator delete(void* pPerl, IPerlMem *pvtbl);
+	int do_aspawn (void *vreally, void **vmark, void **vsp);
+#endif
+#if defined(PERL_OBJECT)
+public:
+#else
+START_EXTERN_C
 #endif
+#  include "pp_proto.h"
 p	|SV*	|amagic_call	|SV* left|SV* right|int method|int dir
 p	|bool	|Gv_AMupdate	|HV* stash
 p	|OP*	|append_elem	|I32 optype|OP* head|OP* tail
@@ -1047,7 +1122,7 @@ p	|OP*	|convert	|I32 optype|I32 flags|OP* o
 pr	|void	|croak		|const char* pat|...
 pr	|void	|vcroak		|const char* pat|va_list* args
 #if defined(PERL_IMPLICIT_CONTEXT)
-npr	|void	|croak_nocontext|const char* pat|...
+nrp	|void	|croak_nocontext|const char* pat|...
 np	|OP*	|die_nocontext	|const char* pat|...
 np	|void	|deb_nocontext	|const char* pat|...
 np	|char*	|form_nocontext	|const char* pat|...
@@ -1078,7 +1153,6 @@ p	|PPADDR_t*|get_ppaddr
 p	|I32	|cxinc
 p	|void	|deb		|const char* pat|...
 p	|void	|vdeb		|const char* pat|va_list* args
-p	|void	|deb_growlevel
 p	|void	|debprofdump
 p	|I32	|debop		|OP* o
 p	|I32	|debstack
@@ -1322,9 +1396,6 @@ p	|int	|magic_set_all_env|SV* sv|MAGIC* mg
 p	|U32	|magic_sizepack	|SV* sv|MAGIC* mg
 p	|int	|magic_wipepack	|SV* sv|MAGIC* mg
 p	|void	|magicname	|char* sym|char* name|I32 namlen
-#if defined(MYMALLOC)
-np	|MEM_SIZE|malloced_size	|void *p
-#endif
 p	|void	|markstack_grow
 #if defined(USE_LOCALE_COLLATE)
 p	|char*	|mem_collxfrm	|const char* s|STRLEN len|STRLEN* xlen
@@ -1405,6 +1476,7 @@ p	|HV*	|newHV
 p	|HV*	|newHVhv	|HV* hv
 p	|IO*	|newIO
 p	|OP*	|newLISTOP	|I32 type|I32 flags|OP* first|OP* last
+p	|OP*	|newPADOP	|I32 type|I32 flags|SV* sv
 p	|OP*	|newPMOP	|I32 type|I32 flags
 p	|OP*	|newPVOP	|I32 type|I32 flags|char* pv
 p	|SV*	|newRV		|SV* pref
@@ -1443,24 +1515,16 @@ p	|void	|pad_reset
 p	|void	|pad_swipe	|PADOFFSET po
 p	|void	|peep		|OP* o
 #if defined(PERL_OBJECT)
-no	|void	|perl_construct
-no	|void	|perl_destruct
-no	|void	|perl_free
-no	|int	|perl_run
-no	|int	|perl_parse	|XSINIT_t xsinit \
-				|int argc|char** argv|char** env
-#else
-no	|PerlInterpreter*	|perl_alloc
-no	|void	|perl_construct	|PerlInterpreter* sv_interp
-no	|void	|perl_destruct	|PerlInterpreter* sv_interp
-no	|void	|perl_free	|PerlInterpreter* sv_interp
-no	|int	|perl_run	|PerlInterpreter* sv_interp
-no	|int	|perl_parse	|PerlInterpreter* sv_interp|XSINIT_t xsinit \
+ox	|void	|Perl_construct
+ox	|void	|Perl_destruct
+ox	|void	|Perl_free
+ox	|int	|Perl_run
+ox	|int	|Perl_parse	|XSINIT_t xsinit \
 				|int argc|char** argv|char** env
+#endif
 #if defined(USE_THREADS)
 p	|struct perl_thread*	|new_struct_thread|struct perl_thread *t
 #endif
-#endif
 p	|void	|call_atexit	|ATEXIT_t fn|void *ptr
 p	|I32	|call_argv	|const char* sub_name|I32 flags|char** argv
 p	|I32	|call_method	|const char* methname|I32 flags
@@ -1542,6 +1606,7 @@ p	|void	|save_hints
 p	|void	|save_hptr	|HV** hptr
 p	|void	|save_I16	|I16* intp
 p	|void	|save_I32	|I32* intp
+p	|void	|save_I8	|I8* bytep
 p	|void	|save_int	|int* intp
 p	|void	|save_item	|SV* item
 p	|void	|save_iv	|IV* iv
@@ -1551,6 +1616,7 @@ p	|void	|save_nogv	|GV* gv
 p	|void	|save_op
 p	|SV*	|save_scalar	|GV* gv
 p	|void	|save_pptr	|char** pptr
+p	|void	|save_vptr	|void* pptr
 p	|void	|save_re_context
 p	|void	|save_sptr	|SV** sptr
 p	|SV*	|save_svref	|SV** sptr
@@ -1673,7 +1739,7 @@ p	|SV*	|swash_init	|char* pkg|char* name|SV* listsv \
 				|I32 minbits|I32 none
 p	|UV	|swash_fetch	|SV *sv|U8 *ptr
 p	|void	|taint_env
-p	|void	|taint_proper	|const char* f|char* s
+p	|void	|taint_proper	|const char* f|const char* s
 p	|UV	|to_utf8_lower	|U8 *p
 p	|UV	|to_utf8_upper	|U8 *p
 p	|UV	|to_utf8_title	|U8 *p
@@ -1695,6 +1761,7 @@ p	|U8*	|uv_to_utf8	|U8 *d|UV uv
 p	|void	|vivify_defelem	|SV* sv
 p	|void	|vivify_ref	|SV* sv|U32 to_what
 p	|I32	|wait4pid	|Pid_t pid|int* statusp|int flags
+p	|void	|report_uninit
 p	|void	|warn		|const char* pat|...
 p	|void	|vwarn		|const char* pat|va_list* args
 p	|void	|warner		|U32 err|const char* pat|...
@@ -1711,20 +1778,16 @@ p	|int	|yyparse
 p	|int	|yywarn		|char* s
 #if defined(MYMALLOC)
 p	|void	|dump_mstats	|char* s
-pno	|Malloc_t|malloc	|MEM_SIZE nbytes
-pno	|Malloc_t|calloc	|MEM_SIZE elements|MEM_SIZE size
-pno	|Malloc_t|realloc	|Malloc_t where|MEM_SIZE nbytes
-pno	|Free_t	|mfree		|Malloc_t where
 #endif
-pn	|Malloc_t|safesysmalloc	|MEM_SIZE nbytes
-pn	|Malloc_t|safesyscalloc	|MEM_SIZE elements|MEM_SIZE size
-pn	|Malloc_t|safesysrealloc|Malloc_t where|MEM_SIZE nbytes
-pn	|Free_t	|safesysfree	|Malloc_t where
+np	|Malloc_t|safesysmalloc	|MEM_SIZE nbytes
+np	|Malloc_t|safesyscalloc	|MEM_SIZE elements|MEM_SIZE size
+np	|Malloc_t|safesysrealloc|Malloc_t where|MEM_SIZE nbytes
+np	|Free_t	|safesysfree	|Malloc_t where
 #if defined(LEAKTEST)
-pn	|Malloc_t|safexmalloc	|I32 x|MEM_SIZE size
-pn	|Malloc_t|safexcalloc	|I32 x|MEM_SIZE elements|MEM_SIZE size
-pn	|Malloc_t|safexrealloc	|Malloc_t where|MEM_SIZE size
-pn	|void	|safexfree	|Malloc_t where
+np	|Malloc_t|safexmalloc	|I32 x|MEM_SIZE size
+np	|Malloc_t|safexcalloc	|I32 x|MEM_SIZE elements|MEM_SIZE size
+np	|Malloc_t|safexrealloc	|Malloc_t where|MEM_SIZE size
+np	|void	|safexfree	|Malloc_t where
 #endif
 #if defined(PERL_GLOBAL_STRUCT)
 p	|struct perl_vars *|GetVars
@@ -1782,10 +1845,34 @@ p	|CV*	|newATTRSUB	|I32 floor|OP *o|OP *proto|OP *attrs|OP *block
 p	|void	|newMYSUB	|I32 floor|OP *o|OP *proto|OP *attrs|OP *block
 p	|OP *	|my_attrs	|OP *o|OP *attrs
 p	|void	|boot_core_xsutils
+#if defined(USE_ITHREADS)
+p	|PERL_CONTEXT*|cx_dup	|PERL_CONTEXT* cx|I32 ix|I32 max
+p	|PERL_SI*|si_dup	|PERL_SI* si
+p	|ANY*	|ss_dup		|PerlInterpreter* proto_perl
+p	|void*	|any_dup	|void* v|PerlInterpreter* proto_perl
+p	|HE*	|he_dup		|HE* e|bool shared
+p	|REGEXP*|re_dup		|REGEXP* r
+p	|PerlIO*|fp_dup		|PerlIO* fp|char type
+p	|DIR*	|dirp_dup	|DIR* dp
+p	|GP*	|gp_dup		|GP* gp
+p	|MAGIC*	|mg_dup		|MAGIC* mg
+p	|SV*	|sv_dup		|SV* sstr
+#if defined(HAVE_INTERP_INTERN)
+p	|void	|sys_intern_dup	|struct interp_intern* src \
+				|struct interp_intern* dst
+#endif
+p	|PTR_TBL_t*|ptr_table_new
+p	|void*	|ptr_table_fetch|PTR_TBL_t *tbl|void *sv
+p	|void	|ptr_table_store|PTR_TBL_t *tbl|void *oldsv|void *newsv
+p	|void	|ptr_table_split|PTR_TBL_t *tbl
+#endif
 
 #if defined(PERL_OBJECT)
 protected:
+#else
+END_EXTERN_C
 #endif
+
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 s	|I32	|avhv_index_sv	|SV* sv
 #endif
@@ -1843,6 +1930,7 @@ s	|OP*	|new_logop	|I32 type|I32 flags|OP **firstp|OP **otherp
 s	|void	|simplify_sort	|OP *o
 s	|bool	|is_handle_constructor	|OP *o|I32 argnum
 s	|char*	|gv_ename	|GV *gv
+s	|void	|cv_dump	|CV *cv
 s	|CV*	|cv_clone2	|CV *proto|CV *outside
 s	|bool	|scalar_mod_type|OP *o|I32 type
 s	|OP *	|my_kid		|OP *o|OP *attrs
@@ -1939,7 +2027,16 @@ s	|char*|regwhite	|char *|char *
 s	|char*|nextchar
 s	|regnode*|dumpuntil	|regnode *start|regnode *node \
 				|regnode *last|SV* sv|I32 l
+s	|void	|put_byte	|SV* sv|int c
 s	|void	|scan_commit	|struct scan_data_t *data
+s	|void	|cl_anything	|struct regnode_charclass_class *cl
+s	|int	|cl_is_anything	|struct regnode_charclass_class *cl
+s	|void	|cl_init	|struct regnode_charclass_class *cl
+s	|void	|cl_init_zero	|struct regnode_charclass_class *cl
+s	|void	|cl_and		|struct regnode_charclass_class *cl \
+				|struct regnode_charclass_class *and_with
+s	|void	|cl_or		|struct regnode_charclass_class *cl \
+				|struct regnode_charclass_class *or_with
 s	|I32	|study_chunk	|regnode **scanp|I32 *deltap \
 				|regnode *last|struct scan_data_t *data \
 				|U32 flags
@@ -1954,7 +2051,7 @@ s	|I32	|regmatch	|regnode *prog
 s	|I32	|regrepeat	|regnode *p|I32 max
 s	|I32	|regrepeat_hard	|regnode *p|I32 max|I32 *lp
 s	|I32	|regtry		|regexp *prog|char *startpos
-s	|bool	|reginclass	|char *p|I32 c
+s	|bool	|reginclass	|regnode *p|I32 c
 s	|bool	|reginclassutf8	|regnode *f|U8* p
 s	|CHECKPOINT|regcppush	|I32 parenfloor
 s	|char*|regcppop
@@ -1962,6 +2059,7 @@ s	|char*|regcp_set_to	|I32 ss
 s	|void	|cache_re	|regexp *prog
 s	|U8*	|reghop		|U8 *pos|I32 off
 s	|U8*	|reghopmaybe	|U8 *pos|I32 off
+s	|char*	|find_byclass	|regexp * prog|regnode *c|char *s|char *strend|char *startpos|I32 norun
 #endif
 
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
@@ -2053,7 +2151,7 @@ s	|void	|force_ident	|char *s|int kind
 s	|void	|incline	|char *s
 s	|int	|intuit_method	|char *s|GV *gv
 s	|int	|intuit_more	|char *s
-s	|I32	|lop		|I32 f|expectation x|char *s
+s	|I32	|lop		|I32 f|int x|char *s
 s	|void	|missingterm	|char *s
 s	|void	|no_op		|char *what|char *s
 s	|void	|set_csh
@@ -2061,8 +2159,8 @@ s	|I32	|sublex_done
 s	|I32	|sublex_push
 s	|I32	|sublex_start
 s	|char *	|filter_gets	|SV *sv|PerlIO *fp|STRLEN append
-s	|SV*	|new_constant	|char *s|STRLEN len|char *key|SV *sv \
-				|SV *pv|char *type
+s	|SV*	|new_constant	|char *s|STRLEN len|const char *key|SV *sv \
+				|SV *pv|const char *type
 s	|int	|ao		|int toketype
 s	|void	|depcom
 s	|char*	|incl_perldb
@@ -2086,3 +2184,7 @@ s	|SV*	|mess_alloc
 s	|void	|xstat		|int
 #  endif
 #endif
+
+#if defined(PERL_OBJECT)
+};
+#endif