This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
PERL_IMPLICIT_SYS also needs thread context for the *alloc success paths.
[perl5.git] / embed.h
diff --git a/embed.h b/embed.h
index 057c986..80457a2 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -43,6 +43,9 @@
 #endif
 #define get_context            Perl_get_context
 #define set_context            Perl_set_context
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define regcurly               Perl_regcurly
+#endif
 #define amagic_call            Perl_amagic_call
 #define Gv_AMupdate            Perl_Gv_AMupdate
 #define gv_handler             Perl_gv_handler
 #define convert                        Perl_convert
 #define create_eval_scope      Perl_create_eval_scope
 #endif
+#define croak_sv               Perl_croak_sv
 #define croak                  Perl_croak
 #define vcroak                 Perl_vcroak
 #define croak_xs_usage         Perl_croak_xs_usage
 #ifdef PERL_CORE
 #define delete_eval_scope      Perl_delete_eval_scope
 #endif
+#define die_sv                 Perl_die_sv
 #define die                    Perl_die
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
-#define vdie                   S_vdie
-#endif
-#endif
-#ifdef PERL_CORE
-#define die_where              Perl_die_where
+#define die_unwind             Perl_die_unwind
 #endif
 #define dounwind               Perl_dounwind
 #ifdef PERL_CORE
 #define gv_fullname4           Perl_gv_fullname4
 #define gv_init                        Perl_gv_init
 #define gv_name_set            Perl_gv_name_set
+#ifdef PERL_CORE
+#define gv_try_downgrade       Perl_gv_try_downgrade
+#endif
 #define gv_stashpv             Perl_gv_stashpv
 #define gv_stashpvn            Perl_gv_stashpvn
 #define gv_stashsv             Perl_gv_stashsv
 #endif
 #endif
 #define hv_undef               Perl_hv_undef
-#define ibcmp                  Perl_ibcmp
-#define ibcmp_locale           Perl_ibcmp_locale
-#define ibcmp_utf8             Perl_ibcmp_utf8
+#define foldEQ                 Perl_foldEQ
+#define foldEQ_locale          Perl_foldEQ_locale
+#define foldEQ_utf8            Perl_foldEQ_utf8
 #if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define ingroup                        S_ingroup
 #define is_utf8_punct          Perl_is_utf8_punct
 #define is_utf8_xdigit         Perl_is_utf8_xdigit
 #define is_utf8_mark           Perl_is_utf8_mark
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define is_utf8_X_begin                Perl_is_utf8_X_begin
+#define is_utf8_X_extend       Perl_is_utf8_X_extend
+#define is_utf8_X_prepend      Perl_is_utf8_X_prepend
+#define is_utf8_X_non_hangul   Perl_is_utf8_X_non_hangul
+#define is_utf8_X_L            Perl_is_utf8_X_L
+#define is_utf8_X_LV           Perl_is_utf8_X_LV
+#define is_utf8_X_LVT          Perl_is_utf8_X_LVT
+#define is_utf8_X_LV_LVT_V     Perl_is_utf8_X_LV_LVT_V
+#define is_utf8_X_T            Perl_is_utf8_X_T
+#define is_utf8_X_V            Perl_is_utf8_X_V
+#endif
 #ifdef PERL_CORE
 #define jmaybe                 Perl_jmaybe
 #define keyword                        Perl_keyword
 #if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define opt_scalarhv           S_opt_scalarhv
+#define is_inplace_av          S_is_inplace_av
 #endif
 #endif
 #define leave_scope            Perl_leave_scope
 #ifdef PERL_CORE
 #define lex_start              Perl_lex_start
 #endif
+#define lex_bufutf8            Perl_lex_bufutf8
+#define lex_grow_linestr       Perl_lex_grow_linestr
+#define lex_stuff_pvn          Perl_lex_stuff_pvn
+#define lex_stuff_sv           Perl_lex_stuff_sv
+#define lex_unstuff            Perl_lex_unstuff
+#define lex_read_to            Perl_lex_read_to
+#define lex_discard_to         Perl_lex_discard_to
+#define lex_next_chunk         Perl_lex_next_chunk
+#define lex_peek_unichar       Perl_lex_peek_unichar
+#define lex_read_unichar       Perl_lex_read_unichar
+#define lex_read_space         Perl_lex_read_space
 #define op_null                        Perl_op_null
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define op_clear               Perl_op_clear
 #endif
 #define looks_like_number      Perl_looks_like_number
 #define grok_bin               Perl_grok_bin
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define grok_bslash_c          Perl_grok_bslash_c
+#endif
 #define grok_hex               Perl_grok_hex
 #define grok_number            Perl_grok_number
 #define grok_numeric_radix     Perl_grok_numeric_radix
 #endif
 #endif
 #define mess                   Perl_mess
+#define mess_sv                        Perl_mess_sv
 #define vmess                  Perl_vmess
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define qerror                 Perl_qerror
 #define new_stackinfo          Perl_new_stackinfo
 #define scan_vstring           Perl_scan_vstring
 #define scan_version           Perl_scan_version
+#define prescan_version                Perl_prescan_version
 #define new_version            Perl_new_version
 #define upg_version            Perl_upg_version
 #define vverify                        Perl_vverify
 #define package_version                Perl_package_version
 #define pad_alloc              Perl_pad_alloc
 #define allocmy                        Perl_allocmy
-#define pad_findmy             Perl_pad_findmy
 #endif
+#define pad_findmy             Perl_pad_findmy
 #define find_rundefsvoffset    Perl_find_rundefsvoffset
+#define find_rundefsv          Perl_find_rundefsv
 #ifdef PERL_CORE
 #define oopsAV                 Perl_oopsAV
 #define oopsHV                 Perl_oopsHV
 #define pad_leavemy            Perl_pad_leavemy
 #endif
+#ifdef DEBUGGING
 #define pad_sv                 Perl_pad_sv
+#endif
 #ifdef PERL_CORE
 #define pad_free               Perl_pad_free
 #endif
 #define pidgone                        S_pidgone
 #endif
 #endif
-#define pmflag                 Perl_pmflag
 #ifdef PERL_CORE
 #define pmruntime              Perl_pmruntime
 #endif
 #endif
 #define sv_2iv_flags           Perl_sv_2iv_flags
 #define sv_2mortal             Perl_sv_2mortal
-#define sv_2nv                 Perl_sv_2nv
+#define sv_2nv_flags           Perl_sv_2nv_flags
 #ifdef PERL_CORE
 #define sv_2num                        Perl_sv_2num
 #endif
 #define sv_compile_2op         Perl_sv_compile_2op
 #define getcwd_sv              Perl_getcwd_sv
 #define sv_dec                 Perl_sv_dec
+#define sv_dec_nomg            Perl_sv_dec_nomg
 #define sv_dump                        Perl_sv_dump
 #define sv_derived_from                Perl_sv_derived_from
 #define sv_does                        Perl_sv_does
 #define sv_gets                        Perl_sv_gets
 #define sv_grow                        Perl_sv_grow
 #define sv_inc                 Perl_sv_inc
+#define sv_inc_nomg            Perl_sv_inc_nomg
 #define sv_insert_flags                Perl_sv_insert_flags
 #define sv_isa                 Perl_sv_isa
 #define sv_isobject            Perl_sv_isobject
 #define sv_newref              Perl_sv_newref
 #define sv_peek                        Perl_sv_peek
 #define sv_pos_u2b             Perl_sv_pos_u2b
+#define sv_pos_u2b_flags       Perl_sv_pos_u2b_flags
 #define sv_pos_b2u             Perl_sv_pos_b2u
 #define sv_pvutf8n_force       Perl_sv_pvutf8n_force
 #define sv_pvbyten_force       Perl_sv_pvbyten_force
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define report_uninit          Perl_report_uninit
 #endif
+#define warn_sv                        Perl_warn_sv
 #define warn                   Perl_warn
 #define vwarn                  Perl_vwarn
 #define warner                 Perl_warner
 #define sv_dup_inc_multiple    S_sv_dup_inc_multiple
 #endif
 #endif
+#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
+#ifdef PERL_CORE
+#define sv_dup_common          S_sv_dup_common
+#endif
+#endif
 #define sv_dup                 Perl_sv_dup
+#define sv_dup_inc             Perl_sv_dup_inc
 #define rvpv_dup               Perl_rvpv_dup
 #define parser_dup             Perl_parser_dup
 #endif
 #ifdef PERL_CORE
 #define save_magic             S_save_magic
 #define magic_methpack         S_magic_methpack
-#define magic_methcall         S_magic_methcall
+#define magic_methcall1                S_magic_methcall1
 #define restore_magic          S_restore_magic
 #define unwind_handler_stack   S_unwind_handler_stack
 #endif
 #define regbranch              S_regbranch
 #define reguni                 S_reguni
 #define regclass               S_regclass
-#define regcurly               S_regcurly
 #define reg_node               S_reg_node
 #define reg_recode             S_reg_recode
 #define regpiece               S_regpiece
 #define check_uni              S_check_uni
 #define force_next             S_force_next
 #define force_version          S_force_version
+#define force_strict_version   S_force_strict_version
 #define force_word             S_force_word
 #define tokeq                  S_tokeq
 #define readpipe_override      S_readpipe_override
 #ifndef PERL_NO_UTF16_FILTER
 #ifdef PERL_CORE
 #define utf16_textfilter       S_utf16_textfilter
+#define add_utf16_textfilter   S_add_utf16_textfilter
 #endif
 #endif
 #ifdef PERL_CORE
 #ifdef PERL_CORE
 #define closest_cop            S_closest_cop
 #define mess_alloc             S_mess_alloc
-#define vdie_croak_common      S_vdie_croak_common
-#define vdie_common            S_vdie_common
+#define with_queued_errors     S_with_queued_errors
+#define invoke_exception_hook  S_invoke_exception_hook
 #define write_no_mem           S_write_no_mem
 #endif
 #if defined(PERL_MEM_LOG) && !defined(PERL_MEM_LOG_NOIMPL)
 #define pad_undef              Perl_pad_undef
 #define pad_add_name           Perl_pad_add_name
 #define pad_add_anon           Perl_pad_add_anon
-#define pad_check_dup          Perl_pad_check_dup
+#endif
+#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT)
+#ifdef PERL_CORE
+#define pad_check_dup          S_pad_check_dup
+#endif
 #endif
 #ifdef DEBUGGING
 #ifdef PERL_CORE
 #define pad_push               Perl_pad_push
 #define pad_compname_type      Perl_pad_compname_type
 #endif
+#if defined(USE_ITHREADS)
+#ifdef PERL_CORE
+#define padlist_dup            Perl_padlist_dup
+#endif
+#endif
 #if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define pad_findlex            S_pad_findlex
+#define pad_add_name_sv                S_pad_add_name_sv
 #endif
 #  if defined(DEBUGGING)
 #ifdef PERL_CORE
 #endif
 #endif
 #define save_set_svflags       Perl_save_set_svflags
+#ifdef DEBUGGING
+#endif
 #define hv_scalar              Perl_hv_scalar
 #define hv_name_set            Perl_hv_name_set
 #if defined(PERL_IN_DUMP_C) || defined(PERL_IN_HV_C) || defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define boot_core_mro          Perl_boot_core_mro
 #endif
+#if defined(USE_ITHREADS)
+#  if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
+#ifdef PERL_CORE
+#define unreferenced_to_tmp_stack      S_unreferenced_to_tmp_stack
+#endif
+#  endif
+#endif
 #define ck_anoncode            Perl_ck_anoncode
 #define ck_bitop               Perl_ck_bitop
 #define ck_chdir               Perl_ck_chdir
 #endif
 #define get_context            Perl_get_context
 #define set_context            Perl_set_context
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define regcurly               Perl_regcurly
+#endif
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#endif
 #define amagic_call(a,b,c,d)   Perl_amagic_call(aTHX_ a,b,c,d)
 #define Gv_AMupdate(a,b)       Perl_Gv_AMupdate(aTHX_ a,b)
 #define gv_handler(a,b)                Perl_gv_handler(aTHX_ a,b)
 #define convert(a,b,c)         Perl_convert(aTHX_ a,b,c)
 #define create_eval_scope(a)   Perl_create_eval_scope(aTHX_ a)
 #endif
+#define croak_sv(a)            Perl_croak_sv(aTHX_ a)
 #define vcroak(a,b)            Perl_vcroak(aTHX_ a,b)
 #define croak_xs_usage(a,b)    Perl_croak_xs_usage(aTHX_ a,b)
 #if defined(PERL_IMPLICIT_CONTEXT)
 #ifdef PERL_CORE
 #define delete_eval_scope()    Perl_delete_eval_scope(aTHX)
 #endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define die_sv(a)              Perl_die_sv(aTHX_ a)
 #ifdef PERL_CORE
-#define vdie(a,b)              S_vdie(aTHX_ a,b)
-#endif
-#endif
-#ifdef PERL_CORE
-#define die_where(a,b)         Perl_die_where(aTHX_ a,b)
+#define die_unwind(a)          Perl_die_unwind(aTHX_ a)
 #endif
 #define dounwind(a)            Perl_dounwind(aTHX_ a)
 #ifdef PERL_CORE
 #endif
 #define gv_init(a,b,c,d,e)     Perl_gv_init(aTHX_ a,b,c,d,e)
 #define gv_name_set(a,b,c,d)   Perl_gv_name_set(aTHX_ a,b,c,d)
+#ifdef PERL_CORE
+#define gv_try_downgrade(a)    Perl_gv_try_downgrade(aTHX_ a)
+#endif
 #define gv_stashpv(a,b)                Perl_gv_stashpv(aTHX_ a,b)
 #define gv_stashpvn(a,b,c)     Perl_gv_stashpvn(aTHX_ a,b,c)
 #define gv_stashsv(a,b)                Perl_gv_stashsv(aTHX_ a,b)
 #endif
 #endif
 #define hv_undef(a)            Perl_hv_undef(aTHX_ a)
-#define ibcmp                  Perl_ibcmp
-#define ibcmp_locale           Perl_ibcmp_locale
-#define ibcmp_utf8(a,b,c,d,e,f,g,h)    Perl_ibcmp_utf8(aTHX_ a,b,c,d,e,f,g,h)
+#define foldEQ                 Perl_foldEQ
+#define foldEQ_locale          Perl_foldEQ_locale
+#define foldEQ_utf8(a,b,c,d,e,f,g,h)   Perl_foldEQ_utf8(aTHX_ a,b,c,d,e,f,g,h)
 #if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define ingroup(a,b)           S_ingroup(aTHX_ a,b)
 #define is_utf8_punct(a)       Perl_is_utf8_punct(aTHX_ a)
 #define is_utf8_xdigit(a)      Perl_is_utf8_xdigit(aTHX_ a)
 #define is_utf8_mark(a)                Perl_is_utf8_mark(aTHX_ a)
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define is_utf8_X_begin(a)     Perl_is_utf8_X_begin(aTHX_ a)
+#define is_utf8_X_extend(a)    Perl_is_utf8_X_extend(aTHX_ a)
+#define is_utf8_X_prepend(a)   Perl_is_utf8_X_prepend(aTHX_ a)
+#define is_utf8_X_non_hangul(a)        Perl_is_utf8_X_non_hangul(aTHX_ a)
+#define is_utf8_X_L(a)         Perl_is_utf8_X_L(aTHX_ a)
+#define is_utf8_X_LV(a)                Perl_is_utf8_X_LV(aTHX_ a)
+#define is_utf8_X_LVT(a)       Perl_is_utf8_X_LVT(aTHX_ a)
+#define is_utf8_X_LV_LVT_V(a)  Perl_is_utf8_X_LV_LVT_V(aTHX_ a)
+#define is_utf8_X_T(a)         Perl_is_utf8_X_T(aTHX_ a)
+#define is_utf8_X_V(a)         Perl_is_utf8_X_V(aTHX_ a)
+#endif
 #ifdef PERL_CORE
 #define jmaybe(a)              Perl_jmaybe(aTHX_ a)
 #define keyword(a,b,c)         Perl_keyword(aTHX_ a,b,c)
 #if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define opt_scalarhv(a)                S_opt_scalarhv(aTHX_ a)
+#define is_inplace_av(a,b)     S_is_inplace_av(aTHX_ a,b)
 #endif
 #endif
 #define leave_scope(a)         Perl_leave_scope(aTHX_ a)
 #ifdef PERL_CORE
 #define lex_start(a,b,c)       Perl_lex_start(aTHX_ a,b,c)
 #endif
+#define lex_bufutf8()          Perl_lex_bufutf8(aTHX)
+#define lex_grow_linestr(a)    Perl_lex_grow_linestr(aTHX_ a)
+#define lex_stuff_pvn(a,b,c)   Perl_lex_stuff_pvn(aTHX_ a,b,c)
+#define lex_stuff_sv(a,b)      Perl_lex_stuff_sv(aTHX_ a,b)
+#define lex_unstuff(a)         Perl_lex_unstuff(aTHX_ a)
+#define lex_read_to(a)         Perl_lex_read_to(aTHX_ a)
+#define lex_discard_to(a)      Perl_lex_discard_to(aTHX_ a)
+#define lex_next_chunk(a)      Perl_lex_next_chunk(aTHX_ a)
+#define lex_peek_unichar(a)    Perl_lex_peek_unichar(aTHX_ a)
+#define lex_read_unichar(a)    Perl_lex_read_unichar(aTHX_ a)
+#define lex_read_space(a)      Perl_lex_read_space(aTHX_ a)
 #define op_null(a)             Perl_op_null(aTHX_ a)
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define op_clear(a)            Perl_op_clear(aTHX_ a)
 #endif
 #define looks_like_number(a)   Perl_looks_like_number(aTHX_ a)
 #define grok_bin(a,b,c,d)      Perl_grok_bin(aTHX_ a,b,c,d)
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define grok_bslash_c(a,b)     Perl_grok_bslash_c(aTHX_ a,b)
+#endif
 #define grok_hex(a,b,c,d)      Perl_grok_hex(aTHX_ a,b,c,d)
 #define grok_number(a,b,c)     Perl_grok_number(aTHX_ a,b,c)
 #define grok_numeric_radix(a,b)        Perl_grok_numeric_radix(aTHX_ a,b)
 #define mem_collxfrm(a,b,c)    Perl_mem_collxfrm(aTHX_ a,b,c)
 #endif
 #endif
+#define mess_sv(a,b)           Perl_mess_sv(aTHX_ a,b)
 #define vmess(a,b)             Perl_vmess(aTHX_ a,b)
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define qerror(a)              Perl_qerror(aTHX_ a)
 #define new_stackinfo(a,b)     Perl_new_stackinfo(aTHX_ a,b)
 #define scan_vstring(a,b,c)    Perl_scan_vstring(aTHX_ a,b,c)
 #define scan_version(a,b,c)    Perl_scan_version(aTHX_ a,b,c)
+#define prescan_version(a,b,c,d,e,f,g) Perl_prescan_version(aTHX_ a,b,c,d,e,f,g)
 #define new_version(a)         Perl_new_version(aTHX_ a)
 #define upg_version(a,b)       Perl_upg_version(aTHX_ a,b)
 #define vverify(a)             Perl_vverify(aTHX_ a)
 #ifdef PERL_CORE
 #define package_version(a)     Perl_package_version(aTHX_ a)
 #define pad_alloc(a,b)         Perl_pad_alloc(aTHX_ a,b)
-#define allocmy(a)             Perl_allocmy(aTHX_ a)
-#define pad_findmy(a)          Perl_pad_findmy(aTHX_ a)
+#define allocmy(a,b,c)         Perl_allocmy(aTHX_ a,b,c)
 #endif
+#define pad_findmy(a,b,c)      Perl_pad_findmy(aTHX_ a,b,c)
 #define find_rundefsvoffset()  Perl_find_rundefsvoffset(aTHX)
+#define find_rundefsv()                Perl_find_rundefsv(aTHX)
 #ifdef PERL_CORE
 #define oopsAV(a)              Perl_oopsAV(aTHX_ a)
 #define oopsHV(a)              Perl_oopsHV(aTHX_ a)
 #define pad_leavemy()          Perl_pad_leavemy(aTHX)
 #endif
+#ifdef DEBUGGING
 #define pad_sv(a)              Perl_pad_sv(aTHX_ a)
+#endif
 #ifdef PERL_CORE
 #define pad_free(a)            Perl_pad_free(aTHX_ a)
 #endif
 #define pidgone(a,b)           S_pidgone(aTHX_ a,b)
 #endif
 #endif
-#define pmflag(a,b)            Perl_pmflag(aTHX_ a,b)
 #ifdef PERL_CORE
 #define pmruntime(a,b,c)       Perl_pmruntime(aTHX_ a,b,c)
 #endif
 #define pregfree(a)            Perl_pregfree(aTHX_ a)
 #define pregfree2(a)           Perl_pregfree2(aTHX_ a)
 #if defined(PERL_CORE) || defined(PERL_EXT)
-#define reg_temp_copy(a)       Perl_reg_temp_copy(aTHX_ a)
+#define reg_temp_copy(a,b)     Perl_reg_temp_copy(aTHX_ a,b)
 #endif
 #define regfree_internal(a)    Perl_regfree_internal(aTHX_ a)
 #if defined(USE_ITHREADS)
 #endif
 #define sv_2iv_flags(a,b)      Perl_sv_2iv_flags(aTHX_ a,b)
 #define sv_2mortal(a)          Perl_sv_2mortal(aTHX_ a)
-#define sv_2nv(a)              Perl_sv_2nv(aTHX_ a)
+#define sv_2nv_flags(a,b)      Perl_sv_2nv_flags(aTHX_ a,b)
 #ifdef PERL_CORE
 #define sv_2num(a)             Perl_sv_2num(aTHX_ a)
 #endif
 #define sv_compile_2op(a,b,c,d)        Perl_sv_compile_2op(aTHX_ a,b,c,d)
 #define getcwd_sv(a)           Perl_getcwd_sv(aTHX_ a)
 #define sv_dec(a)              Perl_sv_dec(aTHX_ a)
+#define sv_dec_nomg(a)         Perl_sv_dec_nomg(aTHX_ a)
 #define sv_dump(a)             Perl_sv_dump(aTHX_ a)
 #define sv_derived_from(a,b)   Perl_sv_derived_from(aTHX_ a,b)
 #define sv_does(a,b)           Perl_sv_does(aTHX_ a,b)
 #define sv_gets(a,b,c)         Perl_sv_gets(aTHX_ a,b,c)
 #define sv_grow(a,b)           Perl_sv_grow(aTHX_ a,b)
 #define sv_inc(a)              Perl_sv_inc(aTHX_ a)
+#define sv_inc_nomg(a)         Perl_sv_inc_nomg(aTHX_ a)
 #define sv_insert_flags(a,b,c,d,e,f)   Perl_sv_insert_flags(aTHX_ a,b,c,d,e,f)
 #define sv_isa(a,b)            Perl_sv_isa(aTHX_ a,b)
 #define sv_isobject(a)         Perl_sv_isobject(aTHX_ a)
 #define sv_newref(a)           Perl_sv_newref(aTHX_ a)
 #define sv_peek(a)             Perl_sv_peek(aTHX_ a)
 #define sv_pos_u2b(a,b,c)      Perl_sv_pos_u2b(aTHX_ a,b,c)
+#define sv_pos_u2b_flags(a,b,c,d)      Perl_sv_pos_u2b_flags(aTHX_ a,b,c,d)
 #define sv_pos_b2u(a,b)                Perl_sv_pos_b2u(aTHX_ a,b)
 #define sv_pvutf8n_force(a,b)  Perl_sv_pvutf8n_force(aTHX_ a,b)
 #define sv_pvbyten_force(a,b)  Perl_sv_pvbyten_force(aTHX_ a,b)
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define report_uninit(a)       Perl_report_uninit(aTHX_ a)
 #endif
+#define warn_sv(a)             Perl_warn_sv(aTHX_ a)
 #define vwarn(a,b)             Perl_vwarn(aTHX_ a,b)
 #define vwarner(a,b,c)         Perl_vwarner(aTHX_ a,b,c)
 #ifdef PERL_CORE
 #endif
 #define whichsig(a)            Perl_whichsig(aTHX_ a)
 #ifdef PERL_CORE
-#define write_to_stderr(a,b)   Perl_write_to_stderr(aTHX_ a,b)
+#define write_to_stderr(a)     Perl_write_to_stderr(aTHX_ a)
 #define yyerror(a)             Perl_yyerror(aTHX_ a)
 #endif
 #if defined(PERL_CORE) || defined(PERL_EXT)
 #define sv_dup_inc_multiple(a,b,c,d)   S_sv_dup_inc_multiple(aTHX_ a,b,c,d)
 #endif
 #endif
+#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
+#ifdef PERL_CORE
+#define sv_dup_common(a,b)     S_sv_dup_common(aTHX_ a,b)
+#endif
+#endif
 #define sv_dup(a,b)            Perl_sv_dup(aTHX_ a,b)
+#define sv_dup_inc(a,b)                Perl_sv_dup_inc(aTHX_ a,b)
 #define rvpv_dup(a,b,c)                Perl_rvpv_dup(aTHX_ a,b,c)
 #define parser_dup(a,b)                Perl_parser_dup(aTHX_ a,b)
 #endif
 #ifdef PERL_CORE
 #define save_magic(a,b)                S_save_magic(aTHX_ a,b)
 #define magic_methpack(a,b,c)  S_magic_methpack(aTHX_ a,b,c)
-#define magic_methcall(a,b,c,d,e,f)    S_magic_methcall(aTHX_ a,b,c,d,e,f)
+#define magic_methcall1(a,b,c,d,e,f)   S_magic_methcall1(aTHX_ a,b,c,d,e,f)
 #define restore_magic(a)       S_restore_magic(aTHX_ a)
 #define unwind_handler_stack(a)        S_unwind_handler_stack(aTHX_ a)
 #endif
 #define regbranch(a,b,c,d)     S_regbranch(aTHX_ a,b,c,d)
 #define reguni(a,b,c)          S_reguni(aTHX_ a,b,c)
 #define regclass(a,b)          S_regclass(aTHX_ a,b)
-#define regcurly               S_regcurly
 #define reg_node(a,b)          S_reg_node(aTHX_ a,b)
 #define reg_recode(a,b)                S_reg_recode(aTHX_ a,b)
 #define regpiece(a,b,c)                S_regpiece(aTHX_ a,b,c)
 #define check_uni()            S_check_uni(aTHX)
 #define force_next(a)          S_force_next(aTHX_ a)
 #define force_version(a,b)     S_force_version(aTHX_ a,b)
+#define force_strict_version(a)        S_force_strict_version(aTHX_ a)
 #define force_word(a,b,c,d,e)  S_force_word(aTHX_ a,b,c,d,e)
 #define tokeq(a)               S_tokeq(aTHX_ a)
 #define readpipe_override()    S_readpipe_override(aTHX)
 #ifndef PERL_NO_UTF16_FILTER
 #ifdef PERL_CORE
 #define utf16_textfilter(a,b,c)        S_utf16_textfilter(aTHX_ a,b,c)
+#define add_utf16_textfilter(a,b)      S_add_utf16_textfilter(aTHX_ a,b)
 #endif
 #endif
 #ifdef PERL_CORE
 #define sublex_done()          S_sublex_done(aTHX)
 #define sublex_push()          S_sublex_push(aTHX)
 #define sublex_start()         S_sublex_start(aTHX)
-#define filter_gets(a,b,c)     S_filter_gets(aTHX_ a,b,c)
+#define filter_gets(a,b)       S_filter_gets(aTHX_ a,b)
 #define find_in_my_stash(a,b)  S_find_in_my_stash(aTHX_ a,b)
 #define tokenize_use(a,b)      S_tokenize_use(aTHX_ a,b)
 #define deprecate_commaless_var_list() S_deprecate_commaless_var_list(aTHX)
 #ifdef PERL_CORE
 #define closest_cop(a,b)       S_closest_cop(aTHX_ a,b)
 #define mess_alloc()           S_mess_alloc(aTHX)
-#define vdie_croak_common(a,b,c,d)     S_vdie_croak_common(aTHX_ a,b,c,d)
-#define vdie_common(a,b,c,d)   S_vdie_common(aTHX_ a,b,c,d)
+#define with_queued_errors(a)  S_with_queued_errors(aTHX_ a)
+#define invoke_exception_hook(a,b)     S_invoke_exception_hook(aTHX_ a,b)
 #define write_no_mem()         S_write_no_mem(aTHX)
 #endif
 #if defined(PERL_MEM_LOG) && !defined(PERL_MEM_LOG_NOIMPL)
 #define pad_undef(a)           Perl_pad_undef(aTHX_ a)
 #define pad_add_name(a,b,c,d,e)        Perl_pad_add_name(aTHX_ a,b,c,d,e)
 #define pad_add_anon(a,b)      Perl_pad_add_anon(aTHX_ a,b)
-#define pad_check_dup(a,b,c)   Perl_pad_check_dup(aTHX_ a,b,c)
+#endif
+#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT)
+#ifdef PERL_CORE
+#define pad_check_dup(a,b,c)   S_pad_check_dup(aTHX_ a,b,c)
+#endif
 #endif
 #ifdef DEBUGGING
 #ifdef PERL_CORE
 #define pad_push(a,b)          Perl_pad_push(aTHX_ a,b)
 #define pad_compname_type(a)   Perl_pad_compname_type(aTHX_ a)
 #endif
+#if defined(USE_ITHREADS)
+#ifdef PERL_CORE
+#define padlist_dup(a,b)       Perl_padlist_dup(aTHX_ a,b)
+#endif
+#endif
 #if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT)
 #ifdef PERL_CORE
 #define pad_findlex(a,b,c,d,e,f,g)     S_pad_findlex(aTHX_ a,b,c,d,e,f,g)
+#define pad_add_name_sv(a,b,c,d)       S_pad_add_name_sv(aTHX_ a,b,c,d)
 #endif
 #  if defined(DEBUGGING)
 #ifdef PERL_CORE
 #endif
 #endif
 #define save_set_svflags(a,b,c)        Perl_save_set_svflags(aTHX_ a,b,c)
+#ifdef DEBUGGING
+#endif
 #define hv_scalar(a)           Perl_hv_scalar(aTHX_ a)
 #define hv_name_set(a,b,c,d)   Perl_hv_name_set(aTHX_ a,b,c,d)
 #ifdef PERL_CORE
 #endif
 #ifdef PERL_CORE
 #endif
+#ifdef PERL_CORE
+#endif
+#if defined(USE_ITHREADS)
+#  if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
+#ifdef PERL_CORE
+#define unreferenced_to_tmp_stack(a)   S_unreferenced_to_tmp_stack(aTHX_ a)
+#endif
+#  endif
+#endif
 #define ck_anoncode(a)         Perl_ck_anoncode(aTHX_ a)
 #define ck_bitop(a)            Perl_ck_bitop(aTHX_ a)
 #define ck_chdir(a)            Perl_ck_chdir(aTHX_ a)