X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.fnc;h=baa33123e321b6d16bf3cf560a3d298d31f11602;hb=4d5ff0dd951920bb2d1547bff31c06ec7201d40a;hp=b69b792ff481108c745d706372a7e4c69172eb94;hpb=e1f795dc699c88c2d9eb4a46fe629483760393c2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embed.fnc b/embed.fnc
index b69b792..baa3312 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -10,7 +10,8 @@
 :			proto, no #define
 :	d		function has documentation with its source
 :	s		static function, should have an S_ prefix in
-:			source file
+:			source file; for macros (m), suffix the usage
+:			example	with a semicolon
 :	n		has no implicit interpreter/thread context argument
 :	p		function has a Perl_ prefix
 :	f		function takes printf style format string, varargs
@@ -22,6 +23,13 @@
 :	E		visible to extensions included in the Perl core
 :	b		binary backward compatibility; function is a macro
 :			but has also Perl_ implementation (which is exported)
+:	U		suppress usage example in autogenerated documentation
+:	a		allocates memory a la malloc/calloc.  Is also "R".
+:	R		Return value must not be ignored.
+:	P		pure function: no effects except the return value;
+:			return value depends only on parms and/or globals
+:
+: Pointer parameters that must not be passed NULLs should be prefixed with NN.
 :
 : Individual flags may be separated by whitespace.
 :
@@ -39,13 +47,13 @@ Ano	|PerlInterpreter*	|perl_alloc_using \
 				|struct IPerlProc* p
 #endif
 Anod	|PerlInterpreter*	|perl_alloc
-Anod	|void	|perl_construct	|PerlInterpreter* interp
-Anod	|int	|perl_destruct	|PerlInterpreter* interp
-Anod	|void	|perl_free	|PerlInterpreter* interp
-Anod	|int	|perl_run	|PerlInterpreter* interp
+Anod	|void	|perl_construct	|NN PerlInterpreter* interp
+Anod	|int	|perl_destruct	|NN PerlInterpreter* interp
+Anod	|void	|perl_free	|NN PerlInterpreter* interp
+Anod	|int	|perl_run	|NN PerlInterpreter* interp
 Anod	|int	|perl_parse	|PerlInterpreter* interp|XSINIT_t xsinit \
 				|int argc|char** argv|char** env
-Anp	|bool	|doing_taint	|int argc|char** argv|char** env
+AnpR	|bool	|doing_taint	|int argc|char** argv|char** env
 #if defined(USE_ITHREADS)
 Anod	|PerlInterpreter*|perl_clone|PerlInterpreter* interp|UV flags
 #  if defined(PERL_IMPLICIT_SYS)
@@ -58,12 +66,12 @@ Ano	|PerlInterpreter*|perl_clone_using|PerlInterpreter *interp|UV flags \
 #  endif
 #endif
 
-Anop	|Malloc_t|malloc	|MEM_SIZE nbytes
-Anop	|Malloc_t|calloc	|MEM_SIZE elements|MEM_SIZE size
-Anop	|Malloc_t|realloc	|Malloc_t where|MEM_SIZE nbytes
+Aanop	|Malloc_t|malloc	|MEM_SIZE nbytes
+Aanop	|Malloc_t|calloc	|MEM_SIZE elements|MEM_SIZE size
+Aanop	|Malloc_t|realloc	|Malloc_t where|MEM_SIZE nbytes
 Anop	|Free_t	|mfree		|Malloc_t where
 #if defined(MYMALLOC)
-np	|MEM_SIZE|malloced_size	|void *p
+npR	|MEM_SIZE|malloced_size	|void *p
 #endif
 
 Anp	|void*	|get_context
@@ -80,31 +88,32 @@ Ap	|CV*	|gv_handler	|HV* stash|I32 id
 p	|OP*	|append_elem	|I32 optype|OP* head|OP* tail
 p	|OP*	|append_list	|I32 optype|LISTOP* first|LISTOP* last
 p	|I32	|apply		|I32 type|SV** mark|SV** sp
-ApM	|void	|apply_attrs_string|char *stashpv|CV *cv|char *attrstr|STRLEN len
+ApM	|void	|apply_attrs_string|const char *stashpv|CV *cv|const char *attrstr|STRLEN len
 Apd	|void	|av_clear	|AV* ar
-Apd	|SV*	|av_delete	|AV* ar|I32 key|I32 flags
-Apd	|bool	|av_exists	|AV* ar|I32 key
-Apd	|void	|av_extend	|AV* ar|I32 key
-p	|AV*	|av_fake	|I32 size|SV** svp
-Apd	|SV**	|av_fetch	|AV* ar|I32 key|I32 lval
+ApdR	|SV*	|av_delete	|AV* ar|I32 key|I32 flags
+ApdR	|bool	|av_exists	|AV* ar|I32 key
+Apd	|void	|av_extend	|NN AV* ar|I32 key
+pR	|AV*	|av_fake	|I32 size|NN SV** svp
+ApdR	|SV**	|av_fetch	|AV* ar|I32 key|I32 lval
 Apd	|void	|av_fill	|AV* ar|I32 fill
-Apd	|I32	|av_len		|AV* ar
-Apd	|AV*	|av_make	|I32 size|SV** svp
-Apd	|SV*	|av_pop		|AV* ar
+ApdR	|I32	|av_len		|const AV* ar
+ApdR	|AV*	|av_make	|I32 size|NN SV** svp
+ApdR	|SV*	|av_pop		|AV* ar
 Apd	|void	|av_push	|AV* ar|SV* val
 p	|void	|av_reify	|AV* ar
-Apd	|SV*	|av_shift	|AV* ar
+ApdR	|SV*	|av_shift	|AV* ar
 Apd	|SV**	|av_store	|AV* ar|I32 key|SV* val
 Apd	|void	|av_undef	|AV* ar
 Apd	|void	|av_unshift	|AV* ar|I32 num
-p	|OP*	|bind_match	|I32 type|OP* left|OP* pat
-p	|OP*	|block_end	|I32 floor|OP* seq
-Ap	|I32	|block_gimme
-p	|int	|block_start	|int full
+Apo	|SV**	|av_arylen_p	|AV* av
+pR	|OP*	|bind_match	|I32 type|NN OP* left|NN OP* pat
+pR	|OP*	|block_end	|I32 floor|OP* seq
+ApR	|I32	|block_gimme
+pR	|int	|block_start	|int full
 p	|void	|boot_core_UNIVERSAL
 p	|void	|boot_core_PerlIO
-Ap	|void	|call_list	|I32 oldscope|AV* av_list
-p	|bool	|cando		|Mode_t mode|Uid_t effective|Stat_t* statbufp
+Ap	|void	|call_list	|I32 oldscope|NN AV* av_list
+pR	|bool	|cando		|Mode_t mode|Uid_t effective|NN const Stat_t* statbufp
 Ap	|U32	|cast_ulong	|NV f
 Ap	|I32	|cast_i32	|NV f
 Ap	|IV	|cast_iv	|NV f
@@ -132,43 +141,43 @@ Afnp	|void	|sv_setpvf_mg_nocontext|SV* sv|const char* pat|...
 Afnp	|int	|fprintf_nocontext|PerlIO* stream|const char* fmt|...
 Afnp	|int	|printf_nocontext|const char* fmt|...
 #endif
-p	|void	|cv_ckproto	|CV* cv|GV* gv|char* p
-pd	|CV*	|cv_clone	|CV* proto
+p	|void	|cv_ckproto	|NN const CV* cv|const GV* gv|const char* p
+pd	|CV*	|cv_clone	|NN CV* proto
 Apd	|SV*	|cv_const_sv	|CV* cv
-p	|SV*	|op_const_sv	|OP* o|CV* cv
+p	|SV*	|op_const_sv	|const OP* o|CV* cv
 Apd	|void	|cv_undef	|CV* cv
 Ap	|void	|cx_dump	|PERL_CONTEXT* cs
 Ap	|SV*	|filter_add	|filter_t funcp|SV* datasv
 Ap	|void	|filter_del	|filter_t funcp
 Ap	|I32	|filter_read	|int idx|SV* buffer|int maxlen
-Ap	|char**	|get_op_descs
-Ap	|char**	|get_op_names
-p	|char*	|get_no_modify
-p	|U32*	|get_opargs
-Ap	|PPADDR_t*|get_ppaddr
-Ep	|I32	|cxinc
+ApPR	|char**	|get_op_descs
+ApPR	|char**	|get_op_names
+pPR	|const char*	|get_no_modify
+pPR	|U32*	|get_opargs
+ApPR	|PPADDR_t*|get_ppaddr
+EpR	|I32	|cxinc
 Afp	|void	|deb		|const char* pat|...
 Ap	|void	|vdeb		|const char* pat|va_list* args
 Ap	|void	|debprofdump
-Ap	|I32	|debop		|OP* o
+Ap	|I32	|debop		|NN const OP* o
 Ap	|I32	|debstack
 Ap	|I32	|debstackptrs
-Ap	|char*	|delimcpy	|char* to|char* toend|char* from \
-				|char* fromend|int delim|I32* retlen
-p	|void	|deprecate	|char* s
-p	|void	|deprecate_old	|char* s
+Ap	|char*	|delimcpy	|NN char* to|NN const char* toend|NN const char* from \
+				|NN const char* fromend|int delim|NN I32* retlen
+p	|void	|deprecate	|NN const char* s
+p	|void	|deprecate_old	|NN const char* s
 Afp	|OP*	|die		|const char* pat|...
 p	|OP*	|vdie		|const char* pat|va_list* args
-p	|OP*	|die_where	|char* message|STRLEN msglen
+p	|OP*	|die_where	|const char* message|STRLEN msglen
 Ap	|void	|dounwind	|I32 cxix
 p	|bool	|do_aexec	|SV* really|SV** mark|SV** sp
 p	|bool	|do_aexec5	|SV* really|SV** mark|SV** sp|int fd|int flag
-Ap	|int	|do_binmode	|PerlIO *fp|int iotype|int mode
-p	|void	|do_chop	|SV* asv|SV* sv
-Ap	|bool	|do_close	|GV* gv|bool not_implicit
-p	|bool	|do_eof		|GV* gv
-p	|bool	|do_exec	|char* cmd
-#if defined(WIN32)
+Ap	|int	|do_binmode	|NN PerlIO *fp|int iotype|int mode
+p	|void	|do_chop	|NN SV* asv|NN SV* sv
+Ap	|bool	|do_close	|NN GV* gv|bool not_implicit
+p	|bool	|do_eof		|NN GV* gv
+p	|bool	|do_exec	|NN char* cmd
+#if defined(WIN32) || defined(SYMBIAN)
 Ap	|int	|do_aspawn	|SV* really|SV** mark|SV** sp
 Ap	|int	|do_spawn	|char* cmd
 Ap	|int	|do_spawn_nowait|char* cmd
@@ -185,7 +194,7 @@ p	|I32	|do_msgsnd	|SV** mark|SV** sp
 p	|I32	|do_semop	|SV** mark|SV** sp
 p	|I32	|do_shmio	|I32 optype|SV** mark|SV** sp
 #endif
-Ap	|void	|do_join	|SV* sv|SV* del|SV** mark|SV** sp
+Ap	|void	|do_join	|NN SV* sv|NN SV* del|NN SV** mark|NN SV** sp
 p	|OP*	|do_kv
 Ap	|bool	|do_open	|GV* gv|char* name|I32 len|int as_raw \
 				|int rawmode|int rawperm|PerlIO* supplied_fp
@@ -204,8 +213,8 @@ Ap	|void	|do_sprintf	|SV* sv|I32 len|SV** sarg
 p	|Off_t	|do_sysseek	|GV* gv|Off_t pos|int whence
 p	|Off_t	|do_tell	|GV* gv
 p	|I32	|do_trans	|SV* sv
-p	|UV	|do_vecget	|SV* sv|I32 offset|I32 size
-p	|void	|do_vecset	|SV* sv
+p	|UV	|do_vecget	|NN SV* sv|I32 offset|I32 size
+p	|void	|do_vecset	|NN SV* sv
 p	|void	|do_vop		|I32 optype|SV* sv|SV* left|SV* right
 p	|OP*	|dofile		|OP* term
 Ap	|I32	|dowantarray
@@ -214,19 +223,19 @@ Ap	|void	|dump_eval
 #if defined(DUMP_FDS)
 Ap	|void	|dump_fds	|char* s
 #endif
-Ap	|void	|dump_form	|GV* gv
+Ap	|void	|dump_form	|const GV* gv
 Ap	|void	|gv_dump	|GV* gv
-Ap	|void	|op_dump	|OP* arg
+Ap	|void	|op_dump	|const OP* arg
 Ap	|void	|pmop_dump	|PMOP* pm
-Ap	|void	|dump_packsubs	|HV* stash
-Ap	|void	|dump_sub	|GV* gv
+Ap	|void	|dump_packsubs	|const HV* stash
+Ap	|void	|dump_sub	|NN const GV* gv
 Apd	|void	|fbm_compile	|SV* sv|U32 flags
 Apd	|char*	|fbm_instr	|unsigned char* big|unsigned char* bigend \
 				|SV* littlesv|U32 flags
-p	|char*	|find_script	|char *scriptname|bool dosearch \
-				|char **search_ext|I32 flags
-p	|OP*	|force_list	|OP* arg
-p	|OP*	|fold_constants	|OP* arg
+p	|char*	|find_script	|const char *scriptname|bool dosearch \
+				|const char **search_ext|I32 flags
+p	|OP*	|force_list	|NN OP* arg
+p	|OP*	|fold_constants	|NN OP* arg
 Afpd	|char*	|form		|const char* pat|...
 Ap	|char*	|vform		|const char* pat|va_list* args
 Ap	|void	|free_tmps
@@ -239,12 +248,11 @@ Ap	|GP*	|gp_ref		|GP* gp
 Ap	|GV*	|gv_AVadd	|GV* gv
 Ap	|GV*	|gv_HVadd	|GV* gv
 Ap	|GV*	|gv_IOadd	|GV* gv
-Ap	|GV*	|gv_autoload4	|HV* stash|const char* name|STRLEN len \
-				|I32 method
+ApR	|GV*	|gv_autoload4	|HV* stash|NN const char* name|STRLEN len|I32 method
 Ap	|void	|gv_check	|HV* stash
-Ap	|void	|gv_efullname	|SV* sv|GV* gv
-Ap	|void	|gv_efullname3	|SV* sv|GV* gv|const char* prefix
-Ap	|void	|gv_efullname4	|SV* sv|GV* gv|const char* prefix|bool keepmain
+Ap	|void	|gv_efullname	|SV* sv|const GV* gv
+Apmb	|void	|gv_efullname3	|SV* sv|const GV* gv|const char* prefix
+Ap	|void	|gv_efullname4	|SV* sv|const GV* gv|const char* prefix|bool keepmain
 Ap	|GV*	|gv_fetchfile	|const char* name
 Apd	|GV*	|gv_fetchmeth	|HV* stash|const char* name|STRLEN len \
 				|I32 level
@@ -254,13 +262,13 @@ Apd	|GV*	|gv_fetchmethod	|HV* stash|const char* name
 Apd	|GV*	|gv_fetchmethod_autoload|HV* stash|const char* name \
 				|I32 autoload
 Ap	|GV*	|gv_fetchpv	|const char* name|I32 add|I32 sv_type
-Ap	|void	|gv_fullname	|SV* sv|GV* gv
-Ap	|void	|gv_fullname3	|SV* sv|GV* gv|const char* prefix
-Ap	|void	|gv_fullname4	|SV* sv|GV* gv|const char* prefix|bool keepmain
+Ap	|void	|gv_fullname	|SV* sv|const GV* gv
+Apmb	|void	|gv_fullname3	|SV* sv|const GV* gv|const char* prefix
+Ap	|void	|gv_fullname4	|SV* sv|const GV* gv|const char* prefix|bool keepmain
 Ap	|void	|gv_init	|GV* gv|HV* stash|const char* name \
 				|STRLEN len|int multi
 Apd	|HV*	|gv_stashpv	|const char* name|I32 create
-Ap	|HV*	|gv_stashpvn	|const char* name|U32 namelen|I32 create
+Apd	|HV*	|gv_stashpvn	|const char* name|U32 namelen|I32 create
 Apd	|HV*	|gv_stashsv	|SV* sv|I32 create
 Apd	|void	|hv_clear	|HV* tb
 Ap	|void	|hv_delayfree_ent|HV* hv|HE* entry
@@ -270,15 +278,15 @@ Apd	|bool	|hv_exists	|HV* tb|const char* key|I32 klen
 Apd	|bool	|hv_exists_ent	|HV* tb|SV* key|U32 hash
 Apd	|SV**	|hv_fetch	|HV* tb|const char* key|I32 klen|I32 lval
 Apd	|HE*	|hv_fetch_ent	|HV* tb|SV* key|I32 lval|U32 hash
-Ap	|void	|hv_free_ent	|HV* hv|HE* entry
-Apd	|I32	|hv_iterinit	|HV* tb
-Apd	|char*	|hv_iterkey	|HE* entry|I32* retlen
-Apd	|SV*	|hv_iterkeysv	|HE* entry
-Apd	|HE*	|hv_iternext	|HV* tb
-Apd	|SV*	|hv_iternextsv	|HV* hv|char** key|I32* retlen
-ApMd	|HE*	|hv_iternext_flags|HV* tb|I32 flags
-Apd	|SV*	|hv_iterval	|HV* tb|HE* entry
-Ap	|void	|hv_ksplit	|HV* hv|IV newmax
+Ap	|void	|hv_free_ent	|NN HV* hv|HE* entry
+Apd	|I32	|hv_iterinit	|NN HV* tb
+ApdR	|char*	|hv_iterkey	|NN HE* entry|NN I32* retlen
+ApdR	|SV*	|hv_iterkeysv	|NN HE* entry
+ApdR	|HE*	|hv_iternext	|NN HV* tb
+ApdR	|SV*	|hv_iternextsv	|NN HV* hv|NN char** key|NN I32* retlen
+ApMdR	|HE*	|hv_iternext_flags|NN HV* tb|I32 flags
+ApdR	|SV*	|hv_iterval	|NN HV* tb|NN HE* entry
+Ap	|void	|hv_ksplit	|NN HV* hv|IV newmax
 Apd	|void	|hv_magic	|HV* hv|GV* gv|int how
 Apd	|SV**	|hv_store	|HV* tb|const char* key|I32 klen|SV* val \
 				|U32 hash
@@ -286,93 +294,96 @@ Apd	|HE*	|hv_store_ent	|HV* tb|SV* key|SV* val|U32 hash
 ApM	|SV**	|hv_store_flags	|HV* tb|const char* key|I32 klen|SV* val \
 				|U32 hash|int flags
 Apd	|void	|hv_undef	|HV* tb
-Ap	|I32	|ibcmp		|const char* a|const char* b|I32 len
-Ap	|I32	|ibcmp_locale	|const char* a|const char* b|I32 len
-Apd	|I32	|ibcmp_utf8	|const char* a|char **pe1|UV l1|bool u1|const char* b|char **pe2|UV l2|bool u2
-p	|bool	|ingroup	|Gid_t testgid|Uid_t effective
-p	|void	|init_argv_symbols|int|char **
+ApP	|I32	|ibcmp		|NN const char* a|NN const char* b|I32 len
+ApP	|I32	|ibcmp_locale	|NN const char* a|NN const char* b|I32 len
+Apd	|I32	|ibcmp_utf8	|NN const char* a|char **pe1|UV l1|bool u1|NN const char* b|char **pe2|UV l2|bool u2
+pR	|bool	|ingroup	|Gid_t testgid|Uid_t effective
+p	|void	|init_argv_symbols|int argc|NN char **argv
 p	|void	|init_debugger
 Ap	|void	|init_stacks
 Ap	|void	|init_tm	|struct tm *ptm
 pd	|U32	|intro_my
-Ap	|char*	|instr		|const char* big|const char* little
-p	|bool	|io_close	|IO* io|bool not_implicit
-p	|OP*	|invert		|OP* cmd
-dp	|bool	|is_gv_magical	|char *name|STRLEN len|U32 flags
-Ap	|I32	|is_lvalue_sub
-Ap	|U32	|to_uni_upper_lc|U32 c
-Ap	|U32	|to_uni_title_lc|U32 c
-Ap	|U32	|to_uni_lower_lc|U32 c
-Ap	|bool	|is_uni_alnum	|UV c
-Ap	|bool	|is_uni_alnumc	|UV c
-Ap	|bool	|is_uni_idfirst	|UV c
-Ap	|bool	|is_uni_alpha	|UV c
-Ap	|bool	|is_uni_ascii	|UV c
-Ap	|bool	|is_uni_space	|UV c
-Ap	|bool	|is_uni_cntrl	|UV c
-Ap	|bool	|is_uni_graph	|UV c
-Ap	|bool	|is_uni_digit	|UV c
-Ap	|bool	|is_uni_upper	|UV c
-Ap	|bool	|is_uni_lower	|UV c
-Ap	|bool	|is_uni_print	|UV c
-Ap	|bool	|is_uni_punct	|UV c
-Ap	|bool	|is_uni_xdigit	|UV c
-Ap	|UV	|to_uni_upper	|UV c|U8 *p|STRLEN *lenp
-Ap	|UV	|to_uni_title	|UV c|U8 *p|STRLEN *lenp
-Ap	|UV	|to_uni_lower	|UV c|U8 *p|STRLEN *lenp
-Ap	|UV	|to_uni_fold	|UV c|U8 *p|STRLEN *lenp
-Ap	|bool	|is_uni_alnum_lc|UV c
-Ap	|bool	|is_uni_alnumc_lc|UV c
-Ap	|bool	|is_uni_idfirst_lc|UV c
-Ap	|bool	|is_uni_alpha_lc|UV c
-Ap	|bool	|is_uni_ascii_lc|UV c
-Ap	|bool	|is_uni_space_lc|UV c
-Ap	|bool	|is_uni_cntrl_lc|UV c
-Ap	|bool	|is_uni_graph_lc|UV c
-Ap	|bool	|is_uni_digit_lc|UV c
-Ap	|bool	|is_uni_upper_lc|UV c
-Ap	|bool	|is_uni_lower_lc|UV c
-Ap	|bool	|is_uni_print_lc|UV c
-Ap	|bool	|is_uni_punct_lc|UV c
-Ap	|bool	|is_uni_xdigit_lc|UV c
-Apd	|STRLEN	|is_utf8_char	|U8 *p
-Apd	|bool	|is_utf8_string	|U8 *s|STRLEN len
-Apd	|bool	|is_utf8_string_loc|U8 *s|STRLEN len|U8 **p
-Ap	|bool	|is_utf8_alnum	|U8 *p
-Ap	|bool	|is_utf8_alnumc	|U8 *p
-Ap	|bool	|is_utf8_idfirst|U8 *p
-Ap	|bool	|is_utf8_idcont	|U8 *p
-Ap	|bool	|is_utf8_alpha	|U8 *p
-Ap	|bool	|is_utf8_ascii	|U8 *p
-Ap	|bool	|is_utf8_space	|U8 *p
-Ap	|bool	|is_utf8_cntrl	|U8 *p
-Ap	|bool	|is_utf8_digit	|U8 *p
-Ap	|bool	|is_utf8_graph	|U8 *p
-Ap	|bool	|is_utf8_upper	|U8 *p
-Ap	|bool	|is_utf8_lower	|U8 *p
-Ap	|bool	|is_utf8_print	|U8 *p
-Ap	|bool	|is_utf8_punct	|U8 *p
-Ap	|bool	|is_utf8_xdigit	|U8 *p
-Ap	|bool	|is_utf8_mark	|U8 *p
-p	|OP*	|jmaybe		|OP* arg
-p	|I32	|keyword	|char* d|I32 len
+ApPR	|char*	|instr		|NN const char* big|NN const char* little
+pR	|bool	|io_close	|NN IO* io|bool not_implicit
+pR	|OP*	|invert		|OP* cmd
+dpR	|bool	|is_gv_magical	|const char *name|STRLEN len|U32 flags
+ApR	|I32	|is_lvalue_sub
+ApPR	|U32	|to_uni_upper_lc|U32 c
+ApPR	|U32	|to_uni_title_lc|U32 c
+ApPR	|U32	|to_uni_lower_lc|U32 c
+ApPR	|bool	|is_uni_alnum	|UV c
+ApPR	|bool	|is_uni_alnumc	|UV c
+ApPR	|bool	|is_uni_idfirst	|UV c
+ApPR	|bool	|is_uni_alpha	|UV c
+ApPR	|bool	|is_uni_ascii	|UV c
+ApPR	|bool	|is_uni_space	|UV c
+ApPR	|bool	|is_uni_cntrl	|UV c
+ApPR	|bool	|is_uni_graph	|UV c
+ApPR	|bool	|is_uni_digit	|UV c
+ApPR	|bool	|is_uni_upper	|UV c
+ApPR	|bool	|is_uni_lower	|UV c
+ApPR	|bool	|is_uni_print	|UV c
+ApPR	|bool	|is_uni_punct	|UV c
+ApPR	|bool	|is_uni_xdigit	|UV c
+Ap	|UV	|to_uni_upper	|UV c|NN U8 *p|NN STRLEN *lenp
+Ap	|UV	|to_uni_title	|UV c|NN U8 *p|NN STRLEN *lenp
+Ap	|UV	|to_uni_lower	|UV c|NN U8 *p|NN STRLEN *lenp
+Ap	|UV	|to_uni_fold	|UV c|NN U8 *p|NN STRLEN *lenp
+ApPR	|bool	|is_uni_alnum_lc|UV c
+ApPR	|bool	|is_uni_alnumc_lc|UV c
+ApPR	|bool	|is_uni_idfirst_lc|UV c
+ApPR	|bool	|is_uni_alpha_lc|UV c
+ApPR	|bool	|is_uni_ascii_lc|UV c
+ApPR	|bool	|is_uni_space_lc|UV c
+ApPR	|bool	|is_uni_cntrl_lc|UV c
+ApPR	|bool	|is_uni_graph_lc|UV c
+ApPR	|bool	|is_uni_digit_lc|UV c
+ApPR	|bool	|is_uni_upper_lc|UV c
+ApPR	|bool	|is_uni_lower_lc|UV c
+ApPR	|bool	|is_uni_print_lc|UV c
+ApPR	|bool	|is_uni_punct_lc|UV c
+ApPR	|bool	|is_uni_xdigit_lc|UV c
+Apd	|STRLEN	|is_utf8_char	|NN const U8 *p
+Apd	|bool	|is_utf8_string	|NN const U8 *s|STRLEN len
+Apd	|bool	|is_utf8_string_loc|NN const U8 *s|STRLEN len|const U8 **p
+Apd	|bool	|is_utf8_string_loclen|NN const U8 *s|STRLEN len|const U8 **ep|STRLEN *el
+ApR	|bool	|is_utf8_alnum	|NN const U8 *p
+ApR	|bool	|is_utf8_alnumc	|NN const U8 *p
+ApR	|bool	|is_utf8_idfirst|NN const U8 *p
+ApR	|bool	|is_utf8_idcont	|NN const U8 *p
+ApR	|bool	|is_utf8_alpha	|NN const U8 *p
+ApR	|bool	|is_utf8_ascii	|NN const U8 *p
+ApR	|bool	|is_utf8_space	|NN const U8 *p
+ApR	|bool	|is_utf8_cntrl	|NN const U8 *p
+ApR	|bool	|is_utf8_digit	|NN const U8 *p
+ApR	|bool	|is_utf8_graph	|NN const U8 *p
+ApR	|bool	|is_utf8_upper	|NN const U8 *p
+ApR	|bool	|is_utf8_lower	|NN const U8 *p
+ApR	|bool	|is_utf8_print	|NN const U8 *p
+ApR	|bool	|is_utf8_punct	|NN const U8 *p
+ApR	|bool	|is_utf8_xdigit	|NN const U8 *p
+ApR	|bool	|is_utf8_mark	|NN const U8 *p
+p	|OP*	|jmaybe		|NN OP* arg
+pP	|I32	|keyword	|NN const char* d|I32 len
 Ap	|void	|leave_scope	|I32 base
 p	|void	|lex_end
 p	|void	|lex_start	|SV* line
-Ap |void   |op_null    |OP* o
+Ap	|void	|op_null	|OP* o
 p	|void	|op_clear	|OP* o
+Ap	|void	|op_refcnt_lock
+Ap	|void	|op_refcnt_unlock
 p	|OP*	|linklist	|OP* o
 p	|OP*	|list		|OP* o
 p	|OP*	|listkids	|OP* o
 Apd	|void	|load_module|U32 flags|SV* name|SV* ver|...
 Ap	|void	|vload_module|U32 flags|SV* name|SV* ver|va_list* args
 p	|OP*	|localize	|OP* arg|I32 lexical
-Apd	|I32	|looks_like_number|SV* sv
-Apd	|UV	|grok_bin	|char* start|STRLEN* len|I32* flags|NV *result
-Apd	|UV	|grok_hex	|char* start|STRLEN* len|I32* flags|NV *result
-Apd	|int	|grok_number	|const char *pv|STRLEN len|UV *valuep
+ApdR	|I32	|looks_like_number|NN SV* sv
+Apd	|UV	|grok_bin	|NN const char* start|NN STRLEN* len_p|NN I32* flags|NV *result
+Apd	|UV	|grok_hex	|NN const char* start|NN STRLEN* len_p|NN I32* flags|NV *result
+Apd	|int	|grok_number	|NN const char *pv|STRLEN len|UV *valuep
 Apd	|bool	|grok_numeric_radix|const char **sp|const char *send
-Apd	|UV	|grok_oct	|char* start|STRLEN* len|I32* flags|NV *result
+Apd	|UV	|grok_oct	|const char* start|STRLEN* len_p|I32* flags|NV *result
 p	|int	|magic_clearenv	|SV* sv|MAGIC* mg
 p	|int	|magic_clear_all_env|SV* sv|MAGIC* mg
 p	|int	|magic_clearpack|SV* sv|MAGIC* mg
@@ -396,15 +407,13 @@ p	|U32	|magic_len	|SV* sv|MAGIC* mg
 p	|int	|magic_nextpack	|SV* sv|MAGIC* mg|SV* key
 p	|U32	|magic_regdata_cnt|SV* sv|MAGIC* mg
 p	|int	|magic_regdatum_get|SV* sv|MAGIC* mg
-p	|int	|magic_regdatum_set|SV* sv|MAGIC* mg
+pr	|int	|magic_regdatum_set|SV* sv|MAGIC* mg
 p	|int	|magic_set	|SV* sv|MAGIC* mg
 p	|int	|magic_setamagic|SV* sv|MAGIC* mg
 p	|int	|magic_setarylen|SV* sv|MAGIC* mg
+p	|int	|magic_freearylen_p|SV* sv|MAGIC* mg
 p	|int	|magic_setbm	|SV* sv|MAGIC* mg
 p	|int	|magic_setdbline|SV* sv|MAGIC* mg
-#if defined(USE_LOCALE_COLLATE)
-p	|int	|magic_setcollxfrm|SV* sv|MAGIC* mg
-#endif
 p	|int	|magic_setdefelem|SV* sv|MAGIC* mg
 p	|int	|magic_setenv	|SV* sv|MAGIC* mg
 p	|int	|magic_setfm	|SV* sv|MAGIC* mg
@@ -424,9 +433,10 @@ p	|int	|magic_setutf8	|SV* sv|MAGIC* mg
 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
+p	|void	|magicname	|const char* sym|const char* name|I32 namlen
 Ap	|void	|markstack_grow
 #if defined(USE_LOCALE_COLLATE)
+p	|int	|magic_setcollxfrm|SV* sv|MAGIC* mg
 p	|char*	|mem_collxfrm	|const char* s|STRLEN len|STRLEN* xlen
 #endif
 Afp	|SV*	|mess		|const char* pat|...
@@ -435,7 +445,7 @@ p	|void	|qerror		|SV* err
 Apd     |void   |sortsv         |SV ** array|size_t num_elts|SVCOMPARE_t cmp
 Apd	|int	|mg_clear	|SV* sv
 Apd	|int	|mg_copy	|SV* sv|SV* nsv|const char* key|I32 klen
-Apd	|MAGIC*	|mg_find	|SV* sv|int type
+Apd	|MAGIC*	|mg_find	|const SV* sv|int type
 Apd	|int	|mg_free	|SV* sv
 Apd	|int	|mg_get		|SV* sv
 Apd	|U32	|mg_length	|SV* sv
@@ -446,13 +456,13 @@ Ap	|void	|mini_mktime	|struct tm *pm
 p	|OP*	|mod		|OP* o|I32 type
 p	|int	|mode_from_discipline|SV* discp
 Ap	|char*	|moreswitches	|char* s
-p	|OP*	|my		|OP* o
-Ap	|NV	|my_atof	|const char *s
+p	|OP*	|my		|NN OP* o
+Ap	|NV	|my_atof	|NN const char *s
 #if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
-Anp	|char*	|my_bcopy	|const char* from|char* to|I32 len
+Anp	|char*	|my_bcopy	|NN const char* from|NN char* to|I32 len
 #endif
 #if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
-Anp	|char*	|my_bzero	|char* loc|I32 len
+Anp	|char*	|my_bzero	|NN char* loc|I32 len
 #endif
 Apr	|void	|my_exit	|U32 status
 Apr	|void	|my_failure_exit
@@ -462,98 +472,99 @@ Anp	|void	|atfork_lock
 Anp	|void	|atfork_unlock
 Ap	|I32	|my_lstat
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
-Anp	|I32	|my_memcmp	|const char* s1|const char* s2|I32 len
+AnpP	|I32	|my_memcmp	|NN const char* s1|NN const char* s2|I32 len
 #endif
 #if !defined(HAS_MEMSET)
-Anp	|void*	|my_memset	|char* loc|I32 ch|I32 len
+Anp	|void*	|my_memset	|NN char* loc|I32 ch|I32 len
 #endif
 Ap	|I32	|my_pclose	|PerlIO* ptr
 Ap	|PerlIO*|my_popen	|char* cmd|char* mode
 Ap	|PerlIO*|my_popen_list	|char* mode|int n|SV ** args
-Ap	|void	|my_setenv	|char* nam|char* val
+Ap	|void	|my_setenv	|const char* nam|const char* val
 Ap	|I32	|my_stat
-Ap	|char *	|my_strftime	|char *fmt|int sec|int min|int hour|int mday|int mon|int year|int wday|int yday|int isdst
+Ap	|char *	|my_strftime	|const char *fmt|int sec|int min|int hour|int mday|int mon|int year|int wday|int yday|int isdst
 #if defined(MYSWAP)
-Ap	|short	|my_swap	|short s
-Ap	|long	|my_htonl	|long l
-Ap	|long	|my_ntohl	|long l
+ApPa	|short	|my_swap	|short s
+ApPa	|long	|my_htonl	|long l
+ApPa	|long	|my_ntohl	|long l
 #endif
 p	|void	|my_unexec
-Ap	|OP*	|newANONLIST	|OP* o
-Ap	|OP*	|newANONHASH	|OP* o
+Apa	|OP*	|newANONLIST	|OP* o
+Apa	|OP*	|newANONHASH	|OP* o
 Ap	|OP*	|newANONSUB	|I32 floor|OP* proto|OP* block
-Ap	|OP*	|newASSIGNOP	|I32 flags|OP* left|I32 optype|OP* right
-Ap	|OP*	|newCONDOP	|I32 flags|OP* expr|OP* trueop|OP* falseop
-Apd	|CV*	|newCONSTSUB	|HV* stash|char* name|SV* sv
+Apa	|OP*	|newASSIGNOP	|I32 flags|OP* left|I32 optype|OP* right
+Apa	|OP*	|newCONDOP	|I32 flags|OP* expr|OP* trueop|OP* falseop
+Apd	|CV*	|newCONSTSUB	|HV* stash|const char* name|SV* sv
 Ap	|void	|newFORM	|I32 floor|OP* o|OP* block
-Ap	|OP*	|newFOROP	|I32 flags|char* label|line_t forline \
+Apa	|OP*	|newFOROP	|I32 flags|char* label|line_t forline \
 				|OP* sclr|OP* expr|OP*block|OP*cont
-Ap	|OP*	|newLOGOP	|I32 optype|I32 flags|OP* left|OP* right
-Ap	|OP*	|newLOOPEX	|I32 type|OP* label
-Ap	|OP*	|newLOOPOP	|I32 flags|I32 debuggable|OP* expr|OP* block
-Ap	|OP*	|newNULLLIST
-Ap	|OP*	|newOP		|I32 optype|I32 flags
-Ap	|void	|newPROG	|OP* o
-Ap	|OP*	|newRANGE	|I32 flags|OP* left|OP* right
-Ap	|OP*	|newSLICEOP	|I32 flags|OP* subscript|OP* listop
-Ap	|OP*	|newSTATEOP	|I32 flags|char* label|OP* o
+Apa	|OP*	|newLOGOP	|I32 optype|I32 flags|OP* left|OP* right
+Apa	|OP*	|newLOOPEX	|I32 type|OP* label
+Apa	|OP*	|newLOOPOP	|I32 flags|I32 debuggable|OP* expr|OP* block
+Apa	|OP*	|newNULLLIST
+Apa	|OP*	|newOP		|I32 optype|I32 flags
+Ap	|void	|newPROG	|NN OP* o
+Apa	|OP*	|newRANGE	|I32 flags|OP* left|OP* right
+Apa	|OP*	|newSLICEOP	|I32 flags|OP* subscript|OP* listop
+Apa	|OP*	|newSTATEOP	|I32 flags|char* label|OP* o
 Ap	|CV*	|newSUB		|I32 floor|OP* o|OP* proto|OP* block
-Apd	|CV*	|newXS		|char* name|XSUBADDR_t f|char* filename
-Apd	|AV*	|newAV
-Ap	|OP*	|newAVREF	|OP* o
-Ap	|OP*	|newBINOP	|I32 type|I32 flags|OP* first|OP* last
-Ap	|OP*	|newCVREF	|I32 flags|OP* o
-Ap	|OP*	|newGVOP	|I32 type|I32 flags|GV* gv
-Ap	|GV*	|newGVgen	|char* pack
-Ap	|OP*	|newGVREF	|I32 type|OP* o
-Ap	|OP*	|newHVREF	|OP* o
-Apd	|HV*	|newHV
-Ap	|HV*	|newHVhv	|HV* hv
-Ap	|IO*	|newIO
-Ap	|OP*	|newLISTOP	|I32 type|I32 flags|OP* first|OP* last
-Ap	|OP*	|newPADOP	|I32 type|I32 flags|SV* sv
-Ap	|OP*	|newPMOP	|I32 type|I32 flags
-Ap	|OP*	|newPVOP	|I32 type|I32 flags|char* pv
-Ap	|SV*	|newRV		|SV* pref
-Apd	|SV*	|newRV_noinc	|SV *sv
-Apd	|SV*	|newSV		|STRLEN len
-Ap	|OP*	|newSVREF	|OP* o
-Ap	|OP*	|newSVOP	|I32 type|I32 flags|SV* sv
-Apd	|SV*	|newSViv	|IV i
-Apd	|SV*	|newSVuv	|UV u
-Apd	|SV*	|newSVnv	|NV n
-Apd	|SV*	|newSVpv	|const char* s|STRLEN len
-Apd	|SV*	|newSVpvn	|const char* s|STRLEN len
-Apd	|SV*	|newSVpvn_share	|const char* s|I32 len|U32 hash
-Afpd	|SV*	|newSVpvf	|const char* pat|...
+Apd	|CV*	|newXS		|NN const char* name|XSUBADDR_t f|NN const char* filename
+Apda	|AV*	|newAV
+Apa	|OP*	|newAVREF	|NN OP* o
+Apa	|OP*	|newBINOP	|I32 type|I32 flags|OP* first|OP* last
+Apa	|OP*	|newCVREF	|I32 flags|OP* o
+Apa	|OP*	|newGVOP	|I32 type|I32 flags|GV* gv
+Apa	|GV*	|newGVgen	|const char* pack
+Apa	|OP*	|newGVREF	|I32 type|OP* o
+ApaR	|OP*	|newHVREF	|NN OP* o
+ApdaR	|HV*	|newHV
+ApaR	|HV*	|newHVhv	|HV* hv
+Apa	|IO*	|newIO
+Apa	|OP*	|newLISTOP	|I32 type|I32 flags|OP* first|OP* last
+Apa	|OP*	|newPADOP	|I32 type|I32 flags|SV* sv
+Apa	|OP*	|newPMOP	|I32 type|I32 flags
+Apa	|OP*	|newPVOP	|I32 type|I32 flags|char* pv
+Apa	|SV*	|newRV		|NN SV* pref
+Apda	|SV*	|newRV_noinc	|NN SV *sv
+Apda	|SV*	|newSV		|STRLEN len
+Apa	|OP*	|newSVREF	|NN OP* o
+Apa	|OP*	|newSVOP	|I32 type|I32 flags|NN SV* sv
+Apda	|SV*	|newSViv	|IV i
+Apda	|SV*	|newSVuv	|UV u
+Apda	|SV*	|newSVnv	|NV n
+Apda	|SV*	|newSVpv	|const char* s|STRLEN len
+Apda	|SV*	|newSVpvn	|const char* s|STRLEN len
+Apda	|SV*	|newSVhek	|const HEK *hek
+Apda	|SV*	|newSVpvn_share	|const char* s|I32 len|U32 hash
+Afpda	|SV*	|newSVpvf	|const char* pat|...
 Ap	|SV*	|vnewSVpvf	|const char* pat|va_list* args
-Apd	|SV*	|newSVrv	|SV* rv|const char* classname
-Apd	|SV*	|newSVsv	|SV* old
-Ap	|OP*	|newUNOP	|I32 type|I32 flags|OP* first
-Ap	|OP*	|newWHILEOP	|I32 flags|I32 debuggable|LOOP* loop \
-				|I32 whileline|OP* expr|OP* block|OP* cont
-
-Ap	|PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems
-Ap	|char*	|scan_vstring	|char *vstr|SV *sv
-Apd	|char*	|scan_version	|char *vstr|SV *sv|bool qv
+Apda	|SV*	|newSVrv	|SV* rv|const char* classname
+Apda	|SV*	|newSVsv	|SV* old
+Apa	|OP*	|newUNOP	|I32 type|I32 flags|OP* first
+Apa	|OP*	|newWHILEOP	|I32 flags|I32 debuggable|LOOP* loop \
+				|I32 whileline|OP* expr|OP* block|OP* cont \
+				|I32 has_my
+Apa	|PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems
+Ap	|char*	|scan_vstring	|NN const char *vstr|NN SV *sv
+Apd	|char*	|scan_version	|NN const char *vstr|NN SV *sv|bool qv
 Apd	|SV*	|new_version	|SV *ver
 Apd	|SV*	|upg_version	|SV *ver
 Apd	|SV*	|vnumify	|SV *vs
 Apd	|SV*	|vnormal	|SV *vs
 Apd	|SV*	|vstringify	|SV *vs
-Apd	|int	|vcmp		|SV *lvs|SV *rvs
+Apd	|int	|vcmp		|NN SV *lvs|NN SV *rvs
 p	|PerlIO*|nextargv	|GV* gv
-Ap	|char*	|ninstr		|const char* big|const char* bigend \
+ApP	|char*	|ninstr		|const char* big|const char* bigend \
 				|const char* little|const char* lend
-p	|OP*	|oopsCV		|OP* o
+pr	|OP*	|oopsCV		|OP* o
 Ap	|void	|op_free	|OP* arg
 p	|void	|package	|OP* o
 pd	|PADOFFSET|pad_alloc	|I32 optype|U32 tmptype
-p	|PADOFFSET|allocmy	|char* name
-pd	|PADOFFSET|pad_findmy	|char* name
+p	|PADOFFSET|allocmy	|NN char* name
+pd	|PADOFFSET|pad_findmy	|NN const char* name
 Ap	|PADOFFSET|find_rundefsvoffset	|
-p	|OP*	|oopsAV		|OP* o
-p	|OP*	|oopsHV		|OP* o
+pR	|OP*	|oopsAV		|NN OP* o
+pR	|OP*	|oopsHV		|NN OP* o
 pd	|void	|pad_leavemy
 Apd	|SV*	|pad_sv		|PADOFFSET po
 pd	|void	|pad_free	|PADOFFSET po
@@ -568,74 +579,72 @@ Ap	|void	|reentrant_free
 Anp	|void*	|reentrant_retry|const char*|...
 #endif
 Ap	|void	|call_atexit	|ATEXIT_t fn|void *ptr
-Apd	|I32	|call_argv	|const char* sub_name|I32 flags|char** argv
-Apd	|I32	|call_method	|const char* methname|I32 flags
-Apd	|I32	|call_pv	|const char* sub_name|I32 flags
+Apd	|I32	|call_argv	|NN const char* sub_name|I32 flags|NN char** argv
+Apd	|I32	|call_method	|NN const char* methname|I32 flags
+Apd	|I32	|call_pv	|NN const char* sub_name|I32 flags
 Apd	|I32	|call_sv	|SV* sv|I32 flags
 Ap	|void	|despatch_signals
-Apd	|SV*	|eval_pv	|const char* p|I32 croak_on_error
-Apd	|I32	|eval_sv	|SV* sv|I32 flags
-Apd	|SV*	|get_sv		|const char* name|I32 create
-Apd	|AV*	|get_av		|const char* name|I32 create
+Apd	|SV*	|eval_pv	|NN const char* p|I32 croak_on_error
+Apd	|I32	|eval_sv	|NN SV* sv|I32 flags
+Apd	|SV*	|get_sv		|NN const char* name|I32 create
+Apd	|AV*	|get_av		|NN const char* name|I32 create
 Apd	|HV*	|get_hv		|const char* name|I32 create
 Apd	|CV*	|get_cv		|const char* name|I32 create
 Ap	|int	|init_i18nl10n	|int printwarn
 Ap	|int	|init_i18nl14n	|int printwarn
-Ap	|void	|new_collate	|char* newcoll
-Ap	|void	|new_ctype	|char* newctype
-Ap	|void	|new_numeric	|char* newcoll
+Ap	|void	|new_collate	|NN char* newcoll
+Ap	|void	|new_ctype	|NN char* newctype
+Ap	|void	|new_numeric	|NN char* newcoll
 Ap	|void	|set_numeric_local
 Ap	|void	|set_numeric_radix
 Ap	|void	|set_numeric_standard
-Apd	|void	|require_pv	|const char* pv
-Apd	|void	|pack_cat	|SV *cat|char *pat|char *patend|SV **beglist|SV **endlist|SV ***next_in_list|U32 flags
-Apd	|void	|packlist 	|SV *cat|char *pat|char *patend|SV **beglist|SV **endlist
+Apd	|void	|require_pv	|NN const char* pv
+Apd	|void	|pack_cat	|SV *cat|const char *pat|const char *patend|SV **beglist|SV **endlist|SV ***next_in_list|U32 flags
+Apd	|void	|packlist 	|SV *cat|const char *pat|const char *patend|SV **beglist|SV **endlist
 p	|void	|pidgone	|Pid_t pid|int status
-Ap	|void	|pmflag		|U32* pmfl|int ch
-p	|OP*	|pmruntime	|OP* pm|OP* expr|OP* repl
-p	|OP*	|pmtrans	|OP* o|OP* expr|OP* repl
-p	|OP*	|pop_return
+Ap	|void	|pmflag		|NN U32* pmfl|int ch
+p	|OP*	|pmruntime	|NN OP* pm|NN OP* expr|bool isreg
+p	|OP*	|pmtrans	|NN OP* o|NN OP* expr|OP* repl
 Ap	|void	|pop_scope
 p	|OP*	|prepend_elem	|I32 optype|OP* head|OP* tail
-p	|void	|push_return	|OP* o
 Ap	|void	|push_scope
 p	|OP*	|ref		|OP* o|I32 type
 p	|OP*	|refkids	|OP* o|I32 type
-Ap	|void	|regdump	|regexp* r
-Ap	|SV*	|regclass_swash	|struct regnode *n|bool doinit|SV **listsvp|SV **altsvp
-Ap	|I32	|pregexec	|regexp* prog|char* stringarg \
-				|char* strend|char* strbeg|I32 minend \
-				|SV* screamer|U32 nosave
+Ap	|void	|regdump	|NN regexp* r
+Ap	|SV*	|regclass_swash	|const struct regnode *n|bool doinit|SV **listsvp|SV **altsvp
+Ap	|I32	|pregexec	|NN regexp* prog|NN char* stringarg \
+				|NN char* strend|NN char* strbeg|I32 minend \
+				|NN SV* screamer|U32 nosave
 Ap	|void	|pregfree	|struct regexp* r
-Ap	|regexp*|pregcomp	|char* exp|char* xend|PMOP* pm
+Ap	|regexp*|pregcomp	|NN char* exp|NN char* xend|NN PMOP* pm
 Ap	|char*	|re_intuit_start|regexp* prog|SV* sv|char* strpos \
 				|char* strend|U32 flags \
 				|struct re_scream_pos_data_s *data
 Ap	|SV*	|re_intuit_string|regexp* prog
-Ap	|I32	|regexec_flags	|regexp* prog|char* stringarg \
-				|char* strend|char* strbeg|I32 minend \
+Ap	|I32	|regexec_flags	|NN regexp* prog|NN char* stringarg \
+				|NN char* strend|NN char* strbeg|I32 minend \
 				|SV* screamer|void* data|U32 flags
-Ap	|regnode*|regnext	|regnode* p
-Ep	|void	|regprop	|SV* sv|regnode* o
-Ap	|void	|repeatcpy	|char* to|const char* from|I32 len|I32 count
-Ap	|char*	|rninstr	|const char* big|const char* bigend \
-				|const char* little|const char* lend
+ApR	|regnode*|regnext	|NN regnode* p
+Ep	|void	|regprop	|SV* sv|const regnode* o
+Ap	|void	|repeatcpy	|NN char* to|NN const char* from|I32 len|I32 count
+ApP	|char*	|rninstr	|NN const char* big|NN const char* bigend \
+				|NN const char* little|NN const char* lend
 Ap	|Sighandler_t|rsignal	|int i|Sighandler_t t
 p	|int	|rsignal_restore|int i|Sigsave_t* t
 p	|int	|rsignal_save	|int i|Sighandler_t t1|Sigsave_t* t2
 Ap	|Sighandler_t|rsignal_state|int i
-p	|void	|rxres_free	|void** rsp
-p	|void	|rxres_restore	|void** rsp|REGEXP* prx
-p	|void	|rxres_save	|void** rsp|REGEXP* prx
+p	|void	|rxres_free	|NN void** rsp
+p	|void	|rxres_restore	|NN void** rsp|NN REGEXP* prx
+p	|void	|rxres_save	|NN void** rsp|NN REGEXP* prx
 #if !defined(HAS_RENAME)
-p	|I32	|same_dirent	|char* a|char* b
+p	|I32	|same_dirent	|NN const char* a|NN const char* b
 #endif
 Apd	|char*	|savepv		|const char* pv
 Apd	|char*	|savesharedpv	|const char* pv
 Apd	|char*	|savepvn	|const char* pv|I32 len
 Ap	|void	|savestack_grow
 Ap	|void	|savestack_grow_cnt	|I32 need
-Ap	|void	|save_aelem	|AV* av|I32 idx|SV **sptr
+Ap	|void	|save_aelem	|const AV* av|I32 idx|SV **sptr
 Ap	|I32	|save_alloc	|I32 size|I32 pad
 Ap	|void	|save_aptr	|AV** aptr
 Ap	|AV*	|save_ary	|GV* gv
@@ -653,7 +662,7 @@ Ap	|void	|save_shared_pvref|char** str
 Ap	|void	|save_gp	|GV* gv|I32 empty
 Ap	|HV*	|save_hash	|GV* gv
 Ap	|void	|save_helem	|HV* hv|SV *key|SV **sptr
-Ap	|void	|save_hints
+Apr	|void	|save_hints
 Ap	|void	|save_hptr	|HV** hptr
 Ap	|void	|save_I16	|I16* intp
 Ap	|void	|save_I32	|I32* intp
@@ -673,108 +682,109 @@ Ap	|void	|save_re_context
 Ap	|void	|save_padsv	|PADOFFSET off
 Ap	|void	|save_sptr	|SV** sptr
 Ap	|SV*	|save_svref	|SV** sptr
-Ap	|SV**	|save_threadsv	|PADOFFSET i
+Apr	|SV**	|save_threadsv	|PADOFFSET i
 p	|OP*	|sawparens	|OP* o
 p	|OP*	|scalar		|OP* o
 p	|OP*	|scalarkids	|OP* o
 p	|OP*	|scalarseq	|OP* o
 p	|OP*	|scalarvoid	|OP* o
-Apd	|NV	|scan_bin	|char* start|STRLEN len|STRLEN* retlen
-Apd	|NV	|scan_hex	|char* start|STRLEN len|STRLEN* retlen
-Ap	|char*	|scan_num	|char* s|YYSTYPE *lvalp
-Apd	|NV	|scan_oct	|char* start|STRLEN len|STRLEN* retlen
+Apd	|NV	|scan_bin	|const char* start|STRLEN len|STRLEN* retlen
+Apd	|NV	|scan_hex	|const char* start|STRLEN len|STRLEN* retlen
+Ap	|char*	|scan_num	|const char* s|YYSTYPE *lvalp
+Apd	|NV	|scan_oct	|const char* start|STRLEN len|STRLEN* retlen
 p	|OP*	|scope		|OP* o
 Ap	|char*	|screaminstr	|SV* bigsv|SV* littlesv|I32 start_shift \
 				|I32 end_shift|I32 *state|I32 last
 #if !defined(VMS)
-p	|I32	|setenv_getix	|char* nam
+p	|I32	|setenv_getix	|const char* nam
 #endif
 p	|void	|setdefout	|GV* gv
 p	|HEK*	|share_hek	|const char* sv|I32 len|U32 hash
 np	|Signal_t |sighandler	|int sig
 Anp	|Signal_t |csighandler	|int sig
-Ap	|SV**	|stack_grow	|SV** sp|SV**p|int n
-Ap	|I32	|start_subparse	|I32 is_format|U32 flags
+Ap	|SV**	|stack_grow	|NN SV** sp|NN SV**p|int n
+ApR	|I32	|start_subparse	|I32 is_format|U32 flags
 p	|void	|sub_crush_depth|CV* cv
-Apd	|bool	|sv_2bool	|SV* sv
-Apd	|CV*	|sv_2cv		|SV* sv|HV** st|GV** gvp|I32 lref
-Apd	|IO*	|sv_2io		|SV* sv
-Amb	|IV	|sv_2iv		|SV* sv
-Apd	|IV	|sv_2iv_flags	|SV* sv|I32 flags
-Apd	|SV*	|sv_2mortal	|SV* sv
-Apd	|NV	|sv_2nv		|SV* sv
-Amb	|char*	|sv_2pv		|SV* sv|STRLEN* lp
-Apd	|char*	|sv_2pvutf8	|SV* sv|STRLEN* lp
-Apd	|char*	|sv_2pvbyte	|SV* sv|STRLEN* lp
-Ap	|char*	|sv_pvn_nomg	|SV* sv|STRLEN* lp
-Amb	|UV	|sv_2uv		|SV* sv
-Apd	|UV	|sv_2uv_flags	|SV* sv|I32 flags
-Apd	|IV	|sv_iv		|SV* sv
-Apd	|UV	|sv_uv		|SV* sv
-Apd	|NV	|sv_nv		|SV* sv
-Apd	|char*	|sv_pvn		|SV *sv|STRLEN *len
-Apd	|char*	|sv_pvutf8n	|SV *sv|STRLEN *len
-Apd	|char*	|sv_pvbyten	|SV *sv|STRLEN *len
-Apd	|I32	|sv_true	|SV *sv
-pd	|void	|sv_add_arena	|char* ptr|U32 size|U32 flags
-Apd	|int	|sv_backoff	|SV* sv
-Apd	|SV*	|sv_bless	|SV* sv|HV* stash
-Afpd	|void	|sv_catpvf	|SV* sv|const char* pat|...
-Ap	|void	|sv_vcatpvf	|SV* sv|const char* pat|va_list* args
-Apd	|void	|sv_catpv	|SV* sv|const char* ptr
-Amdb	|void	|sv_catpvn	|SV* sv|const char* ptr|STRLEN len
-Amdb	|void	|sv_catsv	|SV* dsv|SV* ssv
-Apd	|void	|sv_chop	|SV* sv|char* ptr
+Apd	|bool	|sv_2bool	|NN SV* sv
+Apd	|CV*	|sv_2cv		|NN SV* sv|HV** st|GV** gvp|I32 lref
+Apd	|IO*	|sv_2io		|NN SV* sv
+Amb	|IV	|sv_2iv		|NN SV* sv
+Apd	|IV	|sv_2iv_flags	|NN SV* sv|I32 flags
+Apd	|SV*	|sv_2mortal	|NN SV* sv
+Apd	|NV	|sv_2nv		|NN SV* sv
+Amb	|char*	|sv_2pv		|NN SV* sv|STRLEN* lp
+Apd	|char*	|sv_2pv_flags	|NN SV* sv|STRLEN* lp|I32 flags
+Apd	|char*	|sv_2pvutf8	|NN SV* sv|STRLEN* lp
+Apd	|char*	|sv_2pvbyte	|NN SV* sv|STRLEN* lp
+Ap	|char*	|sv_pvn_nomg	|NN SV* sv|STRLEN* lp
+Amb	|UV	|sv_2uv		|NN SV* sv
+Apd	|UV	|sv_2uv_flags	|NN SV* sv|I32 flags
+Apd	|IV	|sv_iv		|NN SV* sv
+Apd	|UV	|sv_uv		|NN SV* sv
+Apd	|NV	|sv_nv		|NN SV* sv
+Apd	|char*	|sv_pvn		|NN SV *sv|NN STRLEN *len
+Apd	|char*	|sv_pvutf8n	|NN SV *sv|NN STRLEN *len
+Apd	|char*	|sv_pvbyten	|NN SV *sv|NN STRLEN *len
+Apd	|I32	|sv_true	|NN SV *sv
+pd	|void	|sv_add_arena	|NN char* ptr|U32 size|U32 flags
+Apd	|int	|sv_backoff	|NN SV* sv
+Apd	|SV*	|sv_bless	|NN SV* sv|NN HV* stash
+Afpd	|void	|sv_catpvf	|NN SV* sv|const char* pat|...
+Apd	|void	|sv_vcatpvf	|NN SV* sv|const char* pat|va_list* args
+Apd	|void	|sv_catpv	|NN SV* sv|const char* ptr
+Amdb	|void	|sv_catpvn	|NN SV* sv|const char* ptr|STRLEN len
+Amdb	|void	|sv_catsv	|NN SV* dsv|SV* ssv
+Apd	|void	|sv_chop	|NN SV* sv|const char* ptr
 pd	|I32	|sv_clean_all
 pd	|void	|sv_clean_objs
-Apd	|void	|sv_clear	|SV* sv
-Apd	|I32	|sv_cmp		|SV* sv1|SV* sv2
-Apd	|I32	|sv_cmp_locale	|SV* sv1|SV* sv2
+Apd	|void	|sv_clear	|NN SV* sv
+Apd	|I32	|sv_cmp		|NN SV* sv1|NN SV* sv2
+Apd	|I32	|sv_cmp_locale	|NN SV* sv1|NN SV* sv2
 #if defined(USE_LOCALE_COLLATE)
-Apd	|char*	|sv_collxfrm	|SV* sv|STRLEN* nxp
-#endif
-Ap	|OP*	|sv_compile_2op	|SV* sv|OP** startp|char* code|PAD** padp
-Apd	|int	|getcwd_sv	|SV* sv
-Apd	|void	|sv_dec		|SV* sv
-Ap	|void	|sv_dump	|SV* sv
-Apd	|bool	|sv_derived_from|SV* sv|const char* name
-Apd	|I32	|sv_eq		|SV* sv1|SV* sv2
+Apd	|char*	|sv_collxfrm	|NN SV* sv|NN STRLEN* nxp
+#endif
+Ap	|OP*	|sv_compile_2op	|NN SV* sv|NN OP** startp|NN const char* code|NN PAD** padp
+Apd	|int	|getcwd_sv	|NN SV* sv
+Apd	|void	|sv_dec		|NN SV* sv
+Ap	|void	|sv_dump	|NN SV* sv
+ApdR	|bool	|sv_derived_from|NN SV* sv|NN const char* name
+Apd	|I32	|sv_eq		|NN SV* sv1|NN SV* sv2
 Apd	|void	|sv_free	|SV* sv
-poMX	|void	|sv_free2	|SV* sv
+poMX	|void	|sv_free2	|NN SV* sv
 pd	|void	|sv_free_arenas
-Apd	|char*	|sv_gets	|SV* sv|PerlIO* fp|I32 append
-Apd	|char*	|sv_grow	|SV* sv|STRLEN newlen
-Apd	|void	|sv_inc		|SV* sv
-Apd	|void	|sv_insert	|SV* bigsv|STRLEN offset|STRLEN len \
-				|char* little|STRLEN littlelen
-Apd	|int	|sv_isa		|SV* sv|const char* name
-Apd	|int	|sv_isobject	|SV* sv
-Apd	|STRLEN	|sv_len		|SV* sv
-Apd	|STRLEN	|sv_len_utf8	|SV* sv
-Apd	|void	|sv_magic	|SV* sv|SV* obj|int how|const char* name \
+Apd	|char*	|sv_gets	|NN SV* sv|NN PerlIO* fp|I32 append
+Apd	|char*	|sv_grow	|NN SV* sv|STRLEN newlen
+Apd	|void	|sv_inc		|NN SV* sv
+Apd	|void	|sv_insert	|NN SV* bigsv|STRLEN offset|STRLEN len \
+				|NN const char* little|STRLEN littlelen
+Apd	|int	|sv_isa		|NN SV* sv|const char* name
+Apd	|int	|sv_isobject	|NN SV* sv
+Apd	|STRLEN	|sv_len		|NN SV* sv
+Apd	|STRLEN	|sv_len_utf8	|NN SV* sv
+Apd	|void	|sv_magic	|NN SV* sv|SV* obj|int how|const char* name \
 				|I32 namlen
-Apd	|MAGIC *|sv_magicext	|SV* sv|SV* obj|int how|MGVTBL *vtbl \
-				| const char* name|I32 namlen	
-Apd	|SV*	|sv_mortalcopy	|SV* oldsv
-Apd	|SV*	|sv_newmortal
+Apd	|MAGIC *|sv_magicext	|NN SV* sv|SV* obj|int how|const MGVTBL *vtbl \
+				|const char* name|I32 namlen
+Apd	|SV*	|sv_mortalcopy	|NN SV* oldsv
+ApdR	|SV*	|sv_newmortal
 Apd	|SV*	|sv_newref	|SV* sv
 Ap	|char*	|sv_peek	|SV* sv
-Apd	|void	|sv_pos_u2b	|SV* sv|I32* offsetp|I32* lenp
-Apd	|void	|sv_pos_b2u	|SV* sv|I32* offsetp
+Apd	|void	|sv_pos_u2b	|SV* sv|NN I32* offsetp|I32* lenp
+Apd	|void	|sv_pos_b2u	|SV* sv|NN I32* offsetp
 Amdb	|char*	|sv_pvn_force	|SV* sv|STRLEN* lp
 Apd	|char*	|sv_pvutf8n_force|SV* sv|STRLEN* lp
 Apd	|char*	|sv_pvbyten_force|SV* sv|STRLEN* lp
 Apd	|char*	|sv_recode_to_utf8	|SV* sv|SV *encoding
 Apd	|bool	|sv_cat_decode	|SV* dsv|SV *encoding|SV *ssv|int *offset \
 				|char* tstr|int tlen
-Apd	|char*	|sv_reftype	|SV* sv|int ob
-Apd	|void	|sv_replace	|SV* sv|SV* nsv
+ApdR	|char*	|sv_reftype	|NN const SV* sv|int ob
+Apd	|void	|sv_replace	|NN SV* sv|NN SV* nsv
 Apd	|void	|sv_report_used
-Apd	|void	|sv_reset	|char* s|HV* stash
+Apd	|void	|sv_reset	|NN const char* s|HV* stash
 Afpd	|void	|sv_setpvf	|SV* sv|const char* pat|...
-Ap	|void	|sv_vsetpvf	|SV* sv|const char* pat|va_list* args
+Apd	|void	|sv_vsetpvf	|SV* sv|const char* pat|va_list* args
 Apd	|void	|sv_setiv	|SV* sv|IV num
-Apdb	|void	|sv_setpviv	|SV* sv|IV num
+Apdb	|void	|sv_setpviv	|NN SV* sv|IV num
 Apd	|void	|sv_setuv	|SV* sv|UV num
 Apd	|void	|sv_setnv	|SV* sv|NV num
 Apd	|SV*	|sv_setref_iv	|SV* rv|const char* classname|IV iv
@@ -784,102 +794,102 @@ Apd	|SV*	|sv_setref_pv	|SV* rv|const char* classname|void* pv
 Apd	|SV*	|sv_setref_pvn	|SV* rv|const char* classname|char* pv \
 				|STRLEN n
 Apd	|void	|sv_setpv	|SV* sv|const char* ptr
-Apd	|void	|sv_setpvn	|SV* sv|const char* ptr|STRLEN len
+Apd	|void	|sv_setpvn	|NN SV* sv|const char* ptr|STRLEN len
 Amdb	|void	|sv_setsv	|SV* dsv|SV* ssv
 Apd	|void	|sv_taint	|SV* sv
-Apd	|bool	|sv_tainted	|SV* sv
-Apd	|int	|sv_unmagic	|SV* sv|int type
-Apd	|void	|sv_unref	|SV* sv
-Apd	|void	|sv_unref_flags	|SV* sv|U32 flags
-Apd	|void	|sv_untaint	|SV* sv
-Apd	|bool	|sv_upgrade	|SV* sv|U32 mt
-Apd	|void	|sv_usepvn	|SV* sv|char* ptr|STRLEN len
-Apd	|void	|sv_vcatpvfn	|SV* sv|const char* pat|STRLEN patlen \
+ApdR	|bool	|sv_tainted	|SV* sv
+Apd	|int	|sv_unmagic	|NN SV* sv|int type
+Apd	|void	|sv_unref	|NN SV* sv
+Apd	|void	|sv_unref_flags	|NN SV* sv|U32 flags
+Apd	|void	|sv_untaint	|NN SV* sv
+Apd	|void	|sv_upgrade	|NN SV* sv|U32 mt
+Apd	|void	|sv_usepvn	|NN SV* sv|char* ptr|STRLEN len
+Apd	|void	|sv_vcatpvfn	|NN SV* sv|NN const char* pat|STRLEN patlen \
 				|va_list* args|SV** svargs|I32 svmax \
 				|bool *maybe_tainted
-Apd	|void	|sv_vsetpvfn	|SV* sv|const char* pat|STRLEN patlen \
+Apd	|void	|sv_vsetpvfn	|NN SV* sv|NN const char* pat|STRLEN patlen \
 				|va_list* args|SV** svargs|I32 svmax \
 				|bool *maybe_tainted
 Ap	|NV	|str_to_version	|SV *sv
-Ap	|SV*	|swash_init	|char* pkg|char* name|SV* listsv \
-				|I32 minbits|I32 none
-Ap	|UV	|swash_fetch	|SV *sv|U8 *ptr|bool do_utf8
+Ap	|SV*	|swash_init	|const char* pkg|const char* name|SV* listsv|I32 minbits|I32 none
+Ap	|UV	|swash_fetch	|SV *sv|const U8 *ptr|bool do_utf8
 Ap	|void	|taint_env
 Ap	|void	|taint_proper	|const char* f|const char* s
-Apd	|UV	|to_utf8_case	|U8 *p|U8* ustrp|STRLEN *lenp \
-				|SV **swash|char *normal|char *special
-Apd	|UV	|to_utf8_lower	|U8 *p|U8* ustrp|STRLEN *lenp
-Apd	|UV	|to_utf8_upper	|U8 *p|U8* ustrp|STRLEN *lenp
-Apd	|UV	|to_utf8_title	|U8 *p|U8* ustrp|STRLEN *lenp
-Apd	|UV	|to_utf8_fold	|U8 *p|U8* ustrp|STRLEN *lenp
+Apd	|UV	|to_utf8_case	|NN const U8 *p|NN U8* ustrp|STRLEN *lenp|SV **swash|const char *normal|const char *special
+Apd	|UV	|to_utf8_lower	|NN const U8 *p|NN U8* ustrp|STRLEN *lenp
+Apd	|UV	|to_utf8_upper	|NN const U8 *p|NN U8* ustrp|STRLEN *lenp
+Apd	|UV	|to_utf8_title	|NN const U8 *p|NN U8* ustrp|STRLEN *lenp
+Apd	|UV	|to_utf8_fold	|NN const U8 *p|NN U8* ustrp|STRLEN *lenp
 #if defined(UNLINK_ALL_VERSIONS)
 Ap	|I32	|unlnk		|char* f
 #endif
-Apd	|I32	|unpack_str	|char *pat|char *patend|char *s|char *strbeg|char *strend|char **new_s|I32 ocnt|U32 flags
-Apd	|I32	|unpackstring	|char *pat|char *patend|char *s|char *strend|U32 flags
+Apd	|I32	|unpack_str	|const char *pat|const char *patend|const char *s|const char *strbeg|const char *strend|char **new_s|I32 ocnt|U32 flags
+Apd	|I32	|unpackstring	|const char *pat|const char *patend|const char *s|const char *strend|U32 flags
 Ap	|void	|unsharepvn	|const char* sv|I32 len|U32 hash
 p	|void	|unshare_hek	|HEK* hek
 p	|void	|utilize	|int aver|I32 floor|OP* version|OP* idop|OP* arg
 Ap	|U8*	|utf16_to_utf8	|U8* p|U8 *d|I32 bytelen|I32 *newlen
 Ap	|U8*	|utf16_to_utf8_reversed|U8* p|U8 *d|I32 bytelen|I32 *newlen
-Adp	|STRLEN	|utf8_length	|U8* s|U8 *e
-Apd	|IV	|utf8_distance	|U8 *a|U8 *b
-Apd	|U8*	|utf8_hop	|U8 *s|I32 off
-ApMd	|U8*	|utf8_to_bytes	|U8 *s|STRLEN *len
-ApMd	|U8*	|bytes_from_utf8|U8 *s|STRLEN *len|bool *is_utf8
-ApMd	|U8*	|bytes_to_utf8	|U8 *s|STRLEN *len
-Apd	|UV	|utf8_to_uvchr	|U8 *s|STRLEN* retlen
-Apd	|UV	|utf8_to_uvuni	|U8 *s|STRLEN* retlen
-Adp	|UV	|utf8n_to_uvchr	|U8 *s|STRLEN curlen|STRLEN* retlen|U32 flags
-Adp	|UV	|utf8n_to_uvuni	|U8 *s|STRLEN curlen|STRLEN* retlen|U32 flags
-Apd	|U8*	|uvchr_to_utf8	|U8 *d|UV uv
-Ap	|U8*	|uvuni_to_utf8	|U8 *d|UV uv
-Ap	|U8*	|uvchr_to_utf8_flags	|U8 *d|UV uv|UV flags
-Apd	|U8*	|uvuni_to_utf8_flags	|U8 *d|UV uv|UV flags
-Apd	|char*	|pv_uni_display	|SV *dsv|U8 *spv|STRLEN len \
+AdpPR	|STRLEN	|utf8_length	|NN const U8* s|NN const U8 *e
+ApdPR	|IV	|utf8_distance	|NN const U8 *a|NN const U8 *b
+ApdPR	|U8*	|utf8_hop	|NN const U8 *s|I32 off
+ApMd	|U8*	|utf8_to_bytes	|NN U8 *s|NN STRLEN *len
+ApMd	|U8*	|bytes_from_utf8|const U8 *s|STRLEN *len|bool *is_utf8
+ApMd	|U8*	|bytes_to_utf8	|const U8 *s|STRLEN *len
+Apd	|UV	|utf8_to_uvchr	|const U8 *s|STRLEN* retlen
+Apd	|UV	|utf8_to_uvuni	|const U8 *s|STRLEN* retlen
+Adp	|UV	|utf8n_to_uvchr	|const U8 *s|STRLEN curlen|STRLEN* retlen|U32 flags
+Adp	|UV	|utf8n_to_uvuni	|const U8 *s|STRLEN curlen|STRLEN* retlen|U32 flags
+Apd	|U8*	|uvchr_to_utf8	|NN U8 *d|UV uv
+Ap	|U8*	|uvuni_to_utf8	|NN U8 *d|UV uv
+Ap	|U8*	|uvchr_to_utf8_flags	|NN U8 *d|UV uv|UV flags
+Apd	|U8*	|uvuni_to_utf8_flags	|NN U8 *d|UV uv|UV flags
+Apd	|char*	|pv_uni_display	|SV *dsv|const U8 *spv|STRLEN len \
 				|STRLEN pvlim|UV flags
-Apd	|char*	|sv_uni_display	|SV *dsv|SV *ssv|STRLEN pvlim|UV flags
+ApdR	|char*	|sv_uni_display	|SV *dsv|SV *ssv|STRLEN pvlim|UV flags
 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	|U32	|parse_unicode_opts|char **popt
+p	|U32	|parse_unicode_opts|const char **popt
 p	|U32	|seed
 p	|UV	|get_hash_seed
-p	|void	|report_evil_fh	|GV *gv|IO *io|I32 op
+p	|void	|report_evil_fh	|const GV *gv|const IO *io|I32 op
 pd	|void	|report_uninit	|SV* uninit_sv
 Afpd	|void	|warn		|const char* pat|...
 Ap	|void	|vwarn		|const char* pat|va_list* args
 Afp	|void	|warner		|U32 err|const char* pat|...
 Ap	|void	|vwarner	|U32 err|const char* pat|va_list* args
 p	|void	|watch		|char** addr
-Ap	|I32	|whichsig	|char* sig
+Ap	|I32	|whichsig	|const char* sig
 p	|void	|write_to_stderr|const char* message|int msglen
-p	|int	|yyerror	|char* s
+p	|int	|yyerror	|const char* s
 p	|int	|yylex
 p	|int	|yyparse
-p	|int	|yywarn		|char* s
+p	|int	|yywarn		|const char* s
 #if defined(MYMALLOC)
 Ap	|void	|dump_mstats	|char* s
 Ap	|int	|get_mstats	|perl_mstats_t *buf|int buflen|int level
 #endif
-Anp	|Malloc_t|safesysmalloc	|MEM_SIZE nbytes
-Anp	|Malloc_t|safesyscalloc	|MEM_SIZE elements|MEM_SIZE size
-Anp	|Malloc_t|safesysrealloc|Malloc_t where|MEM_SIZE nbytes
+Anpa	|Malloc_t|safesysmalloc	|MEM_SIZE nbytes
+Anpa	|Malloc_t|safesyscalloc	|MEM_SIZE elements|MEM_SIZE size
+Anpa	|Malloc_t|safesysrealloc|Malloc_t where|MEM_SIZE nbytes
 Anp	|Free_t	|safesysfree	|Malloc_t where
 #if defined(PERL_GLOBAL_STRUCT)
 Ap	|struct perl_vars *|GetVars
+Ap	|struct perl_vars*|init_global_struct
+Ap	|void	|free_global_struct|struct perl_vars*
 #endif
 Ap	|int	|runops_standard
 Ap	|int	|runops_debug
 Afpd	|void	|sv_catpvf_mg	|SV *sv|const char* pat|...
-Ap	|void	|sv_vcatpvf_mg	|SV* sv|const char* pat|va_list* args
+Apd	|void	|sv_vcatpvf_mg	|SV* sv|const char* pat|va_list* args
 Apd	|void	|sv_catpv_mg	|SV *sv|const char *ptr
 Apd	|void	|sv_catpvn_mg	|SV *sv|const char *ptr|STRLEN len
 Apd	|void	|sv_catsv_mg	|SV *dstr|SV *sstr
 Afpd	|void	|sv_setpvf_mg	|SV *sv|const char* pat|...
-Ap	|void	|sv_vsetpvf_mg	|SV* sv|const char* pat|va_list* args
+Apd	|void	|sv_vsetpvf_mg	|SV* sv|const char* pat|va_list* args
 Apd	|void	|sv_setiv_mg	|SV *sv|IV i
-Apdb	|void	|sv_setpviv_mg	|SV *sv|IV iv
+Apdb	|void	|sv_setpviv_mg	|NN SV *sv|IV iv
 Apd	|void	|sv_setuv_mg	|SV *sv|UV u
 Apd	|void	|sv_setnv_mg	|SV *sv|NV num
 Apd	|void	|sv_setpv_mg	|SV *sv|const char *ptr
@@ -887,27 +897,21 @@ Apd	|void	|sv_setpvn_mg	|SV *sv|const char *ptr|STRLEN len
 Apd	|void	|sv_setsv_mg	|SV *dstr|SV *sstr
 Apd	|void	|sv_usepvn_mg	|SV *sv|char *ptr|STRLEN len
 Ap	|MGVTBL*|get_vtbl	|int vtbl_id
-Ap	|char*	|pv_display	|SV *dsv|char *pv|STRLEN cur|STRLEN len \
+Ap	|char*	|pv_display	|SV *dsv|const char *pv|STRLEN cur|STRLEN len \
 				|STRLEN pvlim
 Afp	|void	|dump_indent	|I32 level|PerlIO *file|const char* pat|...
 Ap	|void	|dump_vindent	|I32 level|PerlIO *file|const char* pat \
 				|va_list *args
-Ap	|void	|do_gv_dump	|I32 level|PerlIO *file|char *name|GV *sv
-Ap	|void	|do_gvgv_dump	|I32 level|PerlIO *file|char *name|GV *sv
-Ap	|void	|do_hv_dump	|I32 level|PerlIO *file|char *name|HV *sv
-Ap	|void	|do_magic_dump	|I32 level|PerlIO *file|MAGIC *mg|I32 nest \
+Ap	|void	|do_gv_dump	|I32 level|PerlIO *file|const char *name|GV *sv
+Ap	|void	|do_gvgv_dump	|I32 level|PerlIO *file|const char *name|GV *sv
+Ap	|void	|do_hv_dump	|I32 level|PerlIO *file|const char *name|HV *sv
+Ap	|void	|do_magic_dump	|I32 level|PerlIO *file|const MAGIC *mg|I32 nest \
 				|I32 maxnest|bool dumpops|STRLEN pvlim
-Ap	|void	|do_op_dump	|I32 level|PerlIO *file|OP *o
-Ap	|void	|do_pmop_dump	|I32 level|PerlIO *file|PMOP *pm
+Ap	|void	|do_op_dump	|I32 level|PerlIO *file|const OP *o
+Ap	|void	|do_pmop_dump	|I32 level|PerlIO *file|const PMOP *pm
 Ap	|void	|do_sv_dump	|I32 level|PerlIO *file|SV *sv|I32 nest \
 				|I32 maxnest|bool dumpops|STRLEN pvlim
-Ap	|void	|magic_dump	|MAGIC *mg
-#if defined(PERL_FLEXIBLE_EXCEPTIONS)
-Ap	|void*	|default_protect|volatile JMPENV *je|int *excpt \
-				|protect_body_t body|...
-Ap	|void*	|vdefault_protect|volatile JMPENV *je|int *excpt \
-				|protect_body_t body|va_list *args
-#endif
+Ap	|void	|magic_dump	|const MAGIC *mg
 Ap	|void	|reginitcolors
 Apd	|char*	|sv_2pv_nolen	|SV* sv
 Apd	|char*	|sv_2pvutf8_nolen|SV* sv
@@ -926,8 +930,8 @@ Apd	|SV*	|sv_rvweaken	|SV *sv
 p	|int	|magic_killbackrefs|SV *sv|MAGIC *mg
 Ap	|OP*	|newANONATTRSUB	|I32 floor|OP *proto|OP *attrs|OP *block
 Ap	|CV*	|newATTRSUB	|I32 floor|OP *o|OP *proto|OP *attrs|OP *block
-Ap	|void	|newMYSUB	|I32 floor|OP *o|OP *proto|OP *attrs|OP *block
-p	|OP *	|my_attrs	|OP *o|OP *attrs
+Apr	|void	|newMYSUB	|I32 floor|OP *o|OP *proto|OP *attrs|OP *block
+p	|OP *	|my_attrs	|NN OP *o|OP *attrs
 p	|void	|boot_core_xsutils
 #if defined(USE_ITHREADS)
 Ap	|PERL_CONTEXT*|cx_dup	|PERL_CONTEXT* cx|I32 ix|I32 max|CLONE_PARAMS* param
@@ -935,32 +939,33 @@ Ap	|PERL_SI*|si_dup	|PERL_SI* si|CLONE_PARAMS* param
 Ap	|ANY*	|ss_dup		|PerlInterpreter* proto_perl|CLONE_PARAMS* param
 Ap	|void*	|any_dup	|void* v|PerlInterpreter* proto_perl
 Ap	|HE*	|he_dup		|HE* e|bool shared|CLONE_PARAMS* param
+Ap	|HEK*	|hek_dup	|HEK* e|CLONE_PARAMS* param
 Ap	|REGEXP*|re_dup		|REGEXP* r|CLONE_PARAMS* param
 Ap	|PerlIO*|fp_dup		|PerlIO* fp|char type|CLONE_PARAMS* param
 Ap	|DIR*	|dirp_dup	|DIR* dp
 Ap	|GP*	|gp_dup		|GP* gp|CLONE_PARAMS* param
 Ap	|MAGIC*	|mg_dup		|MAGIC* mg|CLONE_PARAMS* param
 Ap	|SV*	|sv_dup		|SV* sstr|CLONE_PARAMS* param
-#if defined(HAVE_INTERP_INTERN)
-Ap	|void	|sys_intern_dup	|struct interp_intern* src \
-				|struct interp_intern* dst
-#endif
+Ap	|void	|rvpv_dup	|SV* dstr|SV *sstr|CLONE_PARAMS* param
 Ap	|PTR_TBL_t*|ptr_table_new
-Ap	|void*	|ptr_table_fetch|PTR_TBL_t *tbl|void *sv
-Ap	|void	|ptr_table_store|PTR_TBL_t *tbl|void *oldsv|void *newsv
-Ap	|void	|ptr_table_split|PTR_TBL_t *tbl
+Ap	|void*	|ptr_table_fetch|NN PTR_TBL_t *tbl|NN void *sv
+Ap	|void	|ptr_table_store|NN PTR_TBL_t *tbl|void *oldsv|void *newsv
+Ap	|void	|ptr_table_split|NN PTR_TBL_t *tbl
 Ap	|void	|ptr_table_clear|PTR_TBL_t *tbl
 Ap	|void	|ptr_table_free|PTR_TBL_t *tbl
+#  if defined(HAVE_INTERP_INTERN)
+Ap	|void	|sys_intern_dup	|NN struct interp_intern* src|NN struct interp_intern* dst
+#  endif
 #endif
 #if defined(HAVE_INTERP_INTERN)
 Ap	|void	|sys_intern_clear
 Ap	|void	|sys_intern_init
 #endif
 
-Ap	|char *	|custom_op_name	|OP* op
-Ap	|char *	|custom_op_desc	|OP* op
+Ap	|char *	|custom_op_name	|NN const OP* op
+Ap	|char *	|custom_op_desc	|NN const OP* op
 
-#if defined(PERL_COPY_ON_WRITE)
+#if defined(PERL_OLD_COPY_ON_WRITE)
 pMX	|int	|sv_release_IVX	|SV *sv
 #endif
 
@@ -972,69 +977,110 @@ Adp	|int	|nothreadhook
 END_EXTERN_C
 
 #if defined(PERL_IN_DOOP_C) || defined(PERL_DECL_PROT)
-s	|I32	|do_trans_simple	|SV *sv
-s	|I32	|do_trans_count		|SV *sv
-s	|I32	|do_trans_complex	|SV *sv
-s	|I32	|do_trans_simple_utf8	|SV *sv
-s	|I32	|do_trans_count_utf8	|SV *sv
-s	|I32	|do_trans_complex_utf8	|SV *sv
+s	|I32	|do_trans_simple	|NN SV *sv
+s	|I32	|do_trans_count		|NN SV *sv
+s	|I32	|do_trans_complex	|NN SV *sv
+s	|I32	|do_trans_simple_utf8	|NN SV *sv
+s	|I32	|do_trans_count_utf8	|NN SV *sv
+s	|I32	|do_trans_complex_utf8	|NN SV *sv
 #endif
 
 #if defined(PERL_IN_GV_C) || defined(PERL_DECL_PROT)
 s	|void	|gv_init_sv	|GV *gv|I32 sv_type
-s	|void	|require_errno	|GV *gv
+s	|void	|require_errno	|NN GV *gv
 #endif
 
 #if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT)
 s	|void	|hsplit		|HV *hv
 s	|void	|hfreeentries	|HV *hv
-s	|void	|more_he
-s	|HE*	|new_he
-s	|void	|del_he		|HE *p
-s	|HEK*	|save_hek_flags	|const char *str|I32 len|U32 hash|int flags
-s	|void	|hv_magic_check	|HV *hv|bool *needs_copy|bool *needs_store
-s	|void	|unshare_hek_or_pvn|HEK* hek|const char* sv|I32 len|U32 hash
-s	|HEK*	|share_hek_flags|const char* sv|I32 len|U32 hash|int flags
-s	|void	|hv_notallowed	|int flags|const char *key|I32 klen|const char *msg
+sR	|HE*	|new_he
+s	|void	|del_he		|NN HE *p
+sR	|HEK*	|save_hek_flags	|NN const char *str|I32 len|U32 hash|int flags
+s	|void	|hv_magic_check	|NN HV *hv|NN bool *needs_copy|NN bool *needs_store
+s	|void	|unshare_hek_or_pvn|const HEK* hek|const char* str|I32 len|U32 hash
+sR	|HEK*	|share_hek_flags|const char* sv|I32 len|U32 hash|int flags
+rs	|void	|hv_notallowed	|int flags|NN const char *key|I32 klen|NN const char *msg
+s	|struct xpvhv_aux*|hv_auxinit|HV *hv
 #endif
 
 #if defined(PERL_IN_MG_C) || defined(PERL_DECL_PROT)
-s	|void	|save_magic	|I32 mgs_ix|SV *sv
-s	|int	|magic_methpack	|SV *sv|MAGIC *mg|char *meth
-s	|int	|magic_methcall	|SV *sv|MAGIC *mg|char *meth|I32 f \
+s	|void	|save_magic	|I32 mgs_ix|NN SV *sv
+s	|int	|magic_methpack	|NN SV *sv|NN const MAGIC *mg|NN const char *meth
+s	|int	|magic_methcall	|NN SV *sv|NN const MAGIC *mg|NN const char *meth|I32 f \
 				|int n|SV *val
 #endif
 
 #if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT)
-s	|I32	|list_assignment|OP *o
-s	|void	|bad_type	|I32 n|char *t|char *name|OP *kid
-s	|void	|cop_free	|COP *cop
+pR	|OP*	|ck_anoncode	|NN OP *o
+pR	|OP*	|ck_bitop	|NN OP *o
+pR	|OP*	|ck_concat	|NN OP *o
+pR	|OP*	|ck_defined	|NN OP *o
+pR	|OP*	|ck_delete	|NN OP *o
+pR	|OP*	|ck_die		|NN OP *o
+pR	|OP*	|ck_eof		|NN OP *o
+pR	|OP*	|ck_eval	|NN OP *o
+pR	|OP*	|ck_exec	|NN OP *o
+pR	|OP*	|ck_exists	|NN OP *o
+pR	|OP*	|ck_exit	|NN OP *o
+pR	|OP*	|ck_ftst	|NN OP *o
+pR	|OP*	|ck_fun		|NN OP *o
+pR	|OP*	|ck_glob	|NN OP *o
+pR	|OP*	|ck_grep	|NN OP *o
+pR	|OP*	|ck_index	|NN OP *o
+pR	|OP*	|ck_join	|NN OP *o
+pR	|OP*	|ck_lengthconst	|NN OP *o
+pR	|OP*	|ck_lfun	|NN OP *o
+pR	|OP*	|ck_listiob	|NN OP *o
+pR	|OP*	|ck_match	|NN OP *o
+pR	|OP*	|ck_method	|NN OP *o
+pR	|OP*	|ck_null	|NN OP *o
+pR	|OP*	|ck_open	|NN OP *o
+pR	|OP*	|ck_repeat	|NN OP *o
+pR	|OP*	|ck_require	|NN OP *o
+pR	|OP*	|ck_retarget	|NN OP *o
+pR	|OP*	|ck_return	|NN OP *o
+pR	|OP*	|ck_rfun	|NN OP *o
+pR	|OP*	|ck_rvconst	|NN OP *o
+pR	|OP*	|ck_sassign	|NN OP *o
+pR	|OP*	|ck_select	|NN OP *o
+pR	|OP*	|ck_shift	|NN OP *o
+pR	|OP*	|ck_sort	|NN OP *o
+pR	|OP*	|ck_spair	|NN OP *o
+pR	|OP*	|ck_split	|NN OP *o
+pR	|OP*	|ck_subr	|NN OP *o
+pR	|OP*	|ck_substr	|NN OP *o
+pR	|OP*	|ck_svconst	|NN OP *o
+pR	|OP*	|ck_trunc	|NN OP *o
+pR	|OP*	|ck_unpack	|NN OP *o
+sR	|bool	|is_handle_constructor|NN const OP *o|I32 numargs
+sR	|I32	|is_list_assignment|const OP *o
+s	|void	|cop_free	|NN COP *cop
 s	|OP*	|modkids	|OP *o|I32 type
-s	|void	|no_bareword_allowed|OP *o
-s	|OP*	|no_fh_allowed	|OP *o
-s	|OP*	|scalarboolean	|OP *o
-s	|OP*	|too_few_arguments|OP *o|char* name
-s	|OP*	|too_many_arguments|OP *o|char* name
-s	|OP*	|newDEFSVOP
-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	|bool	|scalar_mod_type|OP *o|I32 type
+s	|OP*	|scalarboolean	|NN OP *o
+sR	|OP*	|newDEFSVOP
+sR	|OP*	|new_logop	|I32 type|I32 flags|NN OP **firstp|NN OP **otherp
+s	|void	|simplify_sort	|NN OP *o
+s	|const char*	|gv_ename	|GV *gv
+s	|bool	|scalar_mod_type|const OP *o|I32 type
 s	|OP *	|my_kid		|OP *o|OP *attrs|OP **imopsp
 s	|OP *	|dup_attrlist	|OP *o
 s	|void	|apply_attrs	|HV *stash|SV *target|OP *attrs|bool for_my
 s	|void	|apply_attrs_my	|HV *stash|OP *target|OP *attrs|OP **imopsp
+s	|void	|bad_type	|I32 n|NN const char *t|NN const char *name|NN const OP *kid
+s	|void	|no_bareword_allowed|NN const OP *o
+sR	|OP*	|no_fh_allowed|NN OP *o
+sR	|OP*	|too_few_arguments|NN OP *o|NN const char* name
+sR	|OP*	|too_many_arguments|NN OP *o|NN const char* name
 #endif
 #if defined(PL_OP_SLAB_ALLOC)
-Ap	|void*	|Slab_Alloc	|int m|size_t sz
+ApR	|void*	|Slab_Alloc	|int m|size_t sz
 Ap	|void	|Slab_Free	|void *op
 #endif
 
 #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT)
 s	|void	|find_beginning
-s	|void	|forbid_setid	|char *
-s	|void	|incpush	|char *|int|int|int
+s	|void	|forbid_setid	|const char * s
+s	|void	|incpush	|const char *dir|bool addsubdirs|bool addoldvers|bool usesep|bool canrelocate
 s	|void	|init_interp
 s	|void	|init_ids
 s	|void	|init_lexer
@@ -1044,22 +1090,16 @@ s	|void	|init_postdump_symbols|int|char **|char **
 s	|void	|init_predump_symbols
 rs	|void	|my_exit_jump
 s	|void	|nuke_stacks
-s	|void	|open_script	|char *|bool|SV *
-s	|void	|usage		|char *
-s	|void	|validate_suid	|char *|char*
+s	|void	|open_script	|const char *scriptname|bool dosearch|SV *sv
+s	|void	|usage		|const char *name
+s	|void	|validate_suid	|const char *validarg|const char *scriptname
 #  if defined(IAMSUID)
 s	|int	|fd_on_nosuid_fs|int fd
 #  endif
 s	|void*	|parse_body	|char **env|XSINIT_t xsinit
-s	|void*	|run_body	|I32 oldscope
-s	|void	|call_body	|OP *myop|int is_eval
+rs	|void	|run_body	|I32 oldscope
+s	|void	|call_body	|const OP *myop|bool is_eval
 s	|void*	|call_list_body	|CV *cv
-#if defined(PERL_FLEXIBLE_EXCEPTIONS)
-s	|void*	|vparse_body	|va_list args
-s	|void*	|vrun_body	|va_list args
-s	|void*	|vcall_body	|va_list args
-s	|void*	|vcall_list_body|va_list args
-#endif
 #endif
 
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
@@ -1067,112 +1107,112 @@ s	|SV*	|refto		|SV* sv
 #endif
 
 #if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT)
-s	|I32	|unpack_rec	|tempsym_t* symptr|char *s|char *strbeg|char *strend|char **new_s
-s	|SV **	|pack_rec	|SV *cat|tempsym_t* symptr|SV **beglist|SV **endlist
-s	|SV*	|mul128		|SV *sv|U8 m
-s	|I32	|measure_struct	|tempsym_t* symptr
-s	|char *	|group_end	|char *pat|char *patend|char ender
-s	|char *	|get_num	|char *ppat|I32 *
-s	|bool	|next_symbol	|tempsym_t* symptr
-s	|void	|doencodes	|SV* sv|char* s|I32 len
-s	|SV*	|is_an_int	|char *s|STRLEN l
-s	|int	|div128		|SV *pnum|bool *done
+s	|I32	|unpack_rec	|struct tempsym* symptr|const char *s|const char *strbeg|const char *strend|const char **new_s
+s	|SV **	|pack_rec	|SV *cat|struct tempsym* symptr|SV **beglist|SV **endlist
+s	|SV*	|mul128		|NN SV *sv|U8 m
+s	|I32	|measure_struct	|NN struct tempsym* symptr
+s	|bool	|next_symbol	|NN struct tempsym* symptr
+sR	|SV*	|is_an_int	|NN const char *s|STRLEN l
+s	|int	|div128		|NN SV *pnum|NN bool *done
+s	|const char *|group_end	|NN const char *pat|NN const char *patend|char ender
+s	|const char *|get_num	|NN const char *ppat|NN I32 *lenptr
 #endif
 
 #if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT)
 s	|OP*	|docatch	|OP *o
 s	|void*	|docatch_body
-#if defined(PERL_FLEXIBLE_EXCEPTIONS)
-s	|void*	|vdocatch_body	|va_list args
-#endif
-s	|OP*	|dofindlabel	|OP *o|char *label|OP **opstack|OP **oplimit
+s	|OP*	|dofindlabel	|OP *o|const char *label|OP **opstack|OP **oplimit
 s	|OP*	|doparseform	|SV *sv
 sn	|bool	|num_overflow	|NV value|I32 fldsize|I32 frcsize
 s	|I32	|dopoptoeval	|I32 startingblock
-s	|I32	|dopoptolabel	|char *label
+s	|I32	|dopoptolabel	|NN const char *label
 s	|I32	|dopoptoloop	|I32 startingblock
 s	|I32	|dopoptosub	|I32 startingblock
 s	|I32	|dopoptosub_at	|PERL_CONTEXT* cxstk|I32 startingblock
 s	|void	|save_lines	|AV *array|SV *sv
 s	|OP*	|doeval		|int gimme|OP** startop|CV* outside|U32 seq
 s	|PerlIO *|doopen_pm	|const char *name|const char *mode
-s	|bool	|path_is_absolute|char *name
+s	|bool	|path_is_absolute|NN const char *name
 #endif
 
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
-s	|void	|do_oddball	|HV *hash|SV **relem|SV **firstrelem
-s	|CV*	|get_db_sub	|SV **svp|CV *cv
-s	|SV*	|method_common	|SV* meth|U32* hashp
+s	|void	|do_oddball	|NN HV *hash|NN SV **relem|NN SV **firstrelem
+sR	|CV*	|get_db_sub	|NN SV **svp|NN CV *cv
+sR	|SV*	|method_common	|NN SV* meth|U32* hashp
 #endif
 
 #if defined(PERL_IN_PP_SYS_C) || defined(PERL_DECL_PROT)
-s	|OP*	|doform		|CV *cv|GV *gv|OP *retop
-s	|int	|emulate_eaccess|const char* path|Mode_t mode
+s	|OP*	|doform		|NN CV *cv|NN GV *gv|NN OP *retop
+sr	|int	|emulate_eaccess|NN const char* path|Mode_t mode
 #  if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
-s	|int	|dooneliner	|char *cmd|char *filename
+sR	|int	|dooneliner	|NN const char *cmd|NN const char *filename
 #  endif
 #endif
 
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_DECL_PROT)
-Es	|regnode*|reg		|struct RExC_state_t*|I32|I32 *
-Es	|regnode*|reganode	|struct RExC_state_t*|U8|U32
-Es	|regnode*|regatom	|struct RExC_state_t*|I32 *
-Es	|regnode*|regbranch	|struct RExC_state_t*|I32 *|I32
-Es	|void	|reguni		|struct RExC_state_t*|UV|char *|STRLEN*
-Es	|regnode*|regclass	|struct RExC_state_t*
-Es	|I32	|regcurly	|char *
-Es	|regnode*|reg_node	|struct RExC_state_t*|U8
-Es	|regnode*|regpiece	|struct RExC_state_t*|I32 *
-Es	|void	|reginsert	|struct RExC_state_t*|U8|regnode *
-Es	|void	|regoptail	|struct RExC_state_t*|regnode *|regnode *
-Es	|void	|regtail	|struct RExC_state_t*|regnode *|regnode *
-Es	|char*|regwhite	|char *|char *
-Es	|char*|nextchar	|struct RExC_state_t*
+Es	|regnode*|reg		|NN struct RExC_state_t *state|I32 paren|NN I32 *flagp
+Es	|regnode*|reganode	|NN struct RExC_state_t *state|U8 op|U32 arg
+Es	|regnode*|regatom	|NN struct RExC_state_t *state|NN I32 *flagp
+Es	|regnode*|regbranch	|NN struct RExC_state_t *state|NN I32 *flagp|I32 first
+Es	|void	|reguni		|NN const struct RExC_state_t *state|UV uv|NN char *s|NN STRLEN *lenp
+Es	|regnode*|regclass	|NN struct RExC_state_t *state
+ERs	|I32	|regcurly	|NN const char *
+Es	|regnode*|reg_node	|NN struct RExC_state_t *state|U8 op
+Es	|regnode*|regpiece	|NN struct RExC_state_t *state|NN I32 *flagp
+Es	|void	|reginsert	|NN struct RExC_state_t *state|U8 op|NN regnode *opnd
+Es	|void	|regoptail	|NN struct RExC_state_t *state|NN regnode *p|NN regnode *val
+Es	|void	|regtail	|NN struct RExC_state_t *state|NN regnode *p|NN regnode *val
+Es	|char*	|regwhite	|NN char *p|NN const char *e
+Es	|char*	|nextchar	|NN struct RExC_state_t*
 #  ifdef DEBUGGING
 Es	|regnode*|dumpuntil	|regnode *start|regnode *node \
 				|regnode *last|SV* sv|I32 l
-Es	|void	|put_byte	|SV* sv|int c
+Es	|void	|put_byte	|NN SV* sv|int c
 #  endif
 Es	|void	|scan_commit	|struct RExC_state_t*|struct scan_data_t *data
-Es	|void	|cl_anything	|struct RExC_state_t*|struct regnode_charclass_class *cl
-Es	|int	|cl_is_anything	|struct regnode_charclass_class *cl
-Es	|void	|cl_init	|struct RExC_state_t*|struct regnode_charclass_class *cl
-Es	|void	|cl_init_zero	|struct RExC_state_t*|struct regnode_charclass_class *cl
-Es	|void	|cl_and		|struct regnode_charclass_class *cl \
-				|struct regnode_charclass_class *and_with
-Es	|void	|cl_or		|struct RExC_state_t*|struct regnode_charclass_class *cl \
-				|struct regnode_charclass_class *or_with
+Es	|void	|cl_anything	|NN struct RExC_state_t*|NN struct regnode_charclass_class *cl
+Es	|int	|cl_is_anything	|NN const struct regnode_charclass_class *cl
+Es	|void	|cl_init	|NN struct RExC_state_t*|NN struct regnode_charclass_class *cl
+Es	|void	|cl_init_zero	|NN struct RExC_state_t*|NN struct regnode_charclass_class *cl
+Es	|void	|cl_and		|NN struct regnode_charclass_class *cl \
+				|const struct regnode_charclass_class *and_with
+Es	|void	|cl_or		|NN struct RExC_state_t*|NN struct regnode_charclass_class *cl \
+				|NN const struct regnode_charclass_class *or_with
 Es	|I32	|study_chunk	|struct RExC_state_t*|regnode **scanp|I32 *deltap \
 				|regnode *last|struct scan_data_t *data \
-				|U32 flags
-Es	|I32	|add_data	|struct RExC_state_t*|I32 n|char *s
-rs	|void|re_croak2	|const char* pat1|const char* pat2|...
+				|U32 flags|U32 depth
+Es	|I32	|add_data	|struct RExC_state_t*|I32 n|const char *s
+rs	|void	|re_croak2	|const char* pat1|const char* pat2|...
 Es	|I32	|regpposixcc	|struct RExC_state_t*|I32 value
 Es	|void	|checkposixcc	|struct RExC_state_t*
+
+Es	|I32	|make_trie	|struct RExC_state_t*|regnode *startbranch \
+				|regnode *first|regnode *last|regnode *tail \
+				|U32 flags
 #endif
 
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
-Es	|I32	|regmatch	|regnode *prog
-Es	|I32	|regrepeat	|regnode *p|I32 max
-Es	|I32	|regrepeat_hard	|regnode *p|I32 max|I32 *lp
-Es	|I32	|regtry		|regexp *prog|char *startpos
-Es	|bool	|reginclass	|regnode *n|U8 *p|STRLEN *lenp|bool do_utf8sv_is_utf8
+ERs	|I32	|regmatch	|NN regnode *prog
+ERs	|I32	|regrepeat	|NN const regnode *p|I32 max
+ERs	|I32	|regrepeat_hard	|NN regnode *p|I32 max|NN I32 *lp
+ERs	|I32	|regtry		|regexp *prog|char *startpos
+ERs	|bool	|reginclass	|NN const regnode *n|NN const U8 *p|STRLEN *lenp|bool do_utf8sv_is_utf8
 Es	|CHECKPOINT|regcppush	|I32 parenfloor
 Es	|char*|regcppop
 Es	|char*|regcp_set_to	|I32 ss
 Es	|void	|cache_re	|regexp *prog
-Es	|U8*	|reghop		|U8 *pos|I32 off
-Es	|U8*	|reghop3	|U8 *pos|I32 off|U8 *lim
-Es	|U8*	|reghopmaybe	|U8 *pos|I32 off
-Es	|U8*	|reghopmaybe3	|U8 *pos|I32 off|U8 *lim
-Es	|char*	|find_byclass	|regexp * prog|regnode *c|char *s|char *strend|char *startpos|I32 norun
-Es	|void	|to_utf8_substr	|regexp * prog
-Es	|void	|to_byte_substr	|regexp * prog
+ERs	|U8*	|reghop		|U8 *pos|I32 off
+ERs	|U8*	|reghop3	|U8 *pos|I32 off|U8 *lim
+ERs	|U8*	|reghopmaybe	|U8 *pos|I32 off
+ERs	|U8*	|reghopmaybe3	|NN U8 *pos|I32 off|NN U8 *lim
+ERs	|char*	|find_byclass	|NN regexp * prog|NN regnode *c|NN char *s|NN const char *strend|I32 norun
+Es	|void	|to_utf8_substr	|NN regexp * prog
+Es	|void	|to_byte_substr	|NN regexp * prog
 #endif
 
 #if defined(PERL_IN_DUMP_C) || defined(PERL_DECL_PROT)
 s	|CV*	|deb_curcv	|I32 ix
-s	|void	|debprof	|OP *o
+s	|void	|debprof	|const OP *o
 #endif
 
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
@@ -1182,20 +1222,6 @@ s	|SV*	|save_scalar_at	|SV **sptr
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 s	|IV	|asIV		|SV* sv
 s	|UV	|asUV		|SV* sv
-s	|SV*	|more_sv
-s	|void	|more_xiv
-s	|void	|more_xnv
-s	|void	|more_xpv
-s	|void	|more_xpviv
-s	|void	|more_xpvnv
-s	|void	|more_xpvcv
-s	|void	|more_xpvav
-s	|void	|more_xpvhv
-s	|void	|more_xpvmg
-s	|void	|more_xpvlv
-s	|void	|more_xpvbm
-s	|void	|more_xrv
-s	|XPVIV*	|new_xiv
 s	|XPVNV*	|new_xnv
 s	|XPV*	|new_xpv
 s	|XPVIV*	|new_xpviv
@@ -1204,10 +1230,9 @@ s	|XPVCV*	|new_xpvcv
 s	|XPVAV*	|new_xpvav
 s	|XPVHV*	|new_xpvhv
 s	|XPVMG*	|new_xpvmg
+s	|XPVGV*	|new_xpvgv
 s	|XPVLV*	|new_xpvlv
 s	|XPVBM*	|new_xpvbm
-s	|XRV*	|new_xrv
-s	|void	|del_xiv	|XPVIV* p
 s	|void	|del_xnv	|XPVNV* p
 s	|void	|del_xpv	|XPV* p
 s	|void	|del_xpviv	|XPVIV* p
@@ -1216,30 +1241,36 @@ s	|void	|del_xpvcv	|XPVCV* p
 s	|void	|del_xpvav	|XPVAV* p
 s	|void	|del_xpvhv	|XPVHV* p
 s	|void	|del_xpvmg	|XPVMG* p
+s	|void	|del_xpvgv	|XPVGV* p
 s	|void	|del_xpvlv	|XPVLV* p
 s	|void	|del_xpvbm	|XPVBM* p
-s	|void	|del_xrv	|XRV* p
 s	|void	|sv_unglob	|SV* sv
 s	|void	|not_a_number	|SV *sv
 s	|I32	|visit		|SVFUNC_t f|U32 flags|U32 mask
 s	|void	|sv_add_backref	|SV *tsv|SV *sv
 s	|void	|sv_del_backref	|SV *sv
+s	|SV *	|varname	|GV *gv|NN const char *gvtype|PADOFFSET targ \
+				|SV *keyname|I32 aindex|int subscript_type
 #  ifdef DEBUGGING
 s	|void	|del_sv	|SV *p
 #  endif
 #  if !defined(NV_PRESERVES_UV)
 s	|int	|sv_2iuv_non_preserve	|SV *sv|I32 numtype
 #  endif
-s	|I32	|expect_number	|char** pattern
+sR	|I32	|expect_number	|NN char** pattern
 #
 #  if defined(USE_ITHREADS)
 s	|SV*	|gv_share	|SV *sv|CLONE_PARAMS *param
 #  endif
-s	|bool	|utf8_mg_pos	|SV *sv|MAGIC **mgp|STRLEN **cachep|I32 i|I32 *offsetp|I32 uoff|U8 **sp|U8 *start|U8 *send
-s	|bool	|utf8_mg_pos_init	|SV *sv|MAGIC **mgp|STRLEN **cachep|I32 i|I32 *offsetp|U8 *s|U8 *start
-#if defined(PERL_COPY_ON_WRITE)
-sM	|void	|sv_release_COW	|SV *sv|char *pvx|STRLEN cur|STRLEN len \
-				|U32 hash|SV *after
+s	|bool	|utf8_mg_pos	|NN SV *sv|NN MAGIC **mgp|NN STRLEN **cachep \
+				|I32 i|NN I32 *offsetp|I32 uoff \
+				|NN const U8 **sp|NN const U8 *start \
+				|NN const U8 *send
+s	|bool	|utf8_mg_pos_init	|NN SV *sv|NN MAGIC **mgp \
+				|NN STRLEN **cachep|I32 i|I32 offsetp \
+				|NN const U8 *s|NN const U8 *start
+#if defined(PERL_OLD_COPY_ON_WRITE)
+sM	|void	|sv_release_COW	|SV *sv|const char *pvx|STRLEN len|SV *after
 #endif
 #endif
 
@@ -1251,10 +1282,10 @@ s	|char*	|force_word	|char *start|int token|int check_keyword \
 				|int allow_pack|int allow_tick
 s	|SV*	|tokeq		|SV *sv
 s	|int	|pending_ident
-s	|char*	|scan_const	|char *start
-s	|char*	|scan_formline	|char *s
-s	|char*	|scan_heredoc	|char *s
-s	|char*	|scan_ident	|char *s|char *send|char *dest \
+s	|char*	|scan_const	|NN char *start
+s	|char*	|scan_formline	|NN char *s
+s	|char*	|scan_heredoc	|NN char *s
+s	|char*	|scan_ident	|NN char *s|NN const char *send|NN char *dest \
 				|STRLEN destlen|I32 ck_uni
 s	|char*	|scan_inputsymbol|char *start
 s	|char*	|scan_pat	|char *start|I32 type
@@ -1265,28 +1296,28 @@ s	|char*	|scan_word	|char *s|char *dest|STRLEN destlen \
 				|int allow_package|STRLEN *slp
 s	|char*	|skipspace	|char *s
 s	|char*	|swallow_bom	|U8 *s
-s	|void	|checkcomma	|char *s|char *name|char *what
-s	|void	|force_ident	|char *s|int kind
+s	|void	|checkcomma	|NN char *s|NN const char *name|NN const char *what
+s	|void	|force_ident	|const 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|int x|char *s
-s	|void	|missingterm	|char *s
-s	|void	|no_op		|char *what|char *s
+rs	|void	|missingterm	|char *s
+s	|void	|no_op		|const char *what|char *s
 s	|void	|set_csh
 s	|I32	|sublex_done
 s	|I32	|sublex_push
 s	|I32	|sublex_start
 s	|char *	|filter_gets	|SV *sv|PerlIO *fp|STRLEN append
-s	|HV *	|find_in_my_stash|char *pkgname|I32 len
-s	|SV*	|new_constant	|char *s|STRLEN len|const char *key|SV *sv \
+s	|HV *	|find_in_my_stash|const char *pkgname|I32 len
+s	|SV*	|new_constant	|const char *s|STRLEN len|const char *key|SV *sv \
 				|SV *pv|const char *type
 #  if defined(DEBUGGING)
-s	|void	|tokereport	|char *thing|char *s|I32 rv
+s	|int	|tokereport	|const char *s|I32 rv
 #  endif
 s	|int	|ao		|int toketype
 s	|void	|depcom
-s	|char*	|incl_perldb
+s	|const char*|incl_perldb
 #if 0
 s	|I32	|utf16_textfilter|int idx|SV *sv|int maxlen
 s	|I32	|utf16rev_textfilter|int idx|SV *sv|int maxlen
@@ -1301,8 +1332,10 @@ s	|SV*|isa_lookup	|HV *stash|const char *name|HV *name_stash|int len|int level
 #endif
 
 #if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
+#if defined(USE_LOCALE_NUMERIC) || defined(USE_LOCALE_COLLATE)
 s	|char*	|stdize_locale	|char* locs
 #endif
+#endif
 
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
 s	|COP*	|closest_cop	|COP *cop|OP *o
@@ -1313,42 +1346,45 @@ s	|SV*	|mess_alloc
 sn	|NV|mulexp10	|NV value|I32 exponent
 #endif
 
+#if defined(PERL_IN_UTF8_C) || defined(PERL_DECL_PROT)
+s	|STRLEN	|is_utf8_char_slow|NN const U8 *s|const STRLEN len
+#endif
+
 START_EXTERN_C
 
-Apd	|void	|sv_setsv_flags	|SV* dsv|SV* ssv|I32 flags
-Apd	|void	|sv_catpvn_flags|SV* sv|const char* ptr|STRLEN len|I32 flags
-Apd	|void	|sv_catsv_flags	|SV* dsv|SV* ssv|I32 flags
-Apd	|STRLEN	|sv_utf8_upgrade_flags|SV *sv|I32 flags
+Apd	|void	|sv_setsv_flags	|NN SV* dsv|SV* ssv|I32 flags
+Apd	|void	|sv_catpvn_flags|NN SV* sv|NN const char* ptr|STRLEN len|I32 flags
+Apd	|void	|sv_catsv_flags	|NN SV* dsv|SV* ssv|I32 flags
+Apd	|STRLEN	|sv_utf8_upgrade_flags|NN SV *sv|I32 flags
 Apd	|char*	|sv_pvn_force_flags|SV* sv|STRLEN* lp|I32 flags
-Apd	|char*	|sv_2pv_flags	|SV* sv|STRLEN* lp|I32 flags
-Apd	|void	|sv_copypv	|SV* dsv|SV* ssv
-Ap	|char*	|my_atof2	|const char *s|NV* value
+Apd	|void	|sv_copypv	|NN SV* dsv|NN SV* ssv
+Ap	|char*	|my_atof2	|NN const char *s|NN NV* value
 Apn	|int	|my_socketpair	|int family|int type|int protocol|int fd[2]
-#ifdef PERL_COPY_ON_WRITE
+#ifdef PERL_OLD_COPY_ON_WRITE
 pMXE	|SV*	|sv_setsv_cow	|SV* dsv|SV* ssv
 #endif
 
 #if defined(USE_PERLIO) && !defined(USE_SFIO)
-Ap	|int	|PerlIO_close		|PerlIO *
-Ap	|int	|PerlIO_fill		|PerlIO *
-Ap	|int	|PerlIO_fileno		|PerlIO *
-Ap	|int	|PerlIO_eof		|PerlIO *
-Ap	|int	|PerlIO_error		|PerlIO *
-Ap	|int	|PerlIO_flush		|PerlIO *
-Ap	|void	|PerlIO_clearerr	|PerlIO *
-Ap	|void	|PerlIO_set_cnt		|PerlIO *|int
-Ap	|void	|PerlIO_set_ptrcnt	|PerlIO *|STDCHAR *|int
-Ap	|void	|PerlIO_setlinebuf	|PerlIO *
-Ap	|SSize_t|PerlIO_read		|PerlIO *|void *|Size_t
-Ap	|SSize_t|PerlIO_write		|PerlIO *|const void *|Size_t
-Ap	|SSize_t|PerlIO_unread		|PerlIO *|const void *|Size_t
-Ap	|Off_t	|PerlIO_tell		|PerlIO *
-Ap	|int	|PerlIO_seek		|PerlIO *|Off_t|int
+Ap	|int	|PerlIO_close		|PerlIO *f
+Ap	|int	|PerlIO_fill		|PerlIO *f
+Ap	|int	|PerlIO_fileno		|PerlIO *f
+Ap	|int	|PerlIO_eof		|PerlIO *f
+Ap	|int	|PerlIO_error		|PerlIO *f
+Ap	|int	|PerlIO_flush		|PerlIO *f
+Ap	|void	|PerlIO_clearerr	|PerlIO *f
+Ap	|void	|PerlIO_set_cnt		|PerlIO *f|int cnt
+Ap	|void	|PerlIO_set_ptrcnt	|PerlIO *f|NN STDCHAR *ptr|int cnt
+Ap	|void	|PerlIO_setlinebuf	|PerlIO *f
+Ap	|SSize_t|PerlIO_read		|PerlIO *f|NN void *buf|Size_t count
+Ap	|SSize_t|PerlIO_write		|PerlIO *f|NN const void *buf|Size_t count
+Ap	|SSize_t|PerlIO_unread		|PerlIO *f|NN const void *buf|Size_t count
+Ap	|Off_t	|PerlIO_tell		|PerlIO *f
+Ap	|int	|PerlIO_seek		|PerlIO *f|Off_t offset|int whence
 
-Ap	|STDCHAR *|PerlIO_get_base	|PerlIO *
-Ap	|STDCHAR *|PerlIO_get_ptr	|PerlIO *
-Ap	|int	  |PerlIO_get_bufsiz	|PerlIO *
-Ap	|int	  |PerlIO_get_cnt	|PerlIO *
+Ap	|STDCHAR *|PerlIO_get_base	|PerlIO *f
+Ap	|STDCHAR *|PerlIO_get_ptr	|PerlIO *f
+Ap	|int	  |PerlIO_get_bufsiz	|PerlIO *f
+Ap	|int	  |PerlIO_get_cnt	|PerlIO *f
 
 Ap	|PerlIO *|PerlIO_stdin
 Ap	|PerlIO *|PerlIO_stdout
@@ -1361,49 +1397,57 @@ s	|void	|deb_stack_n	|SV** stack_base|I32 stack_min \
 				|I32 stack_max|I32 mark_min|I32 mark_max
 #endif
 
-pd	|PADLIST*|pad_new	|int flags
+pda	|PADLIST*|pad_new	|int flags
 pd	|void	|pad_undef	|CV* cv
-pd	|PADOFFSET|pad_add_name	|char *name\
+pd	|PADOFFSET|pad_add_name	|NN const char *name\
 				|HV* typestash|HV* ourstash \
 				|bool clone
 pd	|PADOFFSET|pad_add_anon	|SV* sv|OPCODE op_type
-pd	|void	|pad_check_dup	|char* name|bool is_our|HV* ourstash
+pd	|void	|pad_check_dup	|NN const char* name|bool is_our|NN const HV* ourstash
 #ifdef DEBUGGING
-pd	|void	|pad_setsv	|PADOFFSET po|SV* sv
+pd	|void	|pad_setsv	|PADOFFSET po|NN SV* sv
 #endif
 pd	|void	|pad_block_start|int full
 pd	|void	|pad_tidy	|padtidy_type type
-pd 	|void	|do_dump_pad	|I32 level|PerlIO *file \
-				|PADLIST *padlist|int full
-pd	|void	|pad_fixup_inner_anons|PADLIST *padlist|CV *old_cv|CV *new_cv
+pd 	|void	|do_dump_pad	|I32 level|NN PerlIO *file|PADLIST *padlist|int full
+pd	|void	|pad_fixup_inner_anons|NN PADLIST *padlist|CV *old_cv|CV *new_cv
 
-pd	|void	|pad_push	|PADLIST *padlist|int depth|int has_args
+pd	|void	|pad_push	|NN PADLIST *padlist|int depth
+p	|HV*	|pad_compname_type|const PADOFFSET po
 
 #if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT)
-sd	|PADOFFSET|pad_findlex	|char *name|CV* cv|U32 seq|int warn \
+sd	|PADOFFSET|pad_findlex	|const char *name|const CV* cv|U32 seq|int warn \
 				|SV** out_capture|SV** out_name_sv \
 				|int *out_flags
 #  if defined(DEBUGGING)
-sd	|void	|cv_dump	|CV *cv|char *title
+sd	|void	|cv_dump	|NN const CV *cv|NN const char *title
 #  endif
 #endif
-pd 	|CV*	|find_runcv	|U32 *db_seqp
+pdR	|CV*	|find_runcv	|U32 *db_seqp
 p	|void	|free_tied_hv_pool
 #if defined(DEBUGGING)
-p	|int	|get_debug_opts	|char **s
+p	|int	|get_debug_opts	|const char **s|bool givehelp
 #endif
 Ap	|void	|save_set_svflags|SV* sv|U32 mask|U32 val
-Apod	|void	|hv_assert	|HV* tb
+Apod	|void	|hv_assert	|NN HV* tb
 
 #if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT)
 sM	|SV*	|hv_delete_common|HV* tb|SV* key_sv|const char* key|STRLEN klen|int k_flags|I32 d_flags|U32 hash
 sM	|HE*	|hv_fetch_common|HV* tb|SV* key_sv|const char* key|STRLEN klen|int flags|int action|SV* val|U32 hash
 #endif
 
-Apd	|void	|hv_clear_placeholders|HV* hb
+ApdR	|SV*	|hv_scalar	|NN HV* hv
+ApoR	|I32*	|hv_riter_p	|NN HV* hv
+ApoR	|HE**	|hv_eiter_p	|NN HV* hv
+Apo	|void	|hv_riter_set	|NN HV* hv|I32 riter
+Apo	|void	|hv_eiter_set	|NN HV* hv|HE* eiter
+Apo	|void	|hv_name_set	|NN HV* hv|const char *name|I32 len|int flags
+Apd	|void	|hv_clear_placeholders	|NN HV* hb
+ApoR	|I32*	|hv_placeholders_p	|NN HV* hv
+ApoR	|I32	|hv_placeholders_get	|NN HV* hv
+Apo	|void	|hv_placeholders_set	|NN HV* hv|I32 ph
 
-Apd	|SV*	|hv_scalar	|HV* hv|
-p	|SV*	|magic_scalarpack|HV* hv|MAGIC*	mg
+p	|SV*	|magic_scalarpack|NN HV* hv|NN MAGIC* mg
 #ifdef PERL_IN_SV_C
 sMd	|SV*	|find_uninit_var|OP* obase|SV* uninit_sv|bool top
 #endif
@@ -1484,4 +1528,13 @@ np	|long	|my_betohl	|long n
 
 np	|void	|my_swabn	|void* ptr|int n
 
+Ap	|GV*	|gv_fetchpvn_flags|const char* name|STRLEN len|I32 flags|I32 sv_type
+Ap	|GV*	|gv_fetchsv|SV *name|I32 flags|I32 sv_type
+dpR	|bool	|is_gv_magical_sv|SV *name|U32 flags
+
+Apd	|char*	|savesvpv	|SV* sv
+
 END_EXTERN_C
+/*
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */