X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/37bd1396ea9d91e675e031705a61835c0083b20a..ca6e1c26e8ac218f83b0cec7616cb26dab979947:/embed.pl

diff --git a/embed.pl b/embed.pl
index 63d5fdd..952e673 100755
--- a/embed.pl
+++ b/embed.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
-require 5.003;
+require 5.003;	# keep this compatible, an old perl is all we may have before
+                # we build the new one
 
 #
 # See database of global and static function prototypes at the __END__.
@@ -31,6 +32,7 @@ sub walk_table (&@) {
     seek DATA, $END, 0;		# so we may restart
     while (<DATA>) {
 	chomp;
+	next if /^:/;
 	while (s|\\$||) {
 	    $_ .= <DATA>;
 	    chomp;
@@ -106,8 +108,7 @@ sub write_protos {
     my $ret = "";
     if (@_ == 1) {
 	my $arg = shift;
-	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifdef|else|endif)\b/
-	    or $arg =~ /^\s*(public|protected|private):/;
+	$ret .= "$arg\n";
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
@@ -116,7 +117,7 @@ sub write_protos {
 	    $func = "S_$func";
 	}
 	else {
-	    $retval = "VIRTUAL $retval";
+	    $retval = "PERL_CALLCONV $retval";
 	    if ($flags =~ /p/) {
 		$func = "Perl_$func";
 	    }
@@ -134,17 +135,25 @@ sub write_protos {
 	}
 	$ret .= ")";
 	$ret .= " __attribute__((noreturn))" if $flags =~ /r/;
+	if( $flags =~ /f/ ) { 
+	    my $prefix = $flags =~ /n/ ? '' : 'pTHX_';
+	    my $args = scalar @args; 
+	    $ret .= "\n#ifdef CHECK_FORMAT\n";
+	    $ret .= sprintf " __attribute__((format(printf,%s%d,%s%d)))",
+				    $prefix, $args - 1, $prefix, $args; 
+	    $ret .= "\n#endif\n";
+	}
 	$ret .= ";\n";
     }
     $ret;
 }
 
-# generates global.sym, and populates %global with global symbols
+# generates global.sym (API export list), and populates %global with global symbols
 sub write_global_sym {
     my $ret = "";
     if (@_ > 1) {
 	my ($flags,$retval,$func,@args) = @_;
-	unless ($flags =~ /s/) {
+	if ($flags =~ /A/ && $flags !~ /x/) { # public API, so export
 	    $func = "Perl_$func" if $flags =~ /p/;
 	    $ret = "$func\n";
 	}
@@ -251,7 +260,7 @@ sub hide ($$) {
     "#define $from" . "\t" x ($t < 3 ? 3 - $t : 1) . "$to\n";
 }
 
-sub objxsub_var ($$) {
+sub bincompat_var ($$) {
     my ($pfx, $sym) = @_;
     my $arg = ($pfx eq 'G' ? 'NULL' : 'aTHXo');
     undefine("PL_$sym") . hide("PL_$sym", "(*Perl_${pfx}${sym}_ptr($arg))");
@@ -302,7 +311,6 @@ print EM <<'END';
 #  define  Perl_safesysrealloc		Perl_saferealloc
 #  define  Perl_set_numeric_local	perl_set_numeric_local
 #  define  Perl_set_numeric_standard	perl_set_numeric_standard
-#  define  PERL_POLLUTE
 /* malloc() pollution was the default in earlier versions, so enable
  * it for bincompat; but not for systems that used to do prevent that,
  * or when they ask for {HIDE,EMBED}MYMALLOC */
@@ -325,7 +333,7 @@ walk_table {
     my $ret = "";
     if (@_ == 1) {
 	my $arg = shift;
-	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifdef|else|endif)\b/;
+	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifn?def|else|endif)\b/;
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
@@ -358,7 +366,7 @@ walk_table {
     my $ret = "";
     if (@_ == 1) {
 	my $arg = shift;
-	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifdef|else|endif)\b/;
+	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifn?def|else|endif)\b/;
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
@@ -418,20 +426,20 @@ walk_table {
     my $ret = "";
     if (@_ == 1) {
 	my $arg = shift;
-	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifdef|else|endif)\b/;
+	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifn?def|else|endif)\b/;
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
 	if ($flags =~ /s/) {
-	    $ret .= hide("S_$func","CPerlObj::S_$func");
+	    $ret .= hide("S_$func","CPerlObj::S_$func") if $flags !~ /j/;
 	    $ret .= hide($func,"S_$func");
 	}
 	elsif ($flags =~ /p/) {
-	    $ret .= hide("Perl_$func","CPerlObj::Perl_$func");
+	    $ret .= hide("Perl_$func","CPerlObj::Perl_$func") if $flags !~ /j/;
 	    $ret .= hide($func,"Perl_$func");
 	}
 	else {
-	    $ret .= hide($func,"CPerlObj::$func");
+	    $ret .= hide($func,"CPerlObj::$func") if $flags !~ /j/;
 	}
     }
     $ret;
@@ -452,8 +460,8 @@ print EM <<'END';
  */
 
 #if !defined(PERL_CORE)
-#  define sv_setptrobj(rv,ptr,name)	sv_setref_iv(rv,name,(IV)ptr)
-#  define sv_setptrref(rv,ptr)		sv_setref_iv(rv,Nullch,(IV)ptr)
+#  define sv_setptrobj(rv,ptr,name)	sv_setref_iv(rv,name,PTR2IV(ptr))
+#  define sv_setptrref(rv,ptr)		sv_setref_iv(rv,Nullch,PTR2IV(ptr))
 #endif
 
 #if !defined(PERL_CORE) && !defined(PERL_NOCOMPAT) && !defined(PERL_BINCOMPAT_5005)
@@ -464,23 +472,23 @@ print EM <<'END';
    The following are not like that, but since they had a "perl_"
    prefix in previous versions, we provide compatibility macros.
  */
-#  define perl_atexit			call_atexit
-#  define perl_call_argv		call_argv
-#  define perl_call_pv			call_pv
-#  define perl_call_method		call_method
-#  define perl_call_sv			call_sv
-#  define perl_eval_sv			eval_sv
-#  define perl_eval_pv			eval_pv
-#  define perl_require_pv		require_pv
-#  define perl_get_sv			get_sv
-#  define perl_get_av			get_av
-#  define perl_get_hv			get_hv
-#  define perl_get_cv			get_cv
-#  define perl_init_i18nl10n		init_i18nl10n
-#  define perl_init_i18nl14n		init_i18nl14n
-#  define perl_new_ctype		new_ctype
-#  define perl_new_collate		new_collate
-#  define perl_new_numeric		new_numeric
+#  define perl_atexit(a,b)		call_atexit(a,b)
+#  define perl_call_argv(a,b,c)		call_argv(a,b,c)
+#  define perl_call_pv(a,b)		call_pv(a,b)
+#  define perl_call_method(a,b)		call_method(a,b)
+#  define perl_call_sv(a,b)		call_sv(a,b)
+#  define perl_eval_sv(a,b)		eval_sv(a,b)
+#  define perl_eval_pv(a,b)		eval_pv(a,b)
+#  define perl_require_pv(a)		require_pv(a)
+#  define perl_get_sv(a,b)		get_sv(a,b)
+#  define perl_get_av(a,b)		get_av(a,b)
+#  define perl_get_hv(a,b)		get_hv(a,b)
+#  define perl_get_cv(a,b)		get_cv(a,b)
+#  define perl_init_i18nl10n(a)		init_i18nl10n(a)
+#  define perl_init_i18nl14n(a)		init_i18nl14n(a)
+#  define perl_new_ctype(a)		new_ctype(a)
+#  define perl_new_collate(a)		new_collate(a)
+#  define perl_new_numeric(a)		new_numeric(a)
 
 /* varargs functions can't be handled with CPP macros. :-(
    This provides a set of compatibility functions that don't take
@@ -492,6 +500,7 @@ print EM <<'END';
 #  define deb				Perl_deb_nocontext
 #  define die				Perl_die_nocontext
 #  define form				Perl_form_nocontext
+#  define mess				Perl_mess_nocontext
 #  define newSVpvf			Perl_newSVpvf_nocontext
 #  define sv_catpvf			Perl_sv_catpvf_nocontext
 #  define sv_setpvf			Perl_sv_setpvf_nocontext
@@ -509,6 +518,7 @@ print EM <<'END';
 #  define Perl_die_nocontext		Perl_die
 #  define Perl_deb_nocontext		Perl_deb
 #  define Perl_form_nocontext		Perl_form
+#  define Perl_mess_nocontext		Perl_mess
 #  define Perl_newSVpvf_nocontext	Perl_newSVpvf
 #  define Perl_sv_catpvf_nocontext	Perl_sv_catpvf
 #  define Perl_sv_setpvf_nocontext	Perl_sv_setpvf
@@ -596,7 +606,26 @@ print EM <<'END';
 #  endif	/* USE_THREADS */
 
 #else	/* !MULTIPLICITY */
-/* cases 1, 4 and 6 above */
+
+#  if defined(PERL_OBJECT)
+/* case 6 above */
+
+END
+
+for $sym (sort keys %thread) {
+    print EM multon($sym,'T','aTHXo->interp.');
+}
+
+
+for $sym (sort keys %intrp) {
+    print EM multon($sym,'I','aTHXo->interp.');
+}
+
+print EM <<'END';
+
+#  else	/* !PERL_OBJECT */
+
+/* cases 1 and 4 above */
 
 END
 
@@ -606,7 +635,7 @@ for $sym (sort keys %intrp) {
 
 print EM <<'END';
 
-#  if defined(USE_THREADS)
+#    if defined(USE_THREADS)
 /* case 4 above */
 
 END
@@ -617,8 +646,8 @@ for $sym (sort keys %thread) {
 
 print EM <<'END';
 
-#  else		/* !USE_THREADS */
-/* cases 1 and 6 above */
+#    else	/* !USE_THREADS */
+/* case 1 above */
 
 END
 
@@ -628,7 +657,8 @@ for $sym (sort keys %thread) {
 
 print EM <<'END';
 
-#  endif	/* USE_THREADS */
+#    endif	/* USE_THREADS */
+#  endif	/* PERL_OBJECT */
 #endif	/* MULTIPLICITY */
 
 #if defined(PERL_GLOBAL_STRUCT)
@@ -681,27 +711,9 @@ print OBX <<'EOT';
 #ifndef __objXSUB_h__
 #define __objXSUB_h__
 
-/* Variables */
+/* method calls via pPerl (static functions without a "this" pointer need these) */
 
-EOT
-
-foreach my $sym (sort keys %intrp) {
-    print OBX objxsub_var('I',$sym);
-}
-
-foreach my $sym (sort keys %thread) {
-    print OBX objxsub_var('T',$sym);
-}
-
-foreach my $sym (sort keys %globvar) {
-    print OBX objxsub_var('G',$sym);
-}
-
-print OBX <<'EOT';
-
-/* Functions */
-
-#if defined(PERL_OBJECT)
+#if defined(PERL_CORE) && defined(PERL_OBJECT)
 
 /* XXX soon to be eliminated, only a few things in PERLCORE need these now */
 
@@ -711,11 +723,11 @@ walk_table {
     my $ret = "";
     if (@_ == 1) {
 	my $arg = shift;
-	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifdef|else|endif)\b/;
+	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifn?def|else|endif)\b/;
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
-	unless ($flags =~ /s/) {
+	if ($flags =~ /A/ && $flags !~ /j/) { # API function needing macros
 	    if ($flags =~ /p/) {
 		$ret .= undefine("Perl_$func") . hide("Perl_$func","pPerl->Perl_$func");
 		$ret .= undefine($func) . hide($func,"Perl_$func");
@@ -728,15 +740,16 @@ walk_table {
     $ret;
 } \*OBX;
 
-for $sym (sort keys %ppsym) {
-    $sym =~ s/^Perl_//;
-    print OBX undefine("Perl_$sym") . hide("Perl_$sym", "pPerl->Perl_$sym");
-    print OBX undefine($sym) . hide($sym, "Perl_$sym");
-}
+# NOTE: not part of API
+#for $sym (sort keys %ppsym) {
+#    $sym =~ s/^Perl_//;
+#    print OBX undefine("Perl_$sym") . hide("Perl_$sym", "pPerl->Perl_$sym");
+#    print OBX undefine($sym) . hide($sym, "Perl_$sym");
+#}
 
 print OBX <<'EOT';
 
-#endif  /* PERL_OBJECT */
+#endif  /* PERL_CORE && PERL_OBJECT */
 #endif	/* __objXSUB_h__ */
 EOT
 
@@ -754,8 +767,10 @@ print CAPIH <<'EOT';
 */
 
 /* declare accessor functions for Perl variables */
+#ifndef __perlapi_h__
+#define __perlapi_h__
 
-#if defined(PERL_OBJECT) || defined (PERL_CAPI)
+#if defined(PERL_OBJECT) || defined (MULTIPLICITY)
 
 #if defined(PERL_OBJECT)
 #  undef  aTHXo
@@ -787,10 +802,69 @@ START_EXTERN_C
 
 END_EXTERN_C
 
-#endif /* PERL_OBJECT || PERL_CAPI */
+#if defined(PERL_CORE)
+
+/* accessor functions for Perl variables (provide binary compatibility) */
+
+/* these need to be mentioned here, or most linkers won't put them in
+   the perl executable */
+
+#ifndef PERL_NO_FORCE_LINK
+
+START_EXTERN_C
+
+#ifndef DOINIT
+EXT void *PL_force_link_funcs[];
+#else
+EXT void *PL_force_link_funcs[] = {
+#undef PERLVAR
+#undef PERLVARA
+#undef PERLVARI
+#undef PERLVARIC
+#define PERLVAR(v,t)	(void*)Perl_##v##_ptr,
+#define PERLVARA(v,n,t)	PERLVAR(v,t)
+#define PERLVARI(v,t,i)	PERLVAR(v,t)
+#define PERLVARIC(v,t,i) PERLVAR(v,t)
+
+#include "thrdvar.h"
+#include "intrpvar.h"
+#include "perlvars.h"
+
+#undef PERLVAR
+#undef PERLVARA
+#undef PERLVARI
+#undef PERLVARIC
+};
+#endif	/* DOINIT */
+
+START_EXTERN_C
+
+#endif	/* PERL_NO_FORCE_LINK */
+
+#else	/* !PERL_CORE */
 
 EOT
 
+foreach my $sym (sort keys %intrp) {
+    print CAPIH bincompat_var('I',$sym);
+}
+
+foreach my $sym (sort keys %thread) {
+    print CAPIH bincompat_var('T',$sym);
+}
+
+foreach my $sym (sort keys %globvar) {
+    print CAPIH bincompat_var('G',$sym);
+}
+
+print CAPIH <<'EOT';
+
+#endif /* !PERL_CORE */
+#endif /* PERL_OBJECT || MULTIPLICITY */
+
+#endif /* __perlapi_h__ */
+
+EOT
 
 print CAPI <<'EOT';
 /* !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!! 
@@ -802,7 +876,7 @@ print CAPI <<'EOT';
 #include "perl.h"
 #include "perlapi.h"
 
-#if defined(PERL_OBJECT)
+#if defined(PERL_OBJECT) || defined (MULTIPLICITY)
 
 /* accessor functions for Perl variables (provides binary compatibility) */
 START_EXTERN_C
@@ -811,10 +885,19 @@ START_EXTERN_C
 #undef PERLVARA
 #undef PERLVARI
 #undef PERLVARIC
+
+#if defined(PERL_OBJECT)
 #define PERLVAR(v,t)	t* Perl_##v##_ptr(pTHXo)			\
-			{ return &(aTHXo->PL_##v); }
+			{ return &(aTHXo->interp.v); }
 #define PERLVARA(v,n,t)	PL_##v##_t* Perl_##v##_ptr(pTHXo)		\
-			{ return &(aTHXo->PL_##v); }
+			{ return &(aTHXo->interp.v); }
+#else	/* MULTIPLICITY */
+#define PERLVAR(v,t)	t* Perl_##v##_ptr(pTHX)				\
+			{ return &(aTHX->v); }
+#define PERLVARA(v,n,t)	PL_##v##_t* Perl_##v##_ptr(pTHX)		\
+			{ return &(aTHX->v); }
+#endif
+
 #define PERLVARI(v,t,i)	PERLVAR(v,t)
 #define PERLVARIC(v,t,i) PERLVAR(v, const t)
 
@@ -834,15 +917,21 @@ START_EXTERN_C
 #undef PERLVARI
 #undef PERLVARIC
 
+#if defined(PERL_OBJECT)
+
+/* C-API layer for PERL_OBJECT */
+
 EOT
 
 # functions that take va_list* for implementing vararg functions
+# NOTE: makedef.pl must be updated if you add symbols to %vfuncs
 my %vfuncs = qw(
     Perl_croak			Perl_vcroak
     Perl_warn			Perl_vwarn
     Perl_warner			Perl_vwarner
     Perl_die			Perl_vdie
     Perl_form			Perl_vform
+    Perl_mess			Perl_vmess
     Perl_deb			Perl_vdeb
     Perl_newSVpvf		Perl_vnewSVpvf
     Perl_sv_setpvf		Perl_sv_vsetpvf
@@ -856,7 +945,8 @@ my %vfuncs = qw(
 sub emit_func {
     my ($addcontext, $rettype,$func,@args) = @_;
     my @aargs = @args;
-    for my $a (@aargs) { $a =~ s/^.*\b(\w+)$/$1/ }
+    my $a;
+    for $a (@aargs) { $a =~ s/^.*\b(\w+)$/$1/ }
     my $ctxarg = '';
     if (not $addcontext) {
 	$ctxarg = 'pTHXo';
@@ -871,7 +961,6 @@ sub emit_func {
 		  ? '' : 'return ');
     my $emitval = '';
     if (@args and $args[$#args] =~ /\.\.\./) {
-	pop @args;
 	pop @aargs;
 	my $retarg = '';
 	my $ctxfunc = $func;
@@ -906,7 +995,8 @@ EOT
 }
 
 # XXXX temporary hack
-for my $sym (qw(
+my $sym;
+for $sym (qw(
 		perl_construct
 		perl_destruct
 		perl_free
@@ -921,12 +1011,12 @@ walk_table {
     my $ret = "";
     if (@_ == 1) {
 	my $arg = shift;
-	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifdef|else|endif)\b/;
+	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifn?def|else|endif)\b/;
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
 	return $ret if exists $skipapi_funcs{$func};
-	unless ($flags =~ /s/) {
+	if ($flags =~ /A/ && $flags !~ /j/) { # in public API, needed for XSUBS
 	    $ret .= "\n";
 	    my $addctx = 1 if $flags =~ /n/;
 	    if ($flags =~ /p/) {
@@ -942,17 +1032,18 @@ walk_table {
     $ret;
 } \*CAPI;
 
-for $sym (sort keys %ppsym) {
-    $sym =~ s/^Perl_//;
-    print CAPI "\n";
-    print CAPI undefine("Perl_$sym");
-    if ($sym =~ /^ck_/) {
-	print CAPI emit_func(0, 'OP *',"Perl_$sym",'OP *o');
-    }
-    else {					# pp_foo
-	print CAPI emit_func(0, 'OP *',"Perl_$sym");
-    }
-}
+# NOTE: not part of the API
+#for $sym (sort keys %ppsym) {
+#    $sym =~ s/^Perl_//;
+#    print CAPI "\n";
+#    print CAPI undefine("Perl_$sym");
+#    if ($sym =~ /^ck_/) {
+#	print CAPI emit_func(0, 'OP *',"Perl_$sym",'OP *o');
+#    }
+#   else {					# pp_foo
+#	print CAPI emit_func(0, 'OP *',"Perl_$sym");
+#    }
+#}
 
 print CAPI <<'EOT';
 
@@ -963,133 +1054,389 @@ Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
     dTHXo;
     va_list(arglist);
     va_start(arglist, format);
-    return (*pPerl->PL_StdIO->pVprintf)(pPerl->PL_StdIO, stream, format, arglist);
+    return (*PL_StdIO->pVprintf)(PL_StdIO, stream, format, arglist);
 }
 
 END_EXTERN_C
 
 #endif /* PERL_OBJECT */
+#endif /* PERL_OBJECT || MULTIPLICITY */
 EOT
 
+close(CAPI);
+
+# autogenerate documentation from comments in source files
+
+my %apidocs;
+my %gutsdocs;
+my %docfuncs;
+
+sub autodoc ($) { # parse a file and extract documentation info
+    my($fh) = @_;
+    my($in, $doc);
+
+FUNC:
+    while (defined($in = <$fh>)) {
+	if ($in =~ /^=for\s+apidoc\s+(.*)\n/) {
+	    my $proto = $1;
+	    $proto = "||$proto" unless $proto =~ /\|/;
+	    my($flags, $ret, $name, @args) = split /\|/, $proto;
+	    my $docs = "";
+DOC:
+	    while (defined($doc = <$fh>)) {
+		last DOC if $doc =~ /^=\w+/;
+		$docs .= $doc;
+	    }
+	    $docs = "\n$docs" if $docs and $docs !~ /^\n/;
+	    if ($flags =~ /m/) {
+		if ($flags =~ /A/) {
+		    $apidocs{$name} = [$flags, $docs, $ret, @args];
+		}
+		else {
+		    $gutsdocs{$name} = [$flags, $docs, $ret, @args];
+		}
+	    }
+	    else {
+		$docfuncs{$name} = [$flags, $docs, $ret, @args];
+	    }
+	    if ($doc =~ /^=for/) {
+		$in = $doc;
+		redo FUNC;
+	    }
+	}
+    }
+}
+
+sub docout ($$$) { # output the docs for one function
+    my($fh, $name, $docref) = @_;
+    my($flags, $docs, $ret, @args) = @$docref;
+
+    $docs .= "NOTE: the perl_ form of this function is deprecated.\n\n" 
+	if $flags =~ /p/;
+
+    print $fh "=item $name\n$docs";
+
+    if ($flags =~ /U/) { # no usage
+	# nothing
+    } elsif ($flags =~ /s/) { # semicolon ("dTHR;")
+	print $fh "\t\t$name;\n\n";
+    } elsif ($flags =~ /n/) { # no args
+	print $fh "\t$ret\t$name\n\n";
+    } else { # full usage
+	print $fh "\t$ret\t$name";
+	print $fh "(" . join(", ", @args) . ")";
+	print $fh "\n\n";
+    }
+}
+
+my $file;
+for $file (glob('*.c'), glob('*.h')) {
+    open F, "< $file" or die "Cannot open $file for docs: $!\n";
+    autodoc(\*F);
+    close F or die "Error closing $file: $!\n";
+}
+
+unlink "pod/perlapi.pod";
+open (DOC, ">pod/perlapi.pod") or 
+	die "Can't create pod/perlapi.pod: $!\n";
+
+walk_table {	# load documented functions into approriate hash
+    if (@_ > 1) {
+	my($flags, $retval, $func, @args) = @_;
+	return "" unless $flags =~ /d/;
+	$func =~ s/\t//g; $flags =~ s/p//; # clean up fields from embed.pl
+	$retval =~ s/\t//;
+	if ($flags =~ /A/) {
+	    my $docref = delete $docfuncs{$func};
+	    warn "no docs for $func\n" unless $docref and @$docref;
+	    $apidocs{$func} = [$docref->[0] . 'A', $docref->[1], $retval, @args];
+	} else {
+	    my $docref = delete $docfuncs{$func};
+	    $gutsdocs{$func} = [$docref->[0], $docref->[1], $retval, @args];
+	}
+    }
+    return "";
+} \*DOC;
+
+for (sort keys %docfuncs) {
+    warn "Unable to place $_!\n";
+}
+
+print DOC <<'_EOB_';
+=head1 NAME
+
+perlapi - autogenerated documentation for the perl public API
+
+=head1 DESCRIPTION
+
+This file contains the documentation of the perl public API generated by 
+embed.pl, specifically a listing of functions, macros, flags, and variables 
+that may be used by extension writers.  The interfaces of any functions that 
+are not listed here are subject to change without notice.  For this reason,
+blindly using functions listed in proto.h is to be avoided when writing
+extensions.
+
+Note that all Perl API global variables must be referenced with the C<PL_>
+prefix.  Some macros are provided for compatibility with the older,
+unadorned names, but this support may be disabled in a future release.
+
+The listing is alphabetical, case insensitive.
+
+=over 8
+
+_EOB_
+
+my $key;
+for $key (sort { uc($a) cmp uc($b); } keys %apidocs) { # case insensitive sort
+    docout(\*DOC, $key, $apidocs{$key});
+}
+
+print DOC <<'_EOE_';
+=back
+
+=head1 AUTHORS
+
+Until May 1997, this document was maintained by Jeff Okamoto
+<okamoto@corp.hp.com>.  It is now maintained as part of Perl itself.
+
+With lots of help and suggestions from Dean Roehrich, Malcolm Beattie,
+Andreas Koenig, Paul Hudson, Ilya Zakharevich, Paul Marquess, Neil
+Bowers, Matthew Green, Tim Bunce, Spider Boardman, Ulrich Pfeifer,
+Stephen McCamant, and Gurusamy Sarathy.
+
+API Listing originally by Dean Roehrich <roehrich@cray.com>.
+
+Updated to be autogenerated from comments in the source by Benjamin Stuhl.
+
+=head1 SEE ALSO
+
+perlguts(1), perlxs(1), perlxstut(1), perlintern(1)
+
+_EOE_
+
+
+close(DOC);
+
+open(GUTS, ">pod/perlintern.pod") or 
+		die "Unable to create pod/perlintern.pod: $!\n";
+print GUTS <<'END';
+=head1 NAME
+
+perlintern - autogenerated documentation of purely B<internal> 
+		 Perl functions
+
+=head1 DESCRIPTION
+
+This file is the autogenerated documentation of functions in the 
+Perl intrepreter that are documented using Perl's internal documentation
+format but are not marked as part of the Perl API. In other words, 
+B<they are not for use in extensions>!
+
+=over 8
+
+END
+
+for $key (sort { uc($a) cmp uc($b); } keys %gutsdocs) {
+    docout(\*GUTS, $key, $gutsdocs{$key});
+}
+
+print GUTS <<'END';
+=back
+
+=head1 AUTHORS
+
+The autodocumentation system was orignally added to the Perl core by 
+Benjamin Stuhl. Documentation is by whoever was kind enough to 
+document their functions.
+
+=head1 SEE ALSO
+
+perlguts(1), perlapi(1)
+
+END
+
+close GUTS;
+
+
 __END__
 
-# Lines are of the form:
-#    flags|return_type|function_name|arg1|arg2|...|argN
-#
-# A line may be continued on another by ending it with a backslash.
-# Leading and trailing whitespace will be ignored in each component.
-#
-# flags are single letters with following meanings:
-#	s		static function, should have an S_ prefix in source
-#			file
-#	n		has no implicit interpreter/thread context argument
-#	p		function has a Perl_ prefix
-#	r		function never returns
-#       o		has no compatibility macro (#define foo Perl_foo)
-#
-# Individual flags may be separated by whitespace.
-#
-# New global functions should be added at the end for binary compatibility
-# in some configurations.
-#
-# TODO: 1) Add a flag to mark the functions that are part of the public API.
-#       2) Add a field for documentation, so that L<perlguts/"API LISTING">
-#          may be autogenerated.
-#
+: Lines are of the form:
+:    flags|return_type|function_name|arg1|arg2|...|argN
+:
+: A line may be continued on another by ending it with a backslash.
+: Leading and trailing whitespace will be ignored in each component.
+:
+: flags are single letters with following meanings:
+:	A		member of public API
+:	d		function has documentation with its source
+:	s		static function, should have an S_ prefix in source
+:				file
+:	n		has no implicit interpreter/thread context argument
+:	p		function has a Perl_ prefix
+:	f		function takes printf style format string, varargs
+:	r		function never returns
+:       o		has no compatibility macro (#define foo Perl_foo)
+:       j		not a member of CPerlObj
+:       x		not exported
+:
+: Individual flags may be separated by whitespace.
+:
+: New global functions should be added at the end for binary compatibility
+: in some configurations.
+
+START_EXTERN_C
+
+#if defined(PERL_IMPLICIT_SYS)
+Ajno	|PerlInterpreter*	|perl_alloc_using \
+				|struct IPerlMem* m|struct IPerlMem* ms \
+				|struct IPerlMem* mp|struct IPerlEnv* e \
+				|struct IPerlStdIO* io|struct IPerlLIO* lio \
+				|struct IPerlDir* d|struct IPerlSock* s \
+				|struct IPerlProc* p
+#else
+Ajnod	|PerlInterpreter*	|perl_alloc
+#endif
+Ajnod	|void	|perl_construct	|PerlInterpreter* interp
+Ajnod	|void	|perl_destruct	|PerlInterpreter* interp
+Ajnod	|void	|perl_free	|PerlInterpreter* interp
+Ajnod	|int	|perl_run	|PerlInterpreter* interp
+Ajnod	|int	|perl_parse	|PerlInterpreter* interp|XSINIT_t xsinit \
+				|int argc|char** argv|char** env
+#if defined(USE_ITHREADS)
+: XXX: perl_clone needs docs
+Ajno	|PerlInterpreter*|perl_clone|PerlInterpreter* interp, UV flags
+#  if defined(PERL_IMPLICIT_SYS)
+Ajno	|PerlInterpreter*|perl_clone_using|PerlInterpreter *interp|UV flags \
+				|struct IPerlMem* m|struct IPerlMem* ms \
+				|struct IPerlMem* mp|struct IPerlEnv* e \
+				|struct IPerlStdIO* io|struct IPerlLIO* lio \
+				|struct IPerlDir* d|struct IPerlSock* s \
+				|struct IPerlProc* p
+#  endif
+#endif
+
+#if defined(MYMALLOC)
+Ajnop	|Malloc_t|malloc	|MEM_SIZE nbytes
+Ajnop	|Malloc_t|calloc	|MEM_SIZE elements|MEM_SIZE size
+Ajnop	|Malloc_t|realloc	|Malloc_t where|MEM_SIZE nbytes
+Ajnop	|Free_t	|mfree		|Malloc_t where
+jnp	|MEM_SIZE|malloced_size	|void *p
+#endif
+
+END_EXTERN_C
 
+/* functions with flag 'n' should come before here */
 #if defined(PERL_OBJECT)
+class CPerlObj {
 public:
+	struct interpreter interp;
+	CPerlObj(IPerlMem*, IPerlMem*, IPerlMem*, IPerlEnv*, IPerlStdIO*,
+	    IPerlLIO*, IPerlDir*, IPerlSock*, IPerlProc*);
+	void* operator new(size_t nSize, IPerlMem *pvtbl);
+#ifndef __BORLANDC__
+	static void operator delete(void* pPerl, IPerlMem *pvtbl);
 #endif
-p	|SV*	|amagic_call	|SV* left|SV* right|int method|int dir
-p	|bool	|Gv_AMupdate	|HV* stash
+	int do_aspawn (void *vreally, void **vmark, void **vsp);
+#endif
+#if defined(PERL_OBJECT)
+public:
+#else
+START_EXTERN_C
+#endif
+#  include "pp_proto.h"
+Ap	|SV*	|amagic_call	|SV* left|SV* right|int method|int dir
+Ap	|bool	|Gv_AMupdate	|HV* stash
 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
-p	|bool	|avhv_exists_ent|AV *ar|SV* keysv|U32 hash
-p	|SV**	|avhv_fetch_ent	|AV *ar|SV* keysv|I32 lval|U32 hash
-p	|HE*	|avhv_iternext	|AV *ar
-p	|SV*	|avhv_iterval	|AV *ar|HE* entry
-p	|HV*	|avhv_keys	|AV *ar
-p	|void	|av_clear	|AV* ar
-p	|void	|av_extend	|AV* ar|I32 key
-p	|AV*	|av_fake	|I32 size|SV** svp
-p	|SV**	|av_fetch	|AV* ar|I32 key|I32 lval
-p	|void	|av_fill	|AV* ar|I32 fill
-p	|I32	|av_len		|AV* ar
-p	|AV*	|av_make	|I32 size|SV** svp
-p	|SV*	|av_pop		|AV* ar
-p	|void	|av_push	|AV* ar|SV* val
-p	|void	|av_reify	|AV* ar
-p	|SV*	|av_shift	|AV* ar
-p	|SV**	|av_store	|AV* ar|I32 key|SV* val
-p	|void	|av_undef	|AV* ar
-p	|void	|av_unshift	|AV* ar|I32 num
+Ap	|SV*	|avhv_delete_ent|AV *ar|SV* keysv|I32 flags|U32 hash
+Ap	|bool	|avhv_exists_ent|AV *ar|SV* keysv|U32 hash
+Ap	|SV**	|avhv_fetch_ent	|AV *ar|SV* keysv|I32 lval|U32 hash
+Ap	|HE*	|avhv_iternext	|AV *ar
+Ap	|SV*	|avhv_iterval	|AV *ar|HE* entry
+Ap	|HV*	|avhv_keys	|AV *ar
+Apd	|void	|av_clear	|AV* ar
+Ap	|SV*	|av_delete	|AV* ar|I32 key|I32 flags
+Ap	|bool	|av_exists	|AV* ar|I32 key
+Apd	|void	|av_extend	|AV* ar|I32 key
+Ap	|AV*	|av_fake	|I32 size|SV** svp
+Apd	|SV**	|av_fetch	|AV* ar|I32 key|I32 lval
+Ap	|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
+Apd	|void	|av_push	|AV* ar|SV* val
+Ap	|void	|av_reify	|AV* ar
+Apd	|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
-p	|I32	|block_gimme
+Ap	|I32	|block_gimme
 p	|int	|block_start	|int full
 p	|void	|boot_core_UNIVERSAL
-p	|void	|call_list	|I32 oldscope|AV* av_list
+Ap	|void	|call_list	|I32 oldscope|AV* av_list
 p	|bool	|cando		|Mode_t mode|Uid_t effective|Stat_t* statbufp
-p	|U32	|cast_ulong	|NV f
-p	|I32	|cast_i32	|NV f
-p	|IV	|cast_iv	|NV f
-p	|UV	|cast_uv	|NV f
+Ap	|U32	|cast_ulong	|NV f
+Ap	|I32	|cast_i32	|NV f
+Ap	|IV	|cast_iv	|NV f
+Ap	|UV	|cast_uv	|NV f
 #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP)
-p	|I32	|my_chsize	|int fd|Off_t length
+Ap	|I32	|my_chsize	|int fd|Off_t length
 #endif
 #if defined(USE_THREADS)
-p	|MAGIC*	|condpair_magic	|SV *sv
+Ap	|MAGIC*	|condpair_magic	|SV *sv
 #endif
 p	|OP*	|convert	|I32 optype|I32 flags|OP* o
-pr	|void	|croak		|const char* pat|...
-pr	|void	|vcroak		|const char* pat|va_list* args
+Afprd	|void	|croak		|const char* pat|...
+Apr	|void	|vcroak		|const char* pat|va_list* args
 #if defined(PERL_IMPLICIT_CONTEXT)
-npr	|void	|croak_nocontext|const char* pat|...
-np	|OP*	|die_nocontext	|const char* pat|...
-np	|void	|deb_nocontext	|const char* pat|...
-np	|char*	|form_nocontext	|const char* pat|...
-np	|void	|warn_nocontext	|const char* pat|...
-np	|void	|warner_nocontext|U32 err|const char* pat|...
-np	|SV*	|newSVpvf_nocontext|const char* pat|...
-np	|void	|sv_catpvf_nocontext|SV* sv|const char* pat|...
-np	|void	|sv_setpvf_nocontext|SV* sv|const char* pat|...
-np	|void	|sv_catpvf_mg_nocontext|SV* sv|const char* pat|...
-np	|void	|sv_setpvf_mg_nocontext|SV* sv|const char* pat|...
-np	|int	|fprintf_nocontext|PerlIO* stream|const char* fmt|...
+Afnrp	|void	|croak_nocontext|const char* pat|...
+Afnp	|OP*	|die_nocontext	|const char* pat|...
+Afnp	|void	|deb_nocontext	|const char* pat|...
+Afnp	|char*	|form_nocontext	|const char* pat|...
+Afnp	|SV*	|mess_nocontext	|const char* pat|...
+Afnp	|void	|warn_nocontext	|const char* pat|...
+Afnp	|void	|warner_nocontext|U32 err|const char* pat|...
+Afnp	|SV*	|newSVpvf_nocontext|const char* pat|...
+Afnp	|void	|sv_catpvf_nocontext|SV* sv|const char* pat|...
+Afnp	|void	|sv_setpvf_nocontext|SV* sv|const char* pat|...
+Afnp	|void	|sv_catpvf_mg_nocontext|SV* sv|const char* pat|...
+Afnp	|void	|sv_setpvf_mg_nocontext|SV* sv|const char* pat|...
+Afnp	|int	|fprintf_nocontext|PerlIO* stream|const char* fmt|...
 #endif
 p	|void	|cv_ckproto	|CV* cv|GV* gv|char* p
 p	|CV*	|cv_clone	|CV* proto
 p	|SV*	|cv_const_sv	|CV* cv
 p	|SV*	|op_const_sv	|OP* o|CV* cv
 p	|void	|cv_undef	|CV* cv
-p	|void	|cx_dump	|PERL_CONTEXT* cs
-p	|SV*	|filter_add	|filter_t funcp|SV* datasv
-p	|void	|filter_del	|filter_t funcp
-p	|I32	|filter_read	|int idx|SV* buffer|int maxlen
-p	|char**	|get_op_descs
-p	|char**	|get_op_names
+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
-p	|PPADDR_t*|get_ppaddr
+Ap	|PPADDR_t*|get_ppaddr
 p	|I32	|cxinc
-p	|void	|deb		|const char* pat|...
-p	|void	|vdeb		|const char* pat|va_list* args
-p	|void	|deb_growlevel
-p	|void	|debprofdump
-p	|I32	|debop		|OP* o
-p	|I32	|debstack
-p	|I32	|debstackptrs
-p	|char*	|delimcpy	|char* to|char* toend|char* from \
+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	|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	|OP*	|die		|const char* pat|...
+Afp	|OP*	|die		|const char* pat|...
 p	|OP*	|vdie		|const char* pat|va_list* args
 p	|OP*	|die_where	|char* message|STRLEN msglen
-p	|void	|dounwind	|I32 cxix
+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
-p	|int	|do_binmode	|PerlIO *fp|int iotype|int flag
+Ap	|int	|do_binmode	|PerlIO *fp|int iotype|int flag
 p	|void	|do_chop	|SV* asv|SV* sv
 p	|bool	|do_close	|GV* gv|bool not_implicit
 p	|bool	|do_eof		|GV* gv
@@ -1108,9 +1455,9 @@ p	|I32	|do_shmio	|I32 optype|SV** mark|SV** sp
 #endif
 p	|void	|do_join	|SV* sv|SV* del|SV** mark|SV** sp
 p	|OP*	|do_kv
-p	|bool	|do_open	|GV* gv|char* name|I32 len|int as_raw \
+Ap	|bool	|do_open	|GV* gv|char* name|I32 len|int as_raw \
 				|int rawmode|int rawperm|PerlIO* supplied_fp
-p	|bool	|do_open9	|GV *gv|char *name|I32 len|int as_raw \
+Ap	|bool	|do_open9	|GV *gv|char *name|I32 len|int as_raw \
 				|int rawmode|int rawperm|PerlIO *supplied_fp \
 				|SV *svs|I32 num
 p	|void	|do_pipe	|SV* sv|GV* rgv|GV* wgv
@@ -1126,20 +1473,20 @@ p	|UV	|do_vecget	|SV* sv|I32 offset|I32 size
 p	|void	|do_vecset	|SV* sv
 p	|void	|do_vop		|I32 optype|SV* sv|SV* left|SV* right
 p	|OP*	|dofile		|OP* term
-p	|I32	|dowantarray
-p	|void	|dump_all
-p	|void	|dump_eval
+Ap	|I32	|dowantarray
+Ap	|void	|dump_all
+Ap	|void	|dump_eval
 #if defined(DUMP_FDS)
-p	|void	|dump_fds	|char* s
+Ap	|void	|dump_fds	|char* s
 #endif
-p	|void	|dump_form	|GV* gv
-p	|void	|gv_dump	|GV* gv
-p	|void	|op_dump	|OP* arg
-p	|void	|pmop_dump	|PMOP* pm
-p	|void	|dump_packsubs	|HV* stash
-p	|void	|dump_sub	|GV* gv
-p	|void	|fbm_compile	|SV* sv|U32 flags
-p	|char*	|fbm_instr	|unsigned char* big|unsigned char* bigend \
+Ap	|void	|dump_form	|GV* gv
+Ap	|void	|gv_dump	|GV* gv
+Ap	|void	|op_dump	|OP* arg
+Ap	|void	|pmop_dump	|PMOP* pm
+Ap	|void	|dump_packsubs	|HV* stash
+Ap	|void	|dump_sub	|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
@@ -1148,126 +1495,126 @@ p	|PADOFFSET|find_threadsv|const char *name
 #endif
 p	|OP*	|force_list	|OP* arg
 p	|OP*	|fold_constants	|OP* arg
-p	|char*	|form		|const char* pat|...
-p	|char*	|vform		|const char* pat|va_list* args
-p	|void	|free_tmps
+Afp	|char*	|form		|const char* pat|...
+Ap	|char*	|vform		|const char* pat|va_list* args
+Ap	|void	|free_tmps
 p	|OP*	|gen_constant_list|OP* o
 #if !defined(HAS_GETENV_LEN)
 p	|char*	|getenv_len	|char* key|unsigned long *len
 #endif
-p	|void	|gp_free	|GV* gv
-p	|GP*	|gp_ref		|GP* gp
-p	|GV*	|gv_AVadd	|GV* gv
-p	|GV*	|gv_HVadd	|GV* gv
-p	|GV*	|gv_IOadd	|GV* gv
-p	|GV*	|gv_autoload4	|HV* stash|const char* name|STRLEN len \
+Ap	|void	|gp_free	|GV* gv
+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
-p	|void	|gv_check	|HV* stash
-p	|void	|gv_efullname	|SV* sv|GV* gv
-p	|void	|gv_efullname3	|SV* sv|GV* gv|const char* prefix
-p	|GV*	|gv_fetchfile	|const char* name
-p	|GV*	|gv_fetchmeth	|HV* stash|const char* name|STRLEN len \
+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	|GV*	|gv_fetchfile	|const char* name
+Apd	|GV*	|gv_fetchmeth	|HV* stash|const char* name|STRLEN len \
 				|I32 level
-p	|GV*	|gv_fetchmethod	|HV* stash|const char* name
-p	|GV*	|gv_fetchmethod_autoload|HV* stash|const char* name \
+Apd	|GV*	|gv_fetchmethod	|HV* stash|const char* name
+Apd	|GV*	|gv_fetchmethod_autoload|HV* stash|const char* name \
 				|I32 autoload
-p	|GV*	|gv_fetchpv	|const char* name|I32 add|I32 sv_type
-p	|void	|gv_fullname	|SV* sv|GV* gv
-p	|void	|gv_fullname3	|SV* sv|GV* gv|const char* prefix
-p	|void	|gv_init	|GV* gv|HV* stash|const char* name \
+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_init	|GV* gv|HV* stash|const char* name \
 				|STRLEN len|int multi
-p	|HV*	|gv_stashpv	|const char* name|I32 create
-p	|HV*	|gv_stashpvn	|const char* name|U32 namelen|I32 create
-p	|HV*	|gv_stashsv	|SV* sv|I32 create
-p	|void	|hv_clear	|HV* tb
-p	|void	|hv_delayfree_ent|HV* hv|HE* entry
-p	|SV*	|hv_delete	|HV* tb|const char* key|U32 klen|I32 flags
-p	|SV*	|hv_delete_ent	|HV* tb|SV* key|I32 flags|U32 hash
-p	|bool	|hv_exists	|HV* tb|const char* key|U32 klen
-p	|bool	|hv_exists_ent	|HV* tb|SV* key|U32 hash
-p	|SV**	|hv_fetch	|HV* tb|const char* key|U32 klen|I32 lval
-p	|HE*	|hv_fetch_ent	|HV* tb|SV* key|I32 lval|U32 hash
-p	|void	|hv_free_ent	|HV* hv|HE* entry
-p	|I32	|hv_iterinit	|HV* tb
-p	|char*	|hv_iterkey	|HE* entry|I32* retlen
-p	|SV*	|hv_iterkeysv	|HE* entry
-p	|HE*	|hv_iternext	|HV* tb
-p	|SV*	|hv_iternextsv	|HV* hv|char** key|I32* retlen
-p	|SV*	|hv_iterval	|HV* tb|HE* entry
-p	|void	|hv_ksplit	|HV* hv|IV newmax
-p	|void	|hv_magic	|HV* hv|GV* gv|int how
-p	|SV**	|hv_store	|HV* tb|const char* key|U32 klen|SV* val \
+Apd	|HV*	|gv_stashpv	|const char* name|I32 create
+Ap	|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
+Apd	|SV*	|hv_delete	|HV* tb|const char* key|U32 klen|I32 flags
+Apd	|SV*	|hv_delete_ent	|HV* tb|SV* key|I32 flags|U32 hash
+Apd	|bool	|hv_exists	|HV* tb|const char* key|U32 klen
+Apd	|bool	|hv_exists_ent	|HV* tb|SV* key|U32 hash
+Apd	|SV**	|hv_fetch	|HV* tb|const char* key|U32 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
+Apd	|SV*	|hv_iterval	|HV* tb|HE* entry
+Ap	|void	|hv_ksplit	|HV* hv|IV newmax
+Apd	|void	|hv_magic	|HV* hv|GV* gv|int how
+Apd	|SV**	|hv_store	|HV* tb|const char* key|U32 klen|SV* val \
 				|U32 hash
-p	|HE*	|hv_store_ent	|HV* tb|SV* key|SV* val|U32 hash
-p	|void	|hv_undef	|HV* tb
-p	|I32	|ibcmp		|const char* a|const char* b|I32 len
-p	|I32	|ibcmp_locale	|const char* a|const char* b|I32 len
+Apd	|HE*	|hv_store_ent	|HV* tb|SV* key|SV* val|U32 hash
+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
 p	|bool	|ingroup	|Gid_t testgid|Uid_t effective
 p	|void	|init_debugger
-p	|void	|init_stacks
+Ap	|void	|init_stacks
 p	|U32	|intro_my
-p	|char*	|instr		|const char* big|const char* little
+Ap	|char*	|instr		|const char* big|const char* little
 p	|bool	|io_close	|IO* io|bool not_implicit
 p	|OP*	|invert		|OP* cmd
-p	|bool	|is_uni_alnum	|U32 c
-p	|bool	|is_uni_alnumc	|U32 c
-p	|bool	|is_uni_idfirst	|U32 c
-p	|bool	|is_uni_alpha	|U32 c
-p	|bool	|is_uni_ascii	|U32 c
-p	|bool	|is_uni_space	|U32 c
-p	|bool	|is_uni_cntrl	|U32 c
-p	|bool	|is_uni_graph	|U32 c
-p	|bool	|is_uni_digit	|U32 c
-p	|bool	|is_uni_upper	|U32 c
-p	|bool	|is_uni_lower	|U32 c
-p	|bool	|is_uni_print	|U32 c
-p	|bool	|is_uni_punct	|U32 c
-p	|bool	|is_uni_xdigit	|U32 c
-p	|U32	|to_uni_upper	|U32 c
-p	|U32	|to_uni_title	|U32 c
-p	|U32	|to_uni_lower	|U32 c
-p	|bool	|is_uni_alnum_lc|U32 c
-p	|bool	|is_uni_alnumc_lc|U32 c
-p	|bool	|is_uni_idfirst_lc|U32 c
-p	|bool	|is_uni_alpha_lc|U32 c
-p	|bool	|is_uni_ascii_lc|U32 c
-p	|bool	|is_uni_space_lc|U32 c
-p	|bool	|is_uni_cntrl_lc|U32 c
-p	|bool	|is_uni_graph_lc|U32 c
-p	|bool	|is_uni_digit_lc|U32 c
-p	|bool	|is_uni_upper_lc|U32 c
-p	|bool	|is_uni_lower_lc|U32 c
-p	|bool	|is_uni_print_lc|U32 c
-p	|bool	|is_uni_punct_lc|U32 c
-p	|bool	|is_uni_xdigit_lc|U32 c
-p	|U32	|to_uni_upper_lc|U32 c
-p	|U32	|to_uni_title_lc|U32 c
-p	|U32	|to_uni_lower_lc|U32 c
-p	|bool	|is_utf8_alnum	|U8 *p
-p	|bool	|is_utf8_alnumc	|U8 *p
-p	|bool	|is_utf8_idfirst|U8 *p
-p	|bool	|is_utf8_alpha	|U8 *p
-p	|bool	|is_utf8_ascii	|U8 *p
-p	|bool	|is_utf8_space	|U8 *p
-p	|bool	|is_utf8_cntrl	|U8 *p
-p	|bool	|is_utf8_digit	|U8 *p
-p	|bool	|is_utf8_graph	|U8 *p
-p	|bool	|is_utf8_upper	|U8 *p
-p	|bool	|is_utf8_lower	|U8 *p
-p	|bool	|is_utf8_print	|U8 *p
-p	|bool	|is_utf8_punct	|U8 *p
-p	|bool	|is_utf8_xdigit	|U8 *p
-p	|bool	|is_utf8_mark	|U8 *p
+Ap	|bool	|is_uni_alnum	|U32 c
+Ap	|bool	|is_uni_alnumc	|U32 c
+Ap	|bool	|is_uni_idfirst	|U32 c
+Ap	|bool	|is_uni_alpha	|U32 c
+Ap	|bool	|is_uni_ascii	|U32 c
+Ap	|bool	|is_uni_space	|U32 c
+Ap	|bool	|is_uni_cntrl	|U32 c
+Ap	|bool	|is_uni_graph	|U32 c
+Ap	|bool	|is_uni_digit	|U32 c
+Ap	|bool	|is_uni_upper	|U32 c
+Ap	|bool	|is_uni_lower	|U32 c
+Ap	|bool	|is_uni_print	|U32 c
+Ap	|bool	|is_uni_punct	|U32 c
+Ap	|bool	|is_uni_xdigit	|U32 c
+Ap	|U32	|to_uni_upper	|U32 c
+Ap	|U32	|to_uni_title	|U32 c
+Ap	|U32	|to_uni_lower	|U32 c
+Ap	|bool	|is_uni_alnum_lc|U32 c
+Ap	|bool	|is_uni_alnumc_lc|U32 c
+Ap	|bool	|is_uni_idfirst_lc|U32 c
+Ap	|bool	|is_uni_alpha_lc|U32 c
+Ap	|bool	|is_uni_ascii_lc|U32 c
+Ap	|bool	|is_uni_space_lc|U32 c
+Ap	|bool	|is_uni_cntrl_lc|U32 c
+Ap	|bool	|is_uni_graph_lc|U32 c
+Ap	|bool	|is_uni_digit_lc|U32 c
+Ap	|bool	|is_uni_upper_lc|U32 c
+Ap	|bool	|is_uni_lower_lc|U32 c
+Ap	|bool	|is_uni_print_lc|U32 c
+Ap	|bool	|is_uni_punct_lc|U32 c
+Ap	|bool	|is_uni_xdigit_lc|U32 c
+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_utf8_alnum	|U8 *p
+Ap	|bool	|is_utf8_alnumc	|U8 *p
+Ap	|bool	|is_utf8_idfirst|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
-p	|void	|leave_scope	|I32 base
+Ap	|void	|leave_scope	|I32 base
 p	|void	|lex_end
 p	|void	|lex_start	|SV* line
 p	|OP*	|linklist	|OP* o
 p	|OP*	|list		|OP* o
 p	|OP*	|listkids	|OP* o
 p	|OP*	|localize	|OP* arg|I32 lexical
-p	|I32	|looks_like_number|SV* sv
+Apd	|I32	|looks_like_number|SV* sv
 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
@@ -1319,112 +1666,112 @@ p	|int	|magic_set_all_env|SV* sv|MAGIC* mg
 p	|U32	|magic_sizepack	|SV* sv|MAGIC* mg
 p	|int	|magic_wipepack	|SV* sv|MAGIC* mg
 p	|void	|magicname	|char* sym|char* name|I32 namlen
-#if defined(MYMALLOC)
-np	|MEM_SIZE|malloced_size	|void *p
-#endif
-p	|void	|markstack_grow
+Ap	|void	|markstack_grow
 #if defined(USE_LOCALE_COLLATE)
 p	|char*	|mem_collxfrm	|const char* s|STRLEN len|STRLEN* xlen
 #endif
-p	|SV*	|mess		|const char* pat|va_list* args
-p	|int	|mg_clear	|SV* sv
-p	|int	|mg_copy	|SV* sv|SV* nsv|const char* key|I32 klen
-p	|MAGIC*	|mg_find	|SV* sv|int type
-p	|int	|mg_free	|SV* sv
-p	|int	|mg_get		|SV* sv
-p	|U32	|mg_length	|SV* sv
-p	|void	|mg_magical	|SV* sv
-p	|int	|mg_set		|SV* sv
-p	|I32	|mg_size	|SV* sv
+Afp	|SV*	|mess		|const char* pat|...
+Ap	|SV*	|vmess		|const char* pat|va_list* args
+p	|void	|qerror		|SV* err
+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	|int	|mg_free	|SV* sv
+Apd	|int	|mg_get		|SV* sv
+Apd	|U32	|mg_length	|SV* sv
+Apd	|void	|mg_magical	|SV* sv
+Apd	|int	|mg_set		|SV* sv
+Ap	|I32	|mg_size	|SV* sv
 p	|OP*	|mod		|OP* o|I32 type
-p	|char*	|moreswitches	|char* s
+Ap	|char*	|moreswitches	|char* s
 p	|OP*	|my		|OP* o
-p	|NV	|my_atof	|const char *s
+Ap	|NV	|my_atof	|const char *s
 #if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY)
-p	|char*	|my_bcopy	|const char* from|char* to|I32 len
+Anp	|char*	|my_bcopy	|const char* from|char* to|I32 len
 #endif
 #if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
-p	|char*	|my_bzero	|char* loc|I32 len
+Anp	|char*	|my_bzero	|char* loc|I32 len
 #endif
-pr	|void	|my_exit	|U32 status
-pr	|void	|my_failure_exit
-p	|I32	|my_fflush_all
-p	|I32	|my_lstat
+Apr	|void	|my_exit	|U32 status
+Apr	|void	|my_failure_exit
+Ap	|I32	|my_fflush_all
+Ap	|I32	|my_lstat
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
-p	|I32	|my_memcmp	|const char* s1|const char* s2|I32 len
+Anp	|I32	|my_memcmp	|const char* s1|const char* s2|I32 len
 #endif
 #if !defined(HAS_MEMSET)
-p	|void*	|my_memset	|char* loc|I32 ch|I32 len
+Anp	|void*	|my_memset	|char* loc|I32 ch|I32 len
 #endif
 #if !defined(PERL_OBJECT)
-p	|I32	|my_pclose	|PerlIO* ptr
-p	|PerlIO*|my_popen	|char* cmd|char* mode
+Ap	|I32	|my_pclose	|PerlIO* ptr
+Ap	|PerlIO*|my_popen	|char* cmd|char* mode
 #endif
-p	|void	|my_setenv	|char* nam|char* val
-p	|I32	|my_stat
+Ap	|void	|my_setenv	|char* nam|char* val
+Ap	|I32	|my_stat
 #if defined(MYSWAP)
-p	|short	|my_swap	|short s
-p	|long	|my_htonl	|long l
-p	|long	|my_ntohl	|long l
+Ap	|short	|my_swap	|short s
+Ap	|long	|my_htonl	|long l
+Ap	|long	|my_ntohl	|long l
 #endif
 p	|void	|my_unexec
-p	|OP*	|newANONLIST	|OP* o
-p	|OP*	|newANONHASH	|OP* o
-p	|OP*	|newANONSUB	|I32 floor|OP* proto|OP* block
-p	|OP*	|newASSIGNOP	|I32 flags|OP* left|I32 optype|OP* right
-p	|OP*	|newCONDOP	|I32 flags|OP* expr|OP* trueop|OP* falseop
-p	|void	|newCONSTSUB	|HV* stash|char* name|SV* sv
-p	|void	|newFORM	|I32 floor|OP* o|OP* block
-p	|OP*	|newFOROP	|I32 flags|char* label|line_t forline \
+Ap	|OP*	|newANONLIST	|OP* o
+Ap	|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	|void	|newCONSTSUB	|HV* stash|char* name|SV* sv
+Ap	|void	|newFORM	|I32 floor|OP* o|OP* block
+Ap	|OP*	|newFOROP	|I32 flags|char* label|line_t forline \
 				|OP* sclr|OP* expr|OP*block|OP*cont
-p	|OP*	|newLOGOP	|I32 optype|I32 flags|OP* left|OP* right
-p	|OP*	|newLOOPEX	|I32 type|OP* label
-p	|OP*	|newLOOPOP	|I32 flags|I32 debuggable|OP* expr|OP* block
-p	|OP*	|newNULLLIST
-p	|OP*	|newOP		|I32 optype|I32 flags
-p	|void	|newPROG	|OP* o
-p	|OP*	|newRANGE	|I32 flags|OP* left|OP* right
-p	|OP*	|newSLICEOP	|I32 flags|OP* subscript|OP* listop
-p	|OP*	|newSTATEOP	|I32 flags|char* label|OP* o
-p	|CV*	|newSUB		|I32 floor|OP* o|OP* proto|OP* block
-p	|CV*	|newXS		|char* name|XSUBADDR_t f|char* filename
-p	|AV*	|newAV
-p	|OP*	|newAVREF	|OP* o
-p	|OP*	|newBINOP	|I32 type|I32 flags|OP* first|OP* last
-p	|OP*	|newCVREF	|I32 flags|OP* o
-p	|OP*	|newGVOP	|I32 type|I32 flags|GV* gv
-p	|GV*	|newGVgen	|char* pack
-p	|OP*	|newGVREF	|I32 type|OP* o
-p	|OP*	|newHVREF	|OP* o
-p	|HV*	|newHV
-p	|HV*	|newHVhv	|HV* hv
-p	|IO*	|newIO
-p	|OP*	|newLISTOP	|I32 type|I32 flags|OP* first|OP* last
-p	|OP*	|newPMOP	|I32 type|I32 flags
-p	|OP*	|newPVOP	|I32 type|I32 flags|char* pv
-p	|SV*	|newRV		|SV* pref
-p	|SV*	|newRV_noinc	|SV *sv
-p	|SV*	|newSV		|STRLEN len
-p	|OP*	|newSVREF	|OP* o
-p	|OP*	|newSVOP	|I32 type|I32 flags|SV* sv
-p	|SV*	|newSViv	|IV i
-p	|SV*	|newSVnv	|NV n
-p	|SV*	|newSVpv	|const char* s|STRLEN len
-p	|SV*	|newSVpvn	|const char* s|STRLEN len
-p	|SV*	|newSVpvf	|const char* pat|...
-p	|SV*	|vnewSVpvf	|const char* pat|va_list* args
-p	|SV*	|newSVrv	|SV* rv|const char* classname
-p	|SV*	|newSVsv	|SV* old
-p	|OP*	|newUNOP	|I32 type|I32 flags|OP* first
-p	|OP*	|newWHILEOP	|I32 flags|I32 debuggable|LOOP* loop \
+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
+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
+Ap	|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*	|newSVnv	|NV n
+Apd	|SV*	|newSVpv	|const char* s|STRLEN len
+Apd	|SV*	|newSVpvn	|const char* s|STRLEN len
+Afpd	|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
 
-p	|PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems
+Ap	|PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems
 p	|PerlIO*|nextargv	|GV* gv
-p	|char*	|ninstr		|const char* big|const char* bigend \
+Ap	|char*	|ninstr		|const char* big|const char* bigend \
 				|const char* little|const char* lend
 p	|OP*	|oopsCV		|OP* o
-p	|void	|op_free	|OP* arg
+Ap	|void	|op_free	|OP* arg
 p	|void	|package	|OP* o
 p	|PADOFFSET|pad_alloc	|I32 optype|U32 tmptype
 p	|PADOFFSET|pad_allocmy	|char* name
@@ -1432,78 +1779,70 @@ p	|PADOFFSET|pad_findmy	|char* name
 p	|OP*	|oopsAV		|OP* o
 p	|OP*	|oopsHV		|OP* o
 p	|void	|pad_leavemy	|I32 fill
-p	|SV*	|pad_sv		|PADOFFSET po
+Ap	|SV*	|pad_sv		|PADOFFSET po
 p	|void	|pad_free	|PADOFFSET po
 p	|void	|pad_reset
 p	|void	|pad_swipe	|PADOFFSET po
 p	|void	|peep		|OP* o
 #if defined(PERL_OBJECT)
-no	|void	|perl_construct
-no	|void	|perl_destruct
-no	|void	|perl_free
-no	|int	|perl_run
-no	|int	|perl_parse	|XSINIT_t xsinit \
-				|int argc|char** argv|char** env
-#else
-no	|PerlInterpreter*	|perl_alloc
-no	|void	|perl_construct	|PerlInterpreter* sv_interp
-no	|void	|perl_destruct	|PerlInterpreter* sv_interp
-no	|void	|perl_free	|PerlInterpreter* sv_interp
-no	|int	|perl_run	|PerlInterpreter* sv_interp
-no	|int	|perl_parse	|PerlInterpreter* sv_interp|XSINIT_t xsinit \
+Aox	|void	|Perl_construct
+Aox	|void	|Perl_destruct
+Aox	|void	|Perl_free
+Aox	|int	|Perl_run
+Aox	|int	|Perl_parse	|XSINIT_t xsinit \
 				|int argc|char** argv|char** env
-#if defined(USE_THREADS)
-p	|struct perl_thread*	|new_struct_thread|struct perl_thread *t
 #endif
+#if defined(USE_THREADS)
+Ap	|struct perl_thread*	|new_struct_thread|struct perl_thread *t
 #endif
-p	|void	|call_atexit	|ATEXIT_t fn|void *ptr
-p	|I32	|call_argv	|const char* sub_name|I32 flags|char** argv
-p	|I32	|call_method	|const char* methname|I32 flags
-p	|I32	|call_pv	|const char* sub_name|I32 flags
-p	|I32	|call_sv	|SV* sv|I32 flags
-p	|SV*	|eval_pv	|const char* p|I32 croak_on_error
-p	|I32	|eval_sv	|SV* sv|I32 flags
-p	|SV*	|get_sv		|const char* name|I32 create
-p	|AV*	|get_av		|const char* name|I32 create
-p	|HV*	|get_hv		|const char* name|I32 create
-p	|CV*	|get_cv		|const char* name|I32 create
-p	|int	|init_i18nl10n	|int printwarn
-p	|int	|init_i18nl14n	|int printwarn
-p	|void	|new_collate	|const char* newcoll
-p	|void	|new_ctype	|const char* newctype
-p	|void	|new_numeric	|const char* newcoll
-p	|void	|set_numeric_local
-p	|void	|set_numeric_radix
-p	|void	|set_numeric_standard
-p	|void	|require_pv	|const char* pv
+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_sv	|SV* sv|I32 flags
+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	|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	|const char* newcoll
+Ap	|void	|new_ctype	|const char* newctype
+Ap	|void	|new_numeric	|const char* newcoll
+Ap	|void	|set_numeric_local
+Ap	|void	|set_numeric_radix
+Ap	|void	|set_numeric_standard
+Apd	|void	|require_pv	|const char* pv
 p	|void	|pidgone	|Pid_t pid|int status
-p	|void	|pmflag		|U16* pmfl|int ch
+Ap	|void	|pmflag		|U16* 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
-p	|void	|pop_scope
+Ap	|void	|pop_scope
 p	|OP*	|prepend_elem	|I32 optype|OP* head|OP* tail
 p	|void	|push_return	|OP* o
-p	|void	|push_scope
+Ap	|void	|push_scope
 p	|OP*	|ref		|OP* o|I32 type
 p	|OP*	|refkids	|OP* o|I32 type
-p	|void	|regdump	|regexp* r
-p	|I32	|pregexec	|regexp* prog|char* stringarg \
+Ap	|void	|regdump	|regexp* r
+Ap	|I32	|pregexec	|regexp* prog|char* stringarg \
 				|char* strend|char* strbeg|I32 minend \
 				|SV* screamer|U32 nosave
-p	|void	|pregfree	|struct regexp* r
-p	|regexp*|pregcomp	|char* exp|char* xend|PMOP* pm
-p	|char*	|re_intuit_start|regexp* prog|SV* sv|char* strpos \
+Ap	|void	|pregfree	|struct regexp* r
+Ap	|regexp*|pregcomp	|char* exp|char* xend|PMOP* pm
+Ap	|char*	|re_intuit_start|regexp* prog|SV* sv|char* strpos \
 				|char* strend|U32 flags \
 				|struct re_scream_pos_data_s *data
-p	|SV*	|re_intuit_string|regexp* prog
-p	|I32	|regexec_flags	|regexp* prog|char* stringarg \
+Ap	|SV*	|re_intuit_string|regexp* prog
+Ap	|I32	|regexec_flags	|regexp* prog|char* stringarg \
 				|char* strend|char* strbeg|I32 minend \
 				|SV* screamer|void* data|U32 flags
-p	|regnode*|regnext	|regnode* p
+Ap	|regnode*|regnext	|regnode* p
 p	|void	|regprop	|SV* sv|regnode* o
-p	|void	|repeatcpy	|char* to|const char* from|I32 len|I32 count
-p	|char*	|rninstr	|const char* big|const char* bigend \
+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
 p	|Sighandler_t|rsignal	|int i|Sighandler_t t
 p	|int	|rsignal_restore|int i|Sigsave_t* t
@@ -1515,178 +1854,189 @@ p	|void	|rxres_save	|void** rsp|REGEXP* prx
 #if !defined(HAS_RENAME)
 p	|I32	|same_dirent	|char* a|char* b
 #endif
-p	|char*	|savepv		|const char* sv
-p	|char*	|savepvn	|const char* sv|I32 len
-p	|void	|savestack_grow
-p	|void	|save_aelem	|AV* av|I32 idx|SV **sptr
-p	|I32	|save_alloc	|I32 size|I32 pad
-p	|void	|save_aptr	|AV** aptr
-p	|AV*	|save_ary	|GV* gv
-p	|void	|save_clearsv	|SV** svp
-p	|void	|save_delete	|HV* hv|char* key|I32 klen
-p	|void	|save_destructor|DESTRUCTORFUNC_t f|void* p
-p	|void	|save_freesv	|SV* sv
+Apd	|char*	|savepv		|const char* sv
+Apd	|char*	|savepvn	|const char* sv|I32 len
+Ap	|void	|savestack_grow
+Ap	|void	|save_aelem	|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
+Ap	|void	|save_clearsv	|SV** svp
+Ap	|void	|save_delete	|HV* hv|char* key|I32 klen
+Ap	|void	|save_destructor|DESTRUCTORFUNC_NOCONTEXT_t f|void* p
+Ap	|void	|save_destructor_x|DESTRUCTORFUNC_t f|void* p
+Ap	|void	|save_freesv	|SV* sv
 p	|void	|save_freeop	|OP* o
-p	|void	|save_freepv	|char* pv
-p	|void	|save_generic_svref|SV** sptr
-p	|void	|save_gp	|GV* gv|I32 empty
-p	|HV*	|save_hash	|GV* gv
-p	|void	|save_helem	|HV* hv|SV *key|SV **sptr
-p	|void	|save_hints
-p	|void	|save_hptr	|HV** hptr
-p	|void	|save_I16	|I16* intp
-p	|void	|save_I32	|I32* intp
-p	|void	|save_int	|int* intp
-p	|void	|save_item	|SV* item
-p	|void	|save_iv	|IV* iv
-p	|void	|save_list	|SV** sarg|I32 maxsarg
-p	|void	|save_long	|long* longp
-p	|void	|save_nogv	|GV* gv
+Ap	|void	|save_freepv	|char* pv
+Ap	|void	|save_generic_svref|SV** sptr
+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
+Ap	|void	|save_hptr	|HV** hptr
+Ap	|void	|save_I16	|I16* intp
+Ap	|void	|save_I32	|I32* intp
+Ap	|void	|save_I8	|I8* bytep
+Ap	|void	|save_int	|int* intp
+Ap	|void	|save_item	|SV* item
+Ap	|void	|save_iv	|IV* iv
+Ap	|void	|save_list	|SV** sarg|I32 maxsarg
+Ap	|void	|save_long	|long* longp
+Ap	|void	|save_nogv	|GV* gv
 p	|void	|save_op
-p	|SV*	|save_scalar	|GV* gv
-p	|void	|save_pptr	|char** pptr
-p	|void	|save_re_context
-p	|void	|save_sptr	|SV** sptr
-p	|SV*	|save_svref	|SV** sptr
-p	|SV**	|save_threadsv	|PADOFFSET i
+Ap	|SV*	|save_scalar	|GV* gv
+Ap	|void	|save_pptr	|char** pptr
+Ap	|void	|save_vptr	|void* pptr
+Ap	|void	|save_re_context
+Ap	|void	|save_sptr	|SV** sptr
+Ap	|SV*	|save_svref	|SV** sptr
+Ap	|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
-p	|NV	|scan_bin	|char* start|I32 len|I32* retlen
-p	|NV	|scan_hex	|char* start|I32 len|I32* retlen
-p	|char*	|scan_num	|char* s
-p	|NV	|scan_oct	|char* start|I32 len|I32* retlen
+Ap	|NV	|scan_bin	|char* start|I32 len|I32* retlen
+Ap	|NV	|scan_hex	|char* start|I32 len|I32* retlen
+Ap	|char*	|scan_num	|char* s
+Ap	|NV	|scan_oct	|char* start|I32 len|I32* retlen
 p	|OP*	|scope		|OP* o
-p	|char*	|screaminstr	|SV* bigsv|SV* littlesv|I32 start_shift \
+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
 #endif
 p	|void	|setdefout	|GV* gv
-p	|char*	|sharepvn	|const char* sv|I32 len|U32 hash
+Ap	|char*	|sharepvn	|const char* sv|I32 len|U32 hash
 p	|HEK*	|share_hek	|const char* sv|I32 len|U32 hash
 np	|Signal_t |sighandler	|int sig
-p	|SV**	|stack_grow	|SV** sp|SV**p|int n
-p	|I32	|start_subparse	|I32 is_format|U32 flags
+Ap	|SV**	|stack_grow	|SV** sp|SV**p|int n
+Ap	|I32	|start_subparse	|I32 is_format|U32 flags
 p	|void	|sub_crush_depth|CV* cv
-p	|bool	|sv_2bool	|SV* sv
-p	|CV*	|sv_2cv		|SV* sv|HV** st|GV** gvp|I32 lref
-p	|IO*	|sv_2io		|SV* sv
-p	|IV	|sv_2iv		|SV* sv
-p	|SV*	|sv_2mortal	|SV* sv
-p	|NV	|sv_2nv		|SV* sv
-p	|char*	|sv_2pv		|SV* sv|STRLEN* lp
-p	|UV	|sv_2uv		|SV* sv
-p	|IV	|sv_iv		|SV* sv
-p	|UV	|sv_uv		|SV* sv
-p	|NV	|sv_nv		|SV* sv
-p	|char*	|sv_pvn		|SV *sv|STRLEN *len
-p	|I32	|sv_true	|SV *sv
+Ap	|bool	|sv_2bool	|SV* sv
+Ap	|CV*	|sv_2cv		|SV* sv|HV** st|GV** gvp|I32 lref
+Ap	|IO*	|sv_2io		|SV* sv
+Ap	|IV	|sv_2iv		|SV* sv
+Apd	|SV*	|sv_2mortal	|SV* sv
+Ap	|NV	|sv_2nv		|SV* sv
+Ap	|char*	|sv_2pv		|SV* sv|STRLEN* lp
+Ap	|char*	|sv_2pvutf8	|SV* sv|STRLEN* lp
+Ap	|char*	|sv_2pvbyte	|SV* sv|STRLEN* lp
+Ap	|UV	|sv_2uv		|SV* sv
+Ap	|IV	|sv_iv		|SV* sv
+Ap	|UV	|sv_uv		|SV* sv
+Ap	|NV	|sv_nv		|SV* sv
+Ap	|char*	|sv_pvn		|SV *sv|STRLEN *len
+Ap	|char*	|sv_pvutf8n	|SV *sv|STRLEN *len
+Ap	|char*	|sv_pvbyten	|SV *sv|STRLEN *len
+Ap	|I32	|sv_true	|SV *sv
 p	|void	|sv_add_arena	|char* ptr|U32 size|U32 flags
-p	|int	|sv_backoff	|SV* sv
-p	|SV*	|sv_bless	|SV* sv|HV* stash
-p	|void	|sv_catpvf	|SV* sv|const char* pat|...
-p	|void	|sv_vcatpvf	|SV* sv|const char* pat|va_list* args
-p	|void	|sv_catpv	|SV* sv|const char* ptr
-p	|void	|sv_catpvn	|SV* sv|const char* ptr|STRLEN len
-p	|void	|sv_catsv	|SV* dsv|SV* ssv
-p	|void	|sv_chop	|SV* sv|char* ptr
+Ap	|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
+Apd	|void	|sv_catpvn	|SV* sv|const char* ptr|STRLEN len
+Apd	|void	|sv_catsv	|SV* dsv|SV* ssv
+Apd	|void	|sv_chop	|SV* sv|char* ptr
 p	|void	|sv_clean_all
 p	|void	|sv_clean_objs
-p	|void	|sv_clear	|SV* sv
-p	|I32	|sv_cmp		|SV* sv1|SV* sv2
-p	|I32	|sv_cmp_locale	|SV* sv1|SV* sv2
+Ap	|void	|sv_clear	|SV* sv
+Apd	|I32	|sv_cmp		|SV* sv1|SV* sv2
+Ap	|I32	|sv_cmp_locale	|SV* sv1|SV* sv2
 #if defined(USE_LOCALE_COLLATE)
-p	|char*	|sv_collxfrm	|SV* sv|STRLEN* nxp
+Ap	|char*	|sv_collxfrm	|SV* sv|STRLEN* nxp
 #endif
-p	|OP*	|sv_compile_2op	|SV* sv|OP** startp|char* code|AV** avp
-p	|void	|sv_dec		|SV* sv
-p	|void	|sv_dump	|SV* sv
-p	|bool	|sv_derived_from|SV* sv|const char* name
-p	|I32	|sv_eq		|SV* sv1|SV* sv2
-p	|void	|sv_free	|SV* sv
+Ap	|OP*	|sv_compile_2op	|SV* sv|OP** startp|char* code|AV** avp
+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
+Ap	|void	|sv_free	|SV* sv
 p	|void	|sv_free_arenas
-p	|char*	|sv_gets	|SV* sv|PerlIO* fp|I32 append
-p	|char*	|sv_grow	|SV* sv|STRLEN newlen
-p	|void	|sv_inc		|SV* sv
-p	|void	|sv_insert	|SV* bigsv|STRLEN offset|STRLEN len \
+Ap	|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
-p	|int	|sv_isa		|SV* sv|const char* name
-p	|int	|sv_isobject	|SV* sv
-p	|STRLEN	|sv_len		|SV* sv
-p	|STRLEN	|sv_len_utf8	|SV* sv
-p	|void	|sv_magic	|SV* sv|SV* obj|int how|const char* name \
+Apd	|int	|sv_isa		|SV* sv|const char* name
+Apd	|int	|sv_isobject	|SV* sv
+Apd	|STRLEN	|sv_len		|SV* sv
+Ap	|STRLEN	|sv_len_utf8	|SV* sv
+Apd	|void	|sv_magic	|SV* sv|SV* obj|int how|const char* name \
 				|I32 namlen
-p	|SV*	|sv_mortalcopy	|SV* oldsv
-p	|SV*	|sv_newmortal
-p	|SV*	|sv_newref	|SV* sv
-p	|char*	|sv_peek	|SV* sv
-p	|void	|sv_pos_u2b	|SV* sv|I32* offsetp|I32* lenp
-p	|void	|sv_pos_b2u	|SV* sv|I32* offsetp
-p	|char*	|sv_pvn_force	|SV* sv|STRLEN* lp
-p	|char*	|sv_reftype	|SV* sv|int ob
-p	|void	|sv_replace	|SV* sv|SV* nsv
-p	|void	|sv_report_used
-p	|void	|sv_reset	|char* s|HV* stash
-p	|void	|sv_setpvf	|SV* sv|const char* pat|...
-p	|void	|sv_vsetpvf	|SV* sv|const char* pat|va_list* args
-p	|void	|sv_setiv	|SV* sv|IV num
-p	|void	|sv_setpviv	|SV* sv|IV num
-p	|void	|sv_setuv	|SV* sv|UV num
-p	|void	|sv_setnv	|SV* sv|NV num
-p	|SV*	|sv_setref_iv	|SV* rv|const char* classname|IV iv
-p	|SV*	|sv_setref_nv	|SV* rv|const char* classname|NV nv
-p	|SV*	|sv_setref_pv	|SV* rv|const char* classname|void* pv
-p	|SV*	|sv_setref_pvn	|SV* rv|const char* classname|char* pv \
+Apd	|SV*	|sv_mortalcopy	|SV* oldsv
+Apd	|SV*	|sv_newmortal
+Ap	|SV*	|sv_newref	|SV* sv
+Ap	|char*	|sv_peek	|SV* sv
+Ap	|void	|sv_pos_u2b	|SV* sv|I32* offsetp|I32* lenp
+Ap	|void	|sv_pos_b2u	|SV* sv|I32* offsetp
+Ap	|char*	|sv_pvn_force	|SV* sv|STRLEN* lp
+Ap	|char*	|sv_pvutf8n_force|SV* sv|STRLEN* lp
+Ap	|char*	|sv_pvbyten_force|SV* sv|STRLEN* lp
+Ap	|char*	|sv_reftype	|SV* sv|int ob
+Ap	|void	|sv_replace	|SV* sv|SV* nsv
+Ap	|void	|sv_report_used
+Ap	|void	|sv_reset	|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_setiv	|SV* sv|IV num
+Apd	|void	|sv_setpviv	|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
+Apd	|SV*	|sv_setref_nv	|SV* rv|const char* classname|NV nv
+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
-p	|void	|sv_setpv	|SV* sv|const char* ptr
-p	|void	|sv_setpvn	|SV* sv|const char* ptr|STRLEN len
-p	|void	|sv_setsv	|SV* dsv|SV* ssv
-p	|void	|sv_taint	|SV* sv
-p	|bool	|sv_tainted	|SV* sv
-p	|int	|sv_unmagic	|SV* sv|int type
-p	|void	|sv_unref	|SV* sv
-p	|void	|sv_untaint	|SV* sv
-p	|bool	|sv_upgrade	|SV* sv|U32 mt
-p	|void	|sv_usepvn	|SV* sv|char* ptr|STRLEN len
-p	|void	|sv_vcatpvfn	|SV* sv|const char* pat|STRLEN patlen \
+Apd	|void	|sv_setpv	|SV* sv|const char* ptr
+Apd	|void	|sv_setpvn	|SV* sv|const char* ptr|STRLEN len
+Apd	|void	|sv_setsv	|SV* dsv|SV* ssv
+Ap	|void	|sv_taint	|SV* sv
+Ap	|bool	|sv_tainted	|SV* sv
+Ap	|int	|sv_unmagic	|SV* sv|int type
+Apd	|void	|sv_unref	|SV* sv
+Ap	|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 \
 				|va_list* args|SV** svargs|I32 svmax \
-				|bool *used_locale
-p	|void	|sv_vsetpvfn	|SV* sv|const char* pat|STRLEN patlen \
+				|bool *maybe_tainted
+Apd	|void	|sv_vsetpvfn	|SV* sv|const char* pat|STRLEN patlen \
 				|va_list* args|SV** svargs|I32 svmax \
-				|bool *used_locale
-p	|SV*	|swash_init	|char* pkg|char* name|SV* listsv \
+				|bool *maybe_tainted
+Ap	|SV*	|swash_init	|char* pkg|char* name|SV* listsv \
 				|I32 minbits|I32 none
-p	|UV	|swash_fetch	|SV *sv|U8 *ptr
-p	|void	|taint_env
-p	|void	|taint_proper	|const char* f|char* s
-p	|UV	|to_utf8_lower	|U8 *p
-p	|UV	|to_utf8_upper	|U8 *p
-p	|UV	|to_utf8_title	|U8 *p
+Ap	|UV	|swash_fetch	|SV *sv|U8 *ptr
+Ap	|void	|taint_env
+Ap	|void	|taint_proper	|const char* f|const char* s
+Ap	|UV	|to_utf8_lower	|U8 *p
+Ap	|UV	|to_utf8_upper	|U8 *p
+Ap	|UV	|to_utf8_title	|U8 *p
 #if defined(UNLINK_ALL_VERSIONS)
-p	|I32	|unlnk		|char* f
+Ap	|I32	|unlnk		|char* f
 #endif
 #if defined(USE_THREADS)
-p	|void	|unlock_condpair|void* svv
+Ap	|void	|unlock_condpair|void* svv
 #endif
-p	|void	|unsharepvn	|const char* sv|I32 len|U32 hash
+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* id|OP* arg
-p	|U8*	|utf16_to_utf8	|U16* p|U8 *d|I32 bytelen
-p	|U8*	|utf16_to_utf8_reversed|U16* p|U8 *d|I32 bytelen
-p	|I32	|utf8_distance	|U8 *a|U8 *b
-p	|U8*	|utf8_hop	|U8 *s|I32 off
-p	|UV	|utf8_to_uv	|U8 *s|I32* retlen
-p	|U8*	|uv_to_utf8	|U8 *d|UV uv
+Ap	|U8*	|utf16_to_utf8	|U16* p|U8 *d|I32 bytelen
+Ap	|U8*	|utf16_to_utf8_reversed|U16* p|U8 *d|I32 bytelen
+Ap	|I32	|utf8_distance	|U8 *a|U8 *b
+Ap	|U8*	|utf8_hop	|U8 *s|I32 off
+Ap	|UV	|utf8_to_uv	|U8 *s|I32* retlen
+Ap	|U8*	|uv_to_utf8	|U8 *d|UV uv
 p	|void	|vivify_defelem	|SV* sv
 p	|void	|vivify_ref	|SV* sv|U32 to_what
 p	|I32	|wait4pid	|Pid_t pid|int* statusp|int flags
-p	|void	|warn		|const char* pat|...
-p	|void	|vwarn		|const char* pat|va_list* args
-p	|void	|warner		|U32 err|const char* pat|...
-p	|void	|vwarner	|U32 err|const char* pat|va_list* args
+p	|void	|report_closed_fh|GV *gv|IO *io|const char *func|const char *obj
+p	|void	|report_uninit
+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
 p	|I32	|whichsig	|char* sig
 p	|int	|yyerror	|char* s
@@ -1698,76 +2048,103 @@ p	|int	|yylex
 p	|int	|yyparse
 p	|int	|yywarn		|char* s
 #if defined(MYMALLOC)
-p	|void	|dump_mstats	|char* s
-pno	|Malloc_t|malloc	|MEM_SIZE nbytes
-pno	|Malloc_t|calloc	|MEM_SIZE elements|MEM_SIZE size
-pno	|Malloc_t|realloc	|Malloc_t where|MEM_SIZE nbytes
-pno	|Free_t	|mfree		|Malloc_t where
+Ap	|void	|dump_mstats	|char* s
+Ap	|int	|get_mstats	|perl_mstats_t *buf|int buflen|int level
 #endif
-pn	|Malloc_t|safesysmalloc	|MEM_SIZE nbytes
-pn	|Malloc_t|safesyscalloc	|MEM_SIZE elements|MEM_SIZE size
-pn	|Malloc_t|safesysrealloc|Malloc_t where|MEM_SIZE nbytes
-pn	|Free_t	|safesysfree	|Malloc_t where
+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
+Anp	|Free_t	|safesysfree	|Malloc_t where
 #if defined(LEAKTEST)
-pn	|Malloc_t|safexmalloc	|I32 x|MEM_SIZE size
-pn	|Malloc_t|safexcalloc	|I32 x|MEM_SIZE elements|MEM_SIZE size
-pn	|Malloc_t|safexrealloc	|Malloc_t where|MEM_SIZE size
-pn	|void	|safexfree	|Malloc_t where
+Anp	|Malloc_t|safexmalloc	|I32 x|MEM_SIZE size
+Anp	|Malloc_t|safexcalloc	|I32 x|MEM_SIZE elements|MEM_SIZE size
+Anp	|Malloc_t|safexrealloc	|Malloc_t where|MEM_SIZE size
+Anp	|void	|safexfree	|Malloc_t where
 #endif
 #if defined(PERL_GLOBAL_STRUCT)
-p	|struct perl_vars *|GetVars
+Ap	|struct perl_vars *|GetVars
 #endif
-p	|int	|runops_standard
-p	|int	|runops_debug
-p	|void	|sv_catpvf_mg	|SV *sv|const char* pat|...
-p	|void	|sv_vcatpvf_mg	|SV* sv|const char* pat|va_list* args
-p	|void	|sv_catpv_mg	|SV *sv|const char *ptr
-p	|void	|sv_catpvn_mg	|SV *sv|const char *ptr|STRLEN len
-p	|void	|sv_catsv_mg	|SV *dstr|SV *sstr
-p	|void	|sv_setpvf_mg	|SV *sv|const char* pat|...
-p	|void	|sv_vsetpvf_mg	|SV* sv|const char* pat|va_list* args
-p	|void	|sv_setiv_mg	|SV *sv|IV i
-p	|void	|sv_setpviv_mg	|SV *sv|IV iv
-p	|void	|sv_setuv_mg	|SV *sv|UV u
-p	|void	|sv_setnv_mg	|SV *sv|NV num
-p	|void	|sv_setpv_mg	|SV *sv|const char *ptr
-p	|void	|sv_setpvn_mg	|SV *sv|const char *ptr|STRLEN len
-p	|void	|sv_setsv_mg	|SV *dstr|SV *sstr
-p	|void	|sv_usepvn_mg	|SV *sv|char *ptr|STRLEN len
-p	|MGVTBL*|get_vtbl	|int vtbl_id
+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_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_setiv_mg	|SV *sv|IV i
+Apd	|void	|sv_setpviv_mg	|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
+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
 p	|char*	|pv_display	|SV *sv|char *pv|STRLEN cur|STRLEN len \
 				|STRLEN pvlim
-p	|void	|dump_indent	|I32 level|PerlIO *file|const char* pat|...
-p	|void	|dump_vindent	|I32 level|PerlIO *file|const char* pat \
+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
-p	|void	|do_gv_dump	|I32 level|PerlIO *file|char *name|GV *sv
-p	|void	|do_gvgv_dump	|I32 level|PerlIO *file|char *name|GV *sv
-p	|void	|do_hv_dump	|I32 level|PerlIO *file|char *name|HV *sv
-p	|void	|do_magic_dump	|I32 level|PerlIO *file|MAGIC *mg|I32 nest \
+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 \
 				|I32 maxnest|bool dumpops|STRLEN pvlim
-p	|void	|do_op_dump	|I32 level|PerlIO *file|OP *o
-p	|void	|do_pmop_dump	|I32 level|PerlIO *file|PMOP *pm
-p	|void	|do_sv_dump	|I32 level|PerlIO *file|SV *sv|I32 nest \
+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_sv_dump	|I32 level|PerlIO *file|SV *sv|I32 nest \
 				|I32 maxnest|bool dumpops|STRLEN pvlim
-p	|void	|magic_dump	|MAGIC *mg
-p	|void*	|default_protect|int *excpt|protect_body_t body|...
-p	|void*	|vdefault_protect|int *excpt|protect_body_t body|va_list *args
-p	|void	|reginitcolors
-p	|char*	|sv_2pv_nolen	|SV* sv
-p	|char*	|sv_pv		|SV *sv
-p	|void	|sv_force_normal|SV *sv
-p	|void	|tmps_grow	|I32 n
-p	|SV*	|sv_rvweaken	|SV *sv
+Ap	|void	|magic_dump	|MAGIC *mg
+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
+Ap	|void	|reginitcolors
+Ap	|char*	|sv_2pv_nolen	|SV* sv
+Ap	|char*	|sv_2pvutf8_nolen|SV* sv
+Ap	|char*	|sv_2pvbyte_nolen|SV* sv
+Ap	|char*	|sv_pv		|SV *sv
+Ap	|char*	|sv_pvutf8	|SV *sv
+Ap	|char*	|sv_pvbyte	|SV *sv
+Ap	|void	|sv_force_normal|SV *sv
+Ap	|void	|tmps_grow	|I32 n
+Ap	|SV*	|sv_rvweaken	|SV *sv
 p	|int	|magic_killbackrefs|SV *sv|MAGIC *mg
-p	|OP*	|newANONATTRSUB	|I32 floor|OP *proto|OP *attrs|OP *block
-p	|CV*	|newATTRSUB	|I32 floor|OP *o|OP *proto|OP *attrs|OP *block
-p	|void	|newMYSUB	|I32 floor|OP *o|OP *proto|OP *attrs|OP *block
+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
 p	|void	|boot_core_xsutils
+#if defined(USE_ITHREADS)
+Ap	|PERL_CONTEXT*|cx_dup	|PERL_CONTEXT* cx|I32 ix|I32 max
+Ap	|PERL_SI*|si_dup	|PERL_SI* si
+Ap	|ANY*	|ss_dup		|PerlInterpreter* proto_perl
+Ap	|void*	|any_dup	|void* v|PerlInterpreter* proto_perl
+Ap	|HE*	|he_dup		|HE* e|bool shared
+Ap	|REGEXP*|re_dup		|REGEXP* r
+Ap	|PerlIO*|fp_dup		|PerlIO* fp|char type
+Ap	|DIR*	|dirp_dup	|DIR* dp
+Ap	|GP*	|gp_dup		|GP* gp
+Ap	|MAGIC*	|mg_dup		|MAGIC* mg
+Ap	|SV*	|sv_dup		|SV* sstr
+#if defined(HAVE_INTERP_INTERN)
+Ap	|void	|sys_intern_dup	|struct interp_intern* src \
+				|struct interp_intern* dst
+#endif
+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
+#endif
 
 #if defined(PERL_OBJECT)
 protected:
+#else
+END_EXTERN_C
 #endif
+
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 s	|I32	|avhv_index_sv	|SV* sv
 #endif
@@ -1818,6 +2195,7 @@ s	|OP*	|too_few_arguments|OP *o|char* name
 s	|OP*	|too_many_arguments|OP *o|char* name
 s	|void	|op_clear	|OP* o
 s	|void	|null		|OP* o
+s	|PADOFFSET|pad_addlex	|SV* name
 s	|PADOFFSET|pad_findlex	|char* name|PADOFFSET newoff|U32 seq \
 				|CV* startcv|I32 cx_ix|I32 saweval|U32 flags
 s	|OP*	|newDEFSVOP
@@ -1825,6 +2203,7 @@ s	|OP*	|new_logop	|I32 type|I32 flags|OP **firstp|OP **otherp
 s	|void	|simplify_sort	|OP *o
 s	|bool	|is_handle_constructor	|OP *o|I32 argnum
 s	|char*	|gv_ename	|GV *gv
+s	|void	|cv_dump	|CV *cv
 s	|CV*	|cv_clone2	|CV *proto|CV *outside
 s	|bool	|scalar_mod_type|OP *o|I32 type
 s	|OP *	|my_kid		|OP *o|OP *attrs
@@ -1921,7 +2300,16 @@ s	|char*|regwhite	|char *|char *
 s	|char*|nextchar
 s	|regnode*|dumpuntil	|regnode *start|regnode *node \
 				|regnode *last|SV* sv|I32 l
+s	|void	|put_byte	|SV* sv|int c
 s	|void	|scan_commit	|struct scan_data_t *data
+s	|void	|cl_anything	|struct regnode_charclass_class *cl
+s	|int	|cl_is_anything	|struct regnode_charclass_class *cl
+s	|void	|cl_init	|struct regnode_charclass_class *cl
+s	|void	|cl_init_zero	|struct regnode_charclass_class *cl
+s	|void	|cl_and		|struct regnode_charclass_class *cl \
+				|struct regnode_charclass_class *and_with
+s	|void	|cl_or		|struct regnode_charclass_class *cl \
+				|struct regnode_charclass_class *or_with
 s	|I32	|study_chunk	|regnode **scanp|I32 *deltap \
 				|regnode *last|struct scan_data_t *data \
 				|U32 flags
@@ -1936,7 +2324,7 @@ s	|I32	|regmatch	|regnode *prog
 s	|I32	|regrepeat	|regnode *p|I32 max
 s	|I32	|regrepeat_hard	|regnode *p|I32 max|I32 *lp
 s	|I32	|regtry		|regexp *prog|char *startpos
-s	|bool	|reginclass	|char *p|I32 c
+s	|bool	|reginclass	|regnode *p|I32 c
 s	|bool	|reginclassutf8	|regnode *f|U8* p
 s	|CHECKPOINT|regcppush	|I32 parenfloor
 s	|char*|regcppop
@@ -1944,6 +2332,7 @@ s	|char*|regcp_set_to	|I32 ss
 s	|void	|cache_re	|regexp *prog
 s	|U8*	|reghop		|U8 *pos|I32 off
 s	|U8*	|reghopmaybe	|U8 *pos|I32 off
+s	|char*	|find_byclass	|regexp * prog|regnode *c|char *s|char *strend|char *startpos|I32 norun
 #endif
 
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
@@ -1961,24 +2350,42 @@ 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
+s	|XPVNV*	|new_xpvnv
+s	|XPVCV*	|new_xpvcv
+s	|XPVAV*	|new_xpvav
+s	|XPVHV*	|new_xpvhv
+s	|XPVMG*	|new_xpvmg
+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
+s	|void	|del_xpvnv	|XPVNV* p
+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_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	|void	|visit		|SVFUNC_t f
-#  if defined(PURIFY)
-s	|void	|reg_add	|SV *sv
-s	|void	|reg_remove	|SV *sv
-#  else
-ns	|void*	|my_safemalloc	|MEM_SIZE size
-#  endif
 s	|void	|sv_add_backref	|SV *tsv|SV *sv
 s	|void	|sv_del_backref	|SV *sv
 #  if defined(DEBUGGING)
@@ -2011,7 +2418,7 @@ s	|void	|force_ident	|char *s|int kind
 s	|void	|incline	|char *s
 s	|int	|intuit_method	|char *s|GV *gv
 s	|int	|intuit_more	|char *s
-s	|I32	|lop		|I32 f|expectation x|char *s
+s	|I32	|lop		|I32 f|int x|char *s
 s	|void	|missingterm	|char *s
 s	|void	|no_op		|char *what|char *s
 s	|void	|set_csh
@@ -2019,8 +2426,8 @@ s	|I32	|sublex_done
 s	|I32	|sublex_push
 s	|I32	|sublex_start
 s	|char *	|filter_gets	|SV *sv|PerlIO *fp|STRLEN append
-s	|SV*	|new_constant	|char *s|STRLEN len|char *key|SV *sv \
-				|SV *pv|char *type
+s	|SV*	|new_constant	|char *s|STRLEN len|const char *key|SV *sv \
+				|SV *pv|const char *type
 s	|int	|ao		|int toketype
 s	|void	|depcom
 s	|char*	|incl_perldb
@@ -2029,8 +2436,8 @@ s	|I32	|utf16rev_textfilter|int idx|SV *sv|int maxlen
 #  if defined(CRIPPLED_CC)
 s	|int	|uni		|I32 f|char *s
 #  endif
-#  if defined(WIN32)
-s	|I32	|win32_textfilter	|int idx|SV *sv|int maxlen
+#  if defined(PERL_CR_FILTER)
+s	|I32	|cr_textfilter	|int idx|SV *sv|int maxlen
 #  endif
 #endif
 
@@ -2038,13 +2445,13 @@ s	|I32	|win32_textfilter	|int idx|SV *sv|int maxlen
 s	|SV*|isa_lookup	|HV *stash|const char *name|int len|int level
 #endif
 
-#if defined(PERL_IN_XSUTILS_C) || defined(PERL_DECL_PROT)
-s	|int|modify_SV_attributes|SV *sv|SV **retlist|SV **attrlist|int numattrs
-#endif
-
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
 s	|SV*	|mess_alloc
 #  if defined(LEAKTEST)
 s	|void	|xstat		|int
 #  endif
 #endif
+
+#if defined(PERL_OBJECT)
+};
+#endif