integrate mainline changes

p4raw-id: //depot/utfperl@4679

1 files changed, 126 insertions, 88 deletions

diff --git a/objXSUB.h b/objXSUB.h
index b6064277ee..3e07876d4d 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -34,6 +34,10 @@
 #define PL_LIO			(*Perl_ILIO_ptr(aTHXo))
 #undef  PL_Mem
 #define PL_Mem			(*Perl_IMem_ptr(aTHXo))
+#undef  PL_MemParse
+#define PL_MemParse		(*Perl_IMemParse_ptr(aTHXo))
+#undef  PL_MemShared
+#define PL_MemShared		(*Perl_IMemShared_ptr(aTHXo))
 #undef  PL_Proc
 #define PL_Proc			(*Perl_IProc_ptr(aTHXo))
 #undef  PL_Sock
@@ -42,14 +46,14 @@
 #define PL_StdIO		(*Perl_IStdIO_ptr(aTHXo))
 #undef  PL_amagic_generation
 #define PL_amagic_generation	(*Perl_Iamagic_generation_ptr(aTHXo))
-#undef  PL_ampergv
-#define PL_ampergv		(*Perl_Iampergv_ptr(aTHXo))
 #undef  PL_an
 #define PL_an			(*Perl_Ian_ptr(aTHXo))
 #undef  PL_archpat_auto
 #define PL_archpat_auto		(*Perl_Iarchpat_auto_ptr(aTHXo))
 #undef  PL_argvgv
 #define PL_argvgv		(*Perl_Iargvgv_ptr(aTHXo))
+#undef  PL_argvout_stack
+#define PL_argvout_stack	(*Perl_Iargvout_stack_ptr(aTHXo))
 #undef  PL_argvoutgv
 #define PL_argvoutgv		(*Perl_Iargvoutgv_ptr(aTHXo))
 #undef  PL_basetime
@@ -62,8 +66,6 @@
 #define PL_bufend		(*Perl_Ibufend_ptr(aTHXo))
 #undef  PL_bufptr
 #define PL_bufptr		(*Perl_Ibufptr_ptr(aTHXo))
-#undef  PL_cddir
-#define PL_cddir		(*Perl_Icddir_ptr(aTHXo))
 #undef  PL_collation_ix
 #define PL_collation_ix		(*Perl_Icollation_ix_ptr(aTHXo))
 #undef  PL_collation_name
@@ -106,10 +108,6 @@
 #define PL_curthr		(*Perl_Icurthr_ptr(aTHXo))
 #undef  PL_dbargs
 #define PL_dbargs		(*Perl_Idbargs_ptr(aTHXo))
-#undef  PL_debdelim
-#define PL_debdelim		(*Perl_Idebdelim_ptr(aTHXo))
-#undef  PL_debname
-#define PL_debname		(*Perl_Idebname_ptr(aTHXo))
 #undef  PL_debstash
 #define PL_debstash		(*Perl_Idebstash_ptr(aTHXo))
 #undef  PL_debug
@@ -118,10 +116,6 @@
 #define PL_defgv		(*Perl_Idefgv_ptr(aTHXo))
 #undef  PL_diehook
 #define PL_diehook		(*Perl_Idiehook_ptr(aTHXo))
-#undef  PL_dlevel
-#define PL_dlevel		(*Perl_Idlevel_ptr(aTHXo))
-#undef  PL_dlmax
-#define PL_dlmax		(*Perl_Idlmax_ptr(aTHXo))
 #undef  PL_doextract
 #define PL_doextract		(*Perl_Idoextract_ptr(aTHXo))
 #undef  PL_doswitches
@@ -154,6 +148,8 @@
 #define PL_eval_start		(*Perl_Ieval_start_ptr(aTHXo))
 #undef  PL_evalseq
 #define PL_evalseq		(*Perl_Ievalseq_ptr(aTHXo))
+#undef  PL_exit_flags
+#define PL_exit_flags		(*Perl_Iexit_flags_ptr(aTHXo))
 #undef  PL_exitlist
 #define PL_exitlist		(*Perl_Iexitlist_ptr(aTHXo))
 #undef  PL_exitlistlen
@@ -164,8 +160,6 @@
 #define PL_fdpid		(*Perl_Ifdpid_ptr(aTHXo))
 #undef  PL_filemode
 #define PL_filemode		(*Perl_Ifilemode_ptr(aTHXo))
-#undef  PL_filter_debug
-#define PL_filter_debug		(*Perl_Ifilter_debug_ptr(aTHXo))
 #undef  PL_forkprocess
 #define PL_forkprocess		(*Perl_Iforkprocess_ptr(aTHXo))
 #undef  PL_formfeed
@@ -218,16 +212,10 @@
 #define PL_last_uni		(*Perl_Ilast_uni_ptr(aTHXo))
 #undef  PL_lastfd
 #define PL_lastfd		(*Perl_Ilastfd_ptr(aTHXo))
-#undef  PL_lastsize
-#define PL_lastsize		(*Perl_Ilastsize_ptr(aTHXo))
-#undef  PL_lastspbase
-#define PL_lastspbase		(*Perl_Ilastspbase_ptr(aTHXo))
 #undef  PL_laststatval
 #define PL_laststatval		(*Perl_Ilaststatval_ptr(aTHXo))
 #undef  PL_laststype
 #define PL_laststype		(*Perl_Ilaststype_ptr(aTHXo))
-#undef  PL_leftgv
-#define PL_leftgv		(*Perl_Ileftgv_ptr(aTHXo))
 #undef  PL_lex_brackets
 #define PL_lex_brackets		(*Perl_Ilex_brackets_ptr(aTHXo))
 #undef  PL_lex_brackstack
@@ -242,8 +230,6 @@
 #define PL_lex_dojoin		(*Perl_Ilex_dojoin_ptr(aTHXo))
 #undef  PL_lex_expect
 #define PL_lex_expect		(*Perl_Ilex_expect_ptr(aTHXo))
-#undef  PL_lex_fakebrack
-#define PL_lex_fakebrack	(*Perl_Ilex_fakebrack_ptr(aTHXo))
 #undef  PL_lex_formbrack
 #define PL_lex_formbrack	(*Perl_Ilex_formbrack_ptr(aTHXo))
 #undef  PL_lex_inpat
@@ -308,8 +294,6 @@
 #define PL_multi_start		(*Perl_Imulti_start_ptr(aTHXo))
 #undef  PL_multiline
 #define PL_multiline		(*Perl_Imultiline_ptr(aTHXo))
-#undef  PL_mystrk
-#define PL_mystrk		(*Perl_Imystrk_ptr(aTHXo))
 #undef  PL_nexttoke
 #define PL_nexttoke		(*Perl_Inexttoke_ptr(aTHXo))
 #undef  PL_nexttype
@@ -338,8 +322,6 @@
 #define PL_ofmt			(*Perl_Iofmt_ptr(aTHXo))
 #undef  PL_oldbufptr
 #define PL_oldbufptr		(*Perl_Ioldbufptr_ptr(aTHXo))
-#undef  PL_oldlastpm
-#define PL_oldlastpm		(*Perl_Ioldlastpm_ptr(aTHXo))
 #undef  PL_oldname
 #define PL_oldname		(*Perl_Ioldname_ptr(aTHXo))
 #undef  PL_oldoldbufptr
@@ -388,10 +370,14 @@
 #define PL_preprocess		(*Perl_Ipreprocess_ptr(aTHXo))
 #undef  PL_profiledata
 #define PL_profiledata		(*Perl_Iprofiledata_ptr(aTHXo))
+#undef  PL_psig_name
+#define PL_psig_name		(*Perl_Ipsig_name_ptr(aTHXo))
+#undef  PL_psig_ptr
+#define PL_psig_ptr		(*Perl_Ipsig_ptr_ptr(aTHXo))
+#undef  PL_ptr_table
+#define PL_ptr_table		(*Perl_Iptr_table_ptr(aTHXo))
 #undef  PL_replgv
 #define PL_replgv		(*Perl_Ireplgv_ptr(aTHXo))
-#undef  PL_rightgv
-#define PL_rightgv		(*Perl_Irightgv_ptr(aTHXo))
 #undef  PL_rsfp
 #define PL_rsfp			(*Perl_Irsfp_ptr(aTHXo))
 #undef  PL_rsfp_filters
@@ -400,14 +386,8 @@
 #define PL_runops		(*Perl_Irunops_ptr(aTHXo))
 #undef  PL_sawampersand
 #define PL_sawampersand		(*Perl_Isawampersand_ptr(aTHXo))
-#undef  PL_sawstudy
-#define PL_sawstudy		(*Perl_Isawstudy_ptr(aTHXo))
-#undef  PL_sawvec
-#define PL_sawvec		(*Perl_Isawvec_ptr(aTHXo))
 #undef  PL_sh_path
 #define PL_sh_path		(*Perl_Ish_path_ptr(aTHXo))
-#undef  PL_siggv
-#define PL_siggv		(*Perl_Isiggv_ptr(aTHXo))
 #undef  PL_sighandlerp
 #define PL_sighandlerp		(*Perl_Isighandlerp_ptr(aTHXo))
 #undef  PL_splitstr
@@ -422,8 +402,8 @@
 #define PL_stderrgv		(*Perl_Istderrgv_ptr(aTHXo))
 #undef  PL_stdingv
 #define PL_stdingv		(*Perl_Istdingv_ptr(aTHXo))
-#undef  PL_strchop
-#define PL_strchop		(*Perl_Istrchop_ptr(aTHXo))
+#undef  PL_stopav
+#define PL_stopav		(*Perl_Istopav_ptr(aTHXo))
 #undef  PL_strtab
 #define PL_strtab		(*Perl_Istrtab_ptr(aTHXo))
 #undef  PL_strtab_mutex
@@ -458,8 +438,6 @@
 #define PL_sys_intern		(*Perl_Isys_intern_ptr(aTHXo))
 #undef  PL_tainting
 #define PL_tainting		(*Perl_Itainting_ptr(aTHXo))
-#undef  PL_thisexpr
-#define PL_thisexpr		(*Perl_Ithisexpr_ptr(aTHXo))
 #undef  PL_thr_key
 #define PL_thr_key		(*Perl_Ithr_key_ptr(aTHXo))
 #undef  PL_threadnum
@@ -839,8 +817,20 @@
 
 /* XXX soon to be eliminated, only a few things in PERLCORE need these now */
 
+#if defined(PERL_IMPLICIT_SYS)
+#else
+#endif
+#if defined(USE_ITHREADS)
+#  if defined(PERL_IMPLICIT_SYS)
+#  endif
+#endif
+#if defined(MYMALLOC)
+#endif
 #if defined(PERL_OBJECT)
 #endif
+#if defined(PERL_OBJECT)
+#else
+#endif
 #undef  Perl_amagic_call
 #define Perl_amagic_call	pPerl->Perl_amagic_call
 #undef  amagic_call
@@ -1127,10 +1117,6 @@
 #define Perl_vdeb		pPerl->Perl_vdeb
 #undef  vdeb
 #define vdeb			Perl_vdeb
-#undef  Perl_deb_growlevel
-#define Perl_deb_growlevel	pPerl->Perl_deb_growlevel
-#undef  deb_growlevel
-#define deb_growlevel		Perl_deb_growlevel
 #undef  Perl_debprofdump
 #define Perl_debprofdump	pPerl->Perl_debprofdump
 #undef  debprofdump
@@ -2017,12 +2003,6 @@
 #define Perl_magicname		pPerl->Perl_magicname
 #undef  magicname
 #define magicname		Perl_magicname
-#if defined(MYMALLOC)
-#undef  Perl_malloced_size
-#define Perl_malloced_size	pPerl->Perl_malloced_size
-#undef  malloced_size
-#define malloced_size		Perl_malloced_size
-#endif
 #undef  Perl_markstack_grow
 #define Perl_markstack_grow	pPerl->Perl_markstack_grow
 #undef  markstack_grow
@@ -2297,6 +2277,10 @@
 #define Perl_newLISTOP		pPerl->Perl_newLISTOP
 #undef  newLISTOP
 #define newLISTOP		Perl_newLISTOP
+#undef  Perl_newPADOP
+#define Perl_newPADOP		pPerl->Perl_newPADOP
+#undef  newPADOP
+#define newPADOP		Perl_newPADOP
 #undef  Perl_newPMOP
 #define Perl_newPMOP		pPerl->Perl_newPMOP
 #undef  newPMOP
@@ -2434,36 +2418,23 @@
 #undef  peep
 #define peep			Perl_peep
 #if defined(PERL_OBJECT)
-#undef  perl_construct
-#define perl_construct		pPerl->perl_construct
-#undef  perl_destruct
-#define perl_destruct		pPerl->perl_destruct
-#undef  perl_free
-#define perl_free		pPerl->perl_free
-#undef  perl_run
-#define perl_run		pPerl->perl_run
-#undef  perl_parse
-#define perl_parse		pPerl->perl_parse
-#else
-#undef  perl_alloc
-#define perl_alloc		pPerl->perl_alloc
-#undef  perl_construct
-#define perl_construct		pPerl->perl_construct
-#undef  perl_destruct
-#define perl_destruct		pPerl->perl_destruct
-#undef  perl_free
-#define perl_free		pPerl->perl_free
-#undef  perl_run
-#define perl_run		pPerl->perl_run
-#undef  perl_parse
-#define perl_parse		pPerl->perl_parse
+#undef  Perl_construct
+#define Perl_construct		pPerl->Perl_construct
+#undef  Perl_destruct
+#define Perl_destruct		pPerl->Perl_destruct
+#undef  Perl_free
+#define Perl_free		pPerl->Perl_free
+#undef  Perl_run
+#define Perl_run		pPerl->Perl_run
+#undef  Perl_parse
+#define Perl_parse		pPerl->Perl_parse
+#endif
 #if defined(USE_THREADS)
 #undef  Perl_new_struct_thread
 #define Perl_new_struct_thread	pPerl->Perl_new_struct_thread
 #undef  new_struct_thread
 #define new_struct_thread	Perl_new_struct_thread
 #endif
-#endif
 #undef  Perl_call_atexit
 #define Perl_call_atexit	pPerl->Perl_call_atexit
 #undef  call_atexit
@@ -2754,6 +2725,10 @@
 #define Perl_save_I32		pPerl->Perl_save_I32
 #undef  save_I32
 #define save_I32		Perl_save_I32
+#undef  Perl_save_I8
+#define Perl_save_I8		pPerl->Perl_save_I8
+#undef  save_I8
+#define save_I8			Perl_save_I8
 #undef  Perl_save_int
 #define Perl_save_int		pPerl->Perl_save_int
 #undef  save_int
@@ -2790,6 +2765,10 @@
 #define Perl_save_pptr		pPerl->Perl_save_pptr
 #undef  save_pptr
 #define save_pptr		Perl_save_pptr
+#undef  Perl_save_vptr
+#define Perl_save_vptr		pPerl->Perl_save_vptr
+#undef  save_vptr
+#define save_vptr		Perl_save_vptr
 #undef  Perl_save_re_context
 #define Perl_save_re_context	pPerl->Perl_save_re_context
 #undef  save_re_context
@@ -3306,6 +3285,10 @@
 #define Perl_wait4pid		pPerl->Perl_wait4pid
 #undef  wait4pid
 #define wait4pid		Perl_wait4pid
+#undef  Perl_report_uninit
+#define Perl_report_uninit	pPerl->Perl_report_uninit
+#undef  report_uninit
+#define report_uninit		Perl_report_uninit
 #undef  Perl_warn
 #define Perl_warn		pPerl->Perl_warn
 #undef  warn
@@ -3358,22 +3341,6 @@
 #define Perl_dump_mstats	pPerl->Perl_dump_mstats
 #undef  dump_mstats
 #define dump_mstats		Perl_dump_mstats
-#undef  Perl_malloc
-#define Perl_malloc		pPerl->Perl_malloc
-#undef  malloc
-#define malloc			Perl_malloc
-#undef  Perl_calloc
-#define Perl_calloc		pPerl->Perl_calloc
-#undef  calloc
-#define calloc			Perl_calloc
-#undef  Perl_realloc
-#define Perl_realloc		pPerl->Perl_realloc
-#undef  realloc
-#define realloc			Perl_realloc
-#undef  Perl_mfree
-#define Perl_mfree		pPerl->Perl_mfree
-#undef  mfree
-#define mfree			Perl_mfree
 #endif
 #undef  Perl_safesysmalloc
 #define Perl_safesysmalloc	pPerl->Perl_safesysmalloc
@@ -3603,7 +3570,76 @@
 #define Perl_boot_core_xsutils	pPerl->Perl_boot_core_xsutils
 #undef  boot_core_xsutils
 #define boot_core_xsutils	Perl_boot_core_xsutils
+#if defined(USE_ITHREADS)
+#undef  Perl_cx_dup
+#define Perl_cx_dup		pPerl->Perl_cx_dup
+#undef  cx_dup
+#define cx_dup			Perl_cx_dup
+#undef  Perl_si_dup
+#define Perl_si_dup		pPerl->Perl_si_dup
+#undef  si_dup
+#define si_dup			Perl_si_dup
+#undef  Perl_ss_dup
+#define Perl_ss_dup		pPerl->Perl_ss_dup
+#undef  ss_dup
+#define ss_dup			Perl_ss_dup
+#undef  Perl_any_dup
+#define Perl_any_dup		pPerl->Perl_any_dup
+#undef  any_dup
+#define any_dup			Perl_any_dup
+#undef  Perl_he_dup
+#define Perl_he_dup		pPerl->Perl_he_dup
+#undef  he_dup
+#define he_dup			Perl_he_dup
+#undef  Perl_re_dup
+#define Perl_re_dup		pPerl->Perl_re_dup
+#undef  re_dup
+#define re_dup			Perl_re_dup
+#undef  Perl_fp_dup
+#define Perl_fp_dup		pPerl->Perl_fp_dup
+#undef  fp_dup
+#define fp_dup			Perl_fp_dup
+#undef  Perl_dirp_dup
+#define Perl_dirp_dup		pPerl->Perl_dirp_dup
+#undef  dirp_dup
+#define dirp_dup		Perl_dirp_dup
+#undef  Perl_gp_dup
+#define Perl_gp_dup		pPerl->Perl_gp_dup
+#undef  gp_dup
+#define gp_dup			Perl_gp_dup
+#undef  Perl_mg_dup
+#define Perl_mg_dup		pPerl->Perl_mg_dup
+#undef  mg_dup
+#define mg_dup			Perl_mg_dup
+#undef  Perl_sv_dup
+#define Perl_sv_dup		pPerl->Perl_sv_dup
+#undef  sv_dup
+#define sv_dup			Perl_sv_dup
+#if defined(HAVE_INTERP_INTERN)
+#undef  Perl_sys_intern_dup
+#define Perl_sys_intern_dup	pPerl->Perl_sys_intern_dup
+#undef  sys_intern_dup
+#define sys_intern_dup		Perl_sys_intern_dup
+#endif
+#undef  Perl_ptr_table_new
+#define Perl_ptr_table_new	pPerl->Perl_ptr_table_new
+#undef  ptr_table_new
+#define ptr_table_new		Perl_ptr_table_new
+#undef  Perl_ptr_table_fetch
+#define Perl_ptr_table_fetch	pPerl->Perl_ptr_table_fetch
+#undef  ptr_table_fetch
+#define ptr_table_fetch		Perl_ptr_table_fetch
+#undef  Perl_ptr_table_store
+#define Perl_ptr_table_store	pPerl->Perl_ptr_table_store
+#undef  ptr_table_store
+#define ptr_table_store		Perl_ptr_table_store
+#undef  Perl_ptr_table_split
+#define Perl_ptr_table_split	pPerl->Perl_ptr_table_split
+#undef  ptr_table_split
+#define ptr_table_split		Perl_ptr_table_split
+#endif
 #if defined(PERL_OBJECT)
+#else
 #endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #endif
@@ -3662,6 +3698,8 @@
 #  if defined(LEAKTEST)
 #  endif
 #endif
+#if defined(PERL_OBJECT)
+#endif
 #undef  Perl_ck_anoncode
 #define Perl_ck_anoncode	pPerl->Perl_ck_anoncode
 #undef  ck_anoncode