X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/cad2e5aadfceb1a406f657488ea1c699f44a1487..e8347627432a616ec1485de221b2cd8c9e311c8b:/embed.pl

diff --git a/embed.pl b/embed.pl
index ed7f3e4..3466cd1 100755
--- a/embed.pl
+++ b/embed.pl
@@ -31,6 +31,7 @@ sub walk_table (&@) {
     seek DATA, $END, 0;		# so we may restart
     while (<DATA>) {
 	chomp;
+	next if /^:/;
 	while (s|\\$||) {
 	    $_ .= <DATA>;
 	    chomp;
@@ -106,8 +107,7 @@ sub write_protos {
     my $ret = "";
     if (@_ == 1) {
 	my $arg = shift;
-	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifdef|else|endif)\b/
-	    or $arg =~ /^\s*(public|protected|private):/;
+	$ret .= "$arg\n";
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
@@ -116,7 +116,7 @@ sub write_protos {
 	    $func = "S_$func";
 	}
 	else {
-	    $retval = "VIRTUAL $retval";
+	    $retval = "PERL_CALLCONV $retval";
 	    if ($flags =~ /p/) {
 		$func = "Perl_$func";
 	    }
@@ -144,7 +144,7 @@ sub write_global_sym {
     my $ret = "";
     if (@_ > 1) {
 	my ($flags,$retval,$func,@args) = @_;
-	unless ($flags =~ /s/) {
+	unless ($flags =~ /[sx]/) {
 	    $func = "Perl_$func" if $flags =~ /p/;
 	    $ret = "$func\n";
 	}
@@ -218,12 +218,12 @@ sub readvars(\%$$@) {
 	or die "embed.pl: Can't open $file: $!\n";
     while (<FILE>) {
 	s/[ \t]*#.*//;		# Delete comments.
-	if (/PERLVARI?C?\($pre(\w+)/) {
+	if (/PERLVARA?I?C?\($pre(\w+)/) {
 	    my $sym = $1;
 	    $sym = $pre . $sym if $keep_pre;
 	    warn "duplicate symbol $sym while processing $file\n"
 		if exists $$syms{$sym};
-	    $$syms{$sym} = 1;
+	    $$syms{$sym} = $pre || 1;
 	}
     }
     close(FILE);
@@ -235,12 +235,10 @@ my %thread;
 readvars %intrp,  'intrpvar.h','I';
 readvars %thread, 'thrdvar.h','T';
 readvars %globvar, 'perlvars.h','G';
-readvars %objvar, 'intrpvar.h','pi', 1;
 
-foreach my $sym (sort keys %thread)
- {
+foreach my $sym (sort keys %thread) {
   warn "$sym in intrpvar.h as well as thrdvar.h\n" if exists $intrp{$sym};
- }
+}
 
 sub undefine ($) {
     my ($sym) = @_;
@@ -253,21 +251,17 @@ sub hide ($$) {
     "#define $from" . "\t" x ($t < 3 ? 3 - $t : 1) . "$to\n";
 }
 
-sub objxsub_var ($) {
-    my ($sym) = @_;
-    undefine("PL_$sym") . hide("PL_$sym", "pPerl->PL_$sym");
-}
-
-sub embedvar ($) {
-    my ($sym) = @_;
-#   hide($sym, "Perl_$sym");
-    return '';
+sub objxsub_var ($$) {
+    my ($pfx, $sym) = @_;
+    my $arg = ($pfx eq 'G' ? 'NULL' : 'aTHXo');
+    undefine("PL_$sym") . hide("PL_$sym", "(*Perl_${pfx}${sym}_ptr($arg))");
 }
 
 sub multon ($$$) {
     my ($sym,$pre,$ptr) = @_;
     hide("PL_$sym", "($ptr$pre$sym)");
 }
+
 sub multoff ($$) {
     my ($sym,$pre) = @_;
     return hide("PL_$pre$sym", "PL_$sym");
@@ -286,6 +280,39 @@ print EM <<'END';
 
 /* NO_EMBED is no longer supported. i.e. EMBED is always active. */
 
+/* provide binary compatible (but inconsistent) names */
+#if defined(PERL_BINCOMPAT_5005)
+#  define  Perl_call_argv		perl_call_argv
+#  define  Perl_call_method		perl_call_method
+#  define  Perl_call_pv			perl_call_pv
+#  define  Perl_call_sv			perl_call_sv
+#  define  Perl_get_av			perl_get_av
+#  define  Perl_get_cv			perl_get_cv
+#  define  Perl_get_hv			perl_get_hv
+#  define  Perl_get_sv			perl_get_sv
+#  define  Perl_init_i18nl10n		perl_init_i18nl10n
+#  define  Perl_init_i18nl14n		perl_init_i18nl14n
+#  define  Perl_new_collate		perl_new_collate
+#  define  Perl_new_ctype		perl_new_ctype
+#  define  Perl_new_numeric		perl_new_numeric
+#  define  Perl_require_pv		perl_require_pv
+#  define  Perl_safesyscalloc		Perl_safecalloc
+#  define  Perl_safesysfree		Perl_safefree
+#  define  Perl_safesysmalloc		Perl_safemalloc
+#  define  Perl_safesysrealloc		Perl_saferealloc
+#  define  Perl_set_numeric_local	perl_set_numeric_local
+#  define  Perl_set_numeric_standard	perl_set_numeric_standard
+/* 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 */
+#  if !defined(EMBEDMYMALLOC) && !defined(HIDEMYMALLOC)
+#    if !defined(NeXT) && !defined(__NeXT) && !defined(__MACHTEN__) && \
+        !defined(__QNX__)
+#      define  PERL_POLLUTE_MALLOC
+#    endif
+#  endif
+#endif
+
 /* Hide global symbols */
 
 #if !defined(PERL_OBJECT)
@@ -395,15 +422,15 @@ walk_table {
     else {
 	my ($flags,$retval,$func,@args) = @_;
 	if ($flags =~ /s/) {
-	    $ret .= hide("S_$func","CPerlObj::S_$func");
+	    $ret .= hide("S_$func","CPerlObj::S_$func") if $flags !~ /j/;
 	    $ret .= hide($func,"S_$func");
 	}
 	elsif ($flags =~ /p/) {
-	    $ret .= hide("Perl_$func","CPerlObj::Perl_$func");
+	    $ret .= hide("Perl_$func","CPerlObj::Perl_$func") if $flags !~ /j/;
 	    $ret .= hide($func,"Perl_$func");
 	}
 	else {
-	    $ret .= hide($func,"CPerlObj::$func");
+	    $ret .= hide($func,"CPerlObj::$func") if $flags !~ /j/;
 	}
     }
     $ret;
@@ -423,11 +450,12 @@ print EM <<'END';
    disable them.
  */
 
-#if !defined(PERL_CORE) && !defined(PERL_NOCOMPAT)
-
-#  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)
+#if !defined(PERL_CORE)
+#  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)
 
 /* Compatibility for various misnamed functions.  All functions
    in the API that begin with "perl_" (not "Perl_") take an explicit
@@ -435,37 +463,40 @@ 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
    an extra argument but grab the context pointer using the macro
    dTHX.
  */
-#if defined(PERL_IMPLICIT_CONTEXT)
+#if defined(PERL_IMPLICIT_CONTEXT) && !defined(PERL_OBJECT)
 #  define croak				Perl_croak_nocontext
+#  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
 #  define warn				Perl_warn_nocontext
+#  define warner			Perl_warner_nocontext
 #  define sv_catpvf_mg			Perl_sv_catpvf_mg_nocontext
 #  define sv_setpvf_mg			Perl_sv_setpvf_mg_nocontext
 #endif
@@ -476,11 +507,14 @@ print EM <<'END';
 /* undefined symbols, point them back at the usual ones */
 #  define Perl_croak_nocontext		Perl_croak
 #  define Perl_die_nocontext		Perl_die
+#  define Perl_deb_nocontext		Perl_deb
 #  define Perl_form_nocontext		Perl_form
-#  define Perl_newSVpvf_nocontext		Perl_newSVpvf
-#  define Perl_sv_catpvf_nocontext		Perl_sv_catpvf
-#  define Perl_sv_setpvf_nocontext		Perl_sv_setpvf
+#  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
 #  define Perl_warn_nocontext		Perl_warn
+#  define Perl_warner_nocontext		Perl_warner
 #  define Perl_sv_catpvf_mg_nocontext	Perl_sv_catpvf_mg
 #  define Perl_sv_setpvf_mg_nocontext	Perl_sv_setpvf_mg
 #endif
@@ -501,111 +535,124 @@ print EM <<'END';
 
 /* (Doing namespace management portably in C is really gross.) */
 
-/* Put interpreter-specific symbols into a struct? */
-
-#ifdef MULTIPLICITY
-
-#ifndef USE_THREADS
-/* If we do not have threads then per-thread vars are per-interpreter */
+/*
+   The following combinations of MULTIPLICITY, USE_THREADS, PERL_OBJECT
+   and PERL_IMPLICIT_CONTEXT are supported:
+     1) none
+     2) MULTIPLICITY	# supported for compatibility
+     3) MULTIPLICITY && PERL_IMPLICIT_CONTEXT
+     4) USE_THREADS && PERL_IMPLICIT_CONTEXT
+     5) MULTIPLICITY && USE_THREADS && PERL_IMPLICIT_CONTEXT
+     6) PERL_OBJECT && PERL_IMPLICIT_CONTEXT
+
+   All other combinations of these flags are errors.
+
+   #3, #4, #5, and #6 are supported directly, while #2 is a special
+   case of #3 (supported by redefining vTHX appropriately).
+*/
 
-#ifdef PERL_IMPLICIT_CONTEXT
+#if defined(MULTIPLICITY)
+/* cases 2, 3 and 5 above */
 
-/* everything has an implicit context pointer */
+#  if defined(PERL_IMPLICIT_CONTEXT)
+#    define vTHX	aTHX
+#  else
+#    define vTHX	PERL_GET_INTERP
+#  endif
 
 END
 
 for $sym (sort keys %thread) {
-    print EM multon($sym,'T','my_perl->');
+    print EM multon($sym,'T','vTHX->');
 }
 
 print EM <<'END';
 
-#else /* !PERL_IMPLICIT_CONTEXT */
+#  if defined(PERL_OBJECT)
+#    include "error: PERL_OBJECT + MULTIPLICITY don't go together"
+#  endif
 
-/* traditional MULTIPLICITY (intepreter is in a global) */
+#  if defined(USE_THREADS)
+/* case 5 above */
 
 END
 
-
-for $sym (sort keys %thread) {
-    print EM multon($sym,'T','PL_curinterp->');
+for $sym (sort keys %intrp) {
+    print EM multon($sym,'I','PERL_GET_INTERP->');
 }
 
 print EM <<'END';
 
-#endif /* !PERL_IMPLICIT_CONTEXT */
-#endif /* !USE_THREADS */
-
-/* These are always per-interpreter if there is more than one */
+#  else		/* !USE_THREADS */
+/* cases 2 and 3 above */
 
 END
 
 for $sym (sort keys %intrp) {
-    print EM multon($sym,'I','PL_curinterp->');
+    print EM multon($sym,'I','vTHX->');
 }
 
 print EM <<'END';
 
+#  endif	/* USE_THREADS */
+
 #else	/* !MULTIPLICITY */
 
+#  if defined(PERL_OBJECT)
+/* case 6 above */
+
 END
 
-for $sym (sort keys %intrp) {
-    print EM multoff($sym,'I');
+for $sym (sort keys %thread) {
+    print EM multon($sym,'T','aTHXo->interp.');
 }
 
-print EM <<'END';
-
-#ifndef USE_THREADS
 
-END
-
-for $sym (sort keys %thread) {
-    print EM multoff($sym,'T');
+for $sym (sort keys %intrp) {
+    print EM multon($sym,'I','aTHXo->interp.');
 }
 
 print EM <<'END';
 
-#endif /* USE_THREADS */
+#  else	/* !PERL_OBJECT */
 
-/* Hide what would have been interpreter-specific symbols? */
+/* cases 1 and 4 above */
 
 END
 
 for $sym (sort keys %intrp) {
-    print EM embedvar($sym);
+    print EM multoff($sym,'I');
 }
 
 print EM <<'END';
 
-#ifndef USE_THREADS
+#    if defined(USE_THREADS)
+/* case 4 above */
 
 END
 
 for $sym (sort keys %thread) {
-    print EM embedvar($sym);
+    print EM multon($sym,'T','aTHX->');
 }
 
 print EM <<'END';
 
-#endif /* USE_THREADS */
-#endif /* MULTIPLICITY */
-
-/* Now same trickey for per-thread variables */
-
-#ifdef USE_THREADS
+#    else	/* !USE_THREADS */
+/* case 1 above */
 
 END
 
 for $sym (sort keys %thread) {
-    print EM multon($sym,'T','thr->');
+    print EM multoff($sym,'T');
 }
 
 print EM <<'END';
 
-#endif /* USE_THREADS */
+#    endif	/* USE_THREADS */
+#  endif	/* PERL_OBJECT */
+#endif	/* MULTIPLICITY */
 
-#ifdef PERL_GLOBAL_STRUCT
+#if defined(PERL_GLOBAL_STRUCT)
 
 END
 
@@ -625,20 +672,8 @@ for $sym (sort keys %globvar) {
 
 print EM <<'END';
 
-END
-
-for $sym (sort keys %globvar) {
-    print EM embedvar($sym);
-}
-
-print EM <<'END';
-
 #endif /* PERL_GLOBAL_STRUCT */
 
-END
-
-print EM <<'END';
-
 #ifdef PERL_POLLUTE		/* disabled by default in 5.006 */
 
 END
@@ -652,7 +687,6 @@ print EM <<'END';
 #endif /* PERL_POLLUTE */
 END
 
-
 close(EM);
 
 unlink 'objXSUB.h';
@@ -672,18 +706,26 @@ print OBX <<'EOT';
 
 EOT
 
-foreach my $sym (sort(keys(%intrp),
-		      keys(%thread),
-		      keys(%globvar),
-		      keys(%objvar)))
-{
-    print OBX objxsub_var($sym);
+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)
+
+/* XXX soon to be eliminated, only a few things in PERLCORE need these now */
+
 EOT
 
 walk_table {
@@ -694,7 +736,7 @@ walk_table {
     }
     else {
 	my ($flags,$retval,$func,@args) = @_;
-	unless ($flags =~ /s/) {
+	unless ($flags =~ /[js]/) {
 	    if ($flags =~ /p/) {
 		$ret .= undefine("Perl_$func") . hide("Perl_$func","pPerl->Perl_$func");
 		$ret .= undefine($func) . hide($func,"Perl_$func");
@@ -715,46 +757,331 @@ for $sym (sort keys %ppsym) {
 
 print OBX <<'EOT';
 
+#endif  /* PERL_OBJECT */
 #endif	/* __objXSUB_h__ */
 EOT
 
 close(OBX);
 
+unlink 'perlapi.h';
+unlink 'perlapi.c';
+open(CAPI, '> perlapi.c') or die "Can't create perlapi.c: $!\n";
+open(CAPIH, '> perlapi.h') or die "Can't create perlapi.h: $!\n";
+
+print CAPIH <<'EOT';
+/* !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!! 
+   This file is built by embed.pl from data in embed.pl, pp.sym, intrpvar.h,
+   perlvars.h and thrdvar.h.  Any changes made here will be lost!
+*/
+
+/* declare accessor functions for Perl variables */
+
+#if defined(PERL_OBJECT) || defined (PERL_CAPI)
+
+#if defined(PERL_OBJECT)
+#  undef  aTHXo
+#  define aTHXo			pPerl
+#  undef  aTHXo_
+#  define aTHXo_		aTHXo,
+#endif /* PERL_OBJECT */
+
+START_EXTERN_C
+
+#undef PERLVAR
+#undef PERLVARA
+#undef PERLVARI
+#undef PERLVARIC
+#define PERLVAR(v,t)	EXTERN_C t* Perl_##v##_ptr(pTHXo);
+#define PERLVARA(v,n,t)	typedef t PL_##v##_t[n];			\
+			EXTERN_C PL_##v##_t* Perl_##v##_ptr(pTHXo);
+#define PERLVARI(v,t,i)	PERLVAR(v,t)
+#define PERLVARIC(v,t,i) PERLVAR(v, const t)
+
+#include "thrdvar.h"
+#include "intrpvar.h"
+#include "perlvars.h"
+
+#undef PERLVAR
+#undef PERLVARA
+#undef PERLVARI
+#undef PERLVARIC
+
+END_EXTERN_C
+
+#endif /* PERL_OBJECT || PERL_CAPI */
+
+EOT
+
+
+print CAPI <<'EOT';
+/* !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!! 
+   This file is built by embed.pl from data in embed.pl, pp.sym, intrpvar.h,
+   perlvars.h and thrdvar.h.  Any changes made here will be lost!
+*/
+
+#include "EXTERN.h"
+#include "perl.h"
+#include "perlapi.h"
+
+#if defined(PERL_OBJECT)
+
+/* accessor functions for Perl variables (provides binary compatibility) */
+START_EXTERN_C
+
+#undef PERLVAR
+#undef PERLVARA
+#undef PERLVARI
+#undef PERLVARIC
+#define PERLVAR(v,t)	t* Perl_##v##_ptr(pTHXo)			\
+			{ return &(aTHXo->interp.v); }
+#define PERLVARA(v,n,t)	PL_##v##_t* Perl_##v##_ptr(pTHXo)		\
+			{ return &(aTHXo->interp.v); }
+#define PERLVARI(v,t,i)	PERLVAR(v,t)
+#define PERLVARIC(v,t,i) PERLVAR(v, const t)
+
+#include "thrdvar.h"
+#include "intrpvar.h"
+
+#undef PERLVAR
+#undef PERLVARA
+#define PERLVAR(v,t)	t* Perl_##v##_ptr(pTHXo)			\
+			{ return &(PL_##v); }
+#define PERLVARA(v,n,t)	PL_##v##_t* Perl_##v##_ptr(pTHXo)		\
+			{ return &(PL_##v); }
+#include "perlvars.h"
+
+#undef PERLVAR
+#undef PERLVARA
+#undef PERLVARI
+#undef PERLVARIC
+
+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
+    Perl_sv_setpvf_mg		Perl_sv_vsetpvf_mg
+    Perl_sv_catpvf		Perl_sv_vcatpvf
+    Perl_sv_catpvf_mg		Perl_sv_vcatpvf_mg
+    Perl_dump_indent		Perl_dump_vindent
+    Perl_default_protect	Perl_vdefault_protect
+);
+
+sub emit_func {
+    my ($addcontext, $rettype,$func,@args) = @_;
+    my @aargs = @args;
+    for my $a (@aargs) { $a =~ s/^.*\b(\w+)$/$1/ }
+    my $ctxarg = '';
+    if (not $addcontext) {
+	$ctxarg = 'pTHXo';
+	$ctxarg .= '_ ' if @args;
+    }
+    my $decl = '';
+    if ($addcontext) {
+	$decl .= "    dTHXo;\n";
+    }
+    local $" = ', ';
+    my $return = ($rettype =~ /^\s*(void|Free_t|Signal_t)\s*$/
+		  ? '' : 'return ');
+    my $emitval = '';
+    if (@args and $args[$#args] =~ /\.\.\./) {
+	pop @aargs;
+	my $retarg = '';
+	my $ctxfunc = $func;
+	$ctxfunc =~ s/_nocontext$//;
+	return $emitval unless exists $vfuncs{$ctxfunc};
+	if (length $return) {
+	    $decl .= "    $rettype retval;\n";
+	    $retarg .= "retval = ";
+	    $return = "\n    ${return}retval;\n";
+	}
+	$emitval .= <<EOT
+$rettype
+$func($ctxarg@args)
+{
+$decl    va_list args;
+    va_start(args, $aargs[$#aargs]);
+    $retarg((CPerlObj*)pPerl)->$vfuncs{$ctxfunc}(@aargs, &args);
+    va_end(args);$return
+}
+EOT
+    }
+    else {
+	$emitval .= <<EOT
+$rettype
+$func($ctxarg@args)
+{
+$decl    $return((CPerlObj*)pPerl)->$func(@aargs);
+}
+EOT
+    }
+    $emitval;
+}
+
+# XXXX temporary hack
+for my $sym (qw(
+		perl_construct
+		perl_destruct
+		perl_free
+		perl_run
+		perl_parse
+		))
+{
+    $skipapi_funcs{$sym}++;
+}
+
+walk_table {
+    my $ret = "";
+    if (@_ == 1) {
+	my $arg = shift;
+	$ret .= "$arg\n" if $arg =~ /^#\s*(if|ifdef|else|endif)\b/;
+    }
+    else {
+	my ($flags,$retval,$func,@args) = @_;
+	return $ret if exists $skipapi_funcs{$func};
+	unless ($flags =~ /[js]/) {
+	    $ret .= "\n";
+	    my $addctx = 1 if $flags =~ /n/;
+	    if ($flags =~ /p/) {
+		$ret .= undefine("Perl_$func");
+		$ret .= emit_func($addctx,$retval,"Perl_$func",@args);
+	    }
+	    else {
+		$ret .= undefine($func);
+		$ret .= emit_func($addctx,$retval,$func,@args);
+	    }
+	}
+    }
+    $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");
+    }
+}
+
+print CAPI <<'EOT';
+
+#undef Perl_fprintf_nocontext
+int
+Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
+{
+    dTHXo;
+    va_list(arglist);
+    va_start(arglist, format);
+    return (*PL_StdIO->pVprintf)(PL_StdIO, stream, format, arglist);
+}
+
+END_EXTERN_C
+
+#endif /* PERL_OBJECT */
+EOT
+
 __END__
 
-# Lines are of the form:
-#    flags|return_type|function_name|return_type|arg1|arg2|...|argN
-#
-# They may continue on multiple lines when \w| begins the next line.
-# Leading and trailing whitespace will be ignored in each component.
-#
-# flags are single letters with following meanings:
-#	s		static function, should have an S_ prefix in source
-#			file
-#	n		has no implicit interpreter/thread context argument
-#	p		function has a Perl_ prefix
-#	r		function never returns
-#       o		has no compatibility macro (#define foo Perl_foo)
-#
-# Individual flags may be separated by whitespace.
-#
-# New global functions should be added at the end for binary compatibility
-# in some configurations.
-#
-# TODO: 1) Add a flag to mark the functions that are part of the public API.
-#       2) Add a field for documentation, so that L<perlguts/"API LISTING">
-#          may be autogenerated.
-#
+: Lines are of the form:
+:    flags|return_type|function_name|arg1|arg2|...|argN
+:
+: A line may be continued on another by ending it with a backslash.
+: Leading and trailing whitespace will be ignored in each component.
+:
+: flags are single letters with following meanings:
+:	s		static function, should have an S_ prefix in source
+:			file
+:	n		has no implicit interpreter/thread context argument
+:	p		function has a Perl_ prefix
+:	r		function never returns
+:       o		has no compatibility macro (#define foo Perl_foo)
+:       j		not a member of CPerlObj
+:       x		not exported
+:
+: Individual flags may be separated by whitespace.
+:
+: New global functions should be added at the end for binary compatibility
+: in some configurations.
+:
+: TODO: 1) Add a flag to mark the functions that are part of the public API.
+:       2) Add a field for documentation, so that L<perlguts/"API LISTING">
+:          may be autogenerated.
+
+START_EXTERN_C
+
+#if defined(PERL_IMPLICIT_SYS)
+jno	|PerlInterpreter*	|perl_alloc_using \
+				|struct IPerlMem* m|struct IPerlMem* ms \
+				|struct IPerlMem* mp|struct IPerlEnv* e \
+				|struct IPerlStdIO* io|struct IPerlLIO* lio \
+				|struct IPerlDir* d|struct IPerlSock* s \
+				|struct IPerlProc* p
+#else
+jno	|PerlInterpreter*	|perl_alloc
+#endif
+jno	|void	|perl_construct	|PerlInterpreter* interp
+jno	|void	|perl_destruct	|PerlInterpreter* interp
+jno	|void	|perl_free	|PerlInterpreter* interp
+jno	|int	|perl_run	|PerlInterpreter* interp
+jno	|int	|perl_parse	|PerlInterpreter* interp|XSINIT_t xsinit \
+				|int argc|char** argv|char** env
+#if defined(USE_ITHREADS)
+jno	|PerlInterpreter*|perl_clone|PerlInterpreter* interp, UV flags
+#  if defined(PERL_IMPLICIT_SYS)
+jno	|PerlInterpreter*|perl_clone_using|PerlInterpreter *interp|UV flags \
+				|struct IPerlMem* m|struct IPerlMem* ms \
+				|struct IPerlMem* mp|struct IPerlEnv* e \
+				|struct IPerlStdIO* io|struct IPerlLIO* lio \
+				|struct IPerlDir* d|struct IPerlSock* s \
+				|struct IPerlProc* p
+#  endif
+#endif
+
+#if defined(MYMALLOC)
+jnop	|Malloc_t|malloc	|MEM_SIZE nbytes
+jnop	|Malloc_t|calloc	|MEM_SIZE elements|MEM_SIZE size
+jnop	|Malloc_t|realloc	|Malloc_t where|MEM_SIZE nbytes
+jnop	|Free_t	|mfree		|Malloc_t where
+jnp	|MEM_SIZE|malloced_size	|void *p
+#endif
+
+END_EXTERN_C
 
+/* functions with flag 'n' should come before here */
 #if defined(PERL_OBJECT)
+class CPerlObj {
 public:
+	struct interpreter interp;
+	CPerlObj(IPerlMem*, IPerlMem*, IPerlMem*, IPerlEnv*, IPerlStdIO*,
+	    IPerlLIO*, IPerlDir*, IPerlSock*, IPerlProc*);
+	void* operator new(size_t nSize, IPerlMem *pvtbl);
+	static void operator delete(void* pPerl, IPerlMem *pvtbl);
+	int do_aspawn (void *vreally, void **vmark, void **vsp);
 #endif
+#if defined(PERL_OBJECT)
+public:
+#else
+START_EXTERN_C
+#endif
+#  include "pp_proto.h"
 p	|SV*	|amagic_call	|SV* left|SV* right|int method|int dir
 p	|bool	|Gv_AMupdate	|HV* stash
 p	|OP*	|append_elem	|I32 optype|OP* head|OP* tail
 p	|OP*	|append_list	|I32 optype|LISTOP* first|LISTOP* last
 p	|I32	|apply		|I32 type|SV** mark|SV** sp
-p	|void	|assertref	|OP* o
 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
@@ -780,7 +1107,7 @@ p	|I32	|block_gimme
 p	|int	|block_start	|int full
 p	|void	|boot_core_UNIVERSAL
 p	|void	|call_list	|I32 oldscope|AV* av_list
-p	|I32	|cando		|I32 bit|I32 effective|Stat_t* statbufp
+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
@@ -793,16 +1120,21 @@ p	|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
 #if defined(PERL_IMPLICIT_CONTEXT)
-npr	|void	|croak_nocontext|const char* pat|...
+nrp	|void	|croak_nocontext|const char* pat|...
 np	|OP*	|die_nocontext	|const char* pat|...
+np	|void	|deb_nocontext	|const char* pat|...
 np	|char*	|form_nocontext	|const char* pat|...
+np	|SV*	|mess_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|...
 #endif
 p	|void	|cv_ckproto	|CV* cv|GV* gv|char* p
 p	|CV*	|cv_clone	|CV* proto
@@ -820,7 +1152,7 @@ p	|U32*	|get_opargs
 p	|PPADDR_t*|get_ppaddr
 p	|I32	|cxinc
 p	|void	|deb		|const char* pat|...
-p	|void	|deb_growlevel
+p	|void	|vdeb		|const char* pat|va_list* args
 p	|void	|debprofdump
 p	|I32	|debop		|OP* o
 p	|I32	|debstack
@@ -829,9 +1161,11 @@ p	|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|...
+p	|OP*	|vdie		|const char* pat|va_list* args
 p	|OP*	|die_where	|char* message|STRLEN msglen
 p	|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
 p	|void	|do_chop	|SV* asv|SV* sv
 p	|bool	|do_close	|GV* gv|bool not_implicit
@@ -853,6 +1187,9 @@ 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 \
 				|int rawmode|int rawperm|PerlIO* supplied_fp
+p	|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
 p	|bool	|do_print	|SV* sv|PerlIO* fp
 p	|OP*	|do_readline
@@ -862,6 +1199,7 @@ p	|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	|void	|do_vop		|I32 optype|SV* sv|SV* left|SV* right
 p	|OP*	|dofile		|OP* term
@@ -888,6 +1226,7 @@ p	|PADOFFSET|find_threadsv|const char *name
 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
 p	|OP*	|gen_constant_list|OP* o
 #if !defined(HAS_GETENV_LEN)
@@ -940,42 +1279,61 @@ 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
-p	|I32	|ingroup	|I32 testgid|I32 effective
+p	|bool	|ingroup	|Gid_t testgid|Uid_t effective
+p	|void	|init_debugger
 p	|void	|init_stacks
 p	|U32	|intro_my
 p	|char*	|instr		|const char* big|const char* little
-p	|bool	|io_close	|IO* io
+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
 p	|OP*	|jmaybe		|OP* arg
 p	|I32	|keyword	|char* d|I32 len
@@ -1038,14 +1396,13 @@ p	|int	|magic_set_all_env|SV* sv|MAGIC* mg
 p	|U32	|magic_sizepack	|SV* sv|MAGIC* mg
 p	|int	|magic_wipepack	|SV* sv|MAGIC* mg
 p	|void	|magicname	|char* sym|char* name|I32 namlen
-#if defined(MYMALLOC)
-np	|MEM_SIZE|malloced_size	|void *p
-#endif
 p	|void	|markstack_grow
 #if defined(USE_LOCALE_COLLATE)
 p	|char*	|mem_collxfrm	|const char* s|STRLEN len|STRLEN* xlen
 #endif
-p	|SV*	|mess		|const char* pat|va_list* args
+p	|SV*	|mess		|const char* pat|...
+p	|SV*	|vmess		|const char* pat|va_list* args
+p	|void	|qerror		|SV* err
 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
@@ -1119,6 +1476,7 @@ p	|HV*	|newHV
 p	|HV*	|newHVhv	|HV* hv
 p	|IO*	|newIO
 p	|OP*	|newLISTOP	|I32 type|I32 flags|OP* first|OP* last
+p	|OP*	|newPADOP	|I32 type|I32 flags|SV* sv
 p	|OP*	|newPMOP	|I32 type|I32 flags
 p	|OP*	|newPVOP	|I32 type|I32 flags|char* pv
 p	|SV*	|newRV		|SV* pref
@@ -1131,14 +1489,13 @@ 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 \
 				|I32 whileline|OP* expr|OP* block|OP* cont
-#if defined(USE_THREADS)
-p	|struct perl_thread*|new_struct_thread|struct perl_thread *t
-#endif
+
 p	|PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems
 p	|PerlIO*|nextargv	|GV* gv
 p	|char*	|ninstr		|const char* big|const char* bigend \
@@ -1158,21 +1515,16 @@ p	|void	|pad_reset
 p	|void	|pad_swipe	|PADOFFSET po
 p	|void	|peep		|OP* o
 #if defined(PERL_OBJECT)
-no	|void	|perl_construct
-no	|void	|perl_destruct
-no	|void	|perl_free
-no	|int	|perl_run
-no	|int	|perl_parse	|XSINIT_t xsinit \
-				|int argc|char** argv|char** env
-#else
-no	|PerlInterpreter*	|perl_alloc
-no	|void	|perl_construct	|PerlInterpreter* sv_interp
-no	|void	|perl_destruct	|PerlInterpreter* sv_interp
-no	|void	|perl_free	|PerlInterpreter* sv_interp
-no	|int	|perl_run	|PerlInterpreter* sv_interp
-no	|int	|perl_parse	|PerlInterpreter* sv_interp|XSINIT_t xsinit \
+ox	|void	|Perl_construct
+ox	|void	|Perl_destruct
+ox	|void	|Perl_free
+ox	|int	|Perl_run
+ox	|int	|Perl_parse	|XSINIT_t xsinit \
 				|int argc|char** argv|char** env
 #endif
+#if defined(USE_THREADS)
+p	|struct perl_thread*	|new_struct_thread|struct perl_thread *t
+#endif
 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
@@ -1193,7 +1545,7 @@ p	|void	|set_numeric_local
 p	|void	|set_numeric_radix
 p	|void	|set_numeric_standard
 p	|void	|require_pv	|const char* pv
-p	|void	|pidgone	|int pid|int status
+p	|void	|pidgone	|Pid_t pid|int status
 p	|void	|pmflag		|U16* pmfl|int ch
 p	|OP*	|pmruntime	|OP* pm|OP* expr|OP* repl
 p	|OP*	|pmtrans	|OP* o|OP* expr|OP* repl
@@ -1241,7 +1593,8 @@ 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_destructor|DESTRUCTORFUNC_NOCONTEXT_t f|void* p
+p	|void	|save_destructor_x|DESTRUCTORFUNC_t f|void* p
 p	|void	|save_freesv	|SV* sv
 p	|void	|save_freeop	|OP* o
 p	|void	|save_freepv	|char* pv
@@ -1253,6 +1606,7 @@ p	|void	|save_hints
 p	|void	|save_hptr	|HV** hptr
 p	|void	|save_I16	|I16* intp
 p	|void	|save_I32	|I32* intp
+p	|void	|save_I8	|I8* bytep
 p	|void	|save_int	|int* intp
 p	|void	|save_item	|SV* item
 p	|void	|save_iv	|IV* iv
@@ -1262,6 +1616,7 @@ p	|void	|save_nogv	|GV* gv
 p	|void	|save_op
 p	|SV*	|save_scalar	|GV* gv
 p	|void	|save_pptr	|char** pptr
+p	|void	|save_vptr	|void* pptr
 p	|void	|save_re_context
 p	|void	|save_sptr	|SV** sptr
 p	|SV*	|save_svref	|SV** sptr
@@ -1271,10 +1626,10 @@ p	|OP*	|scalar		|OP* o
 p	|OP*	|scalarkids	|OP* o
 p	|OP*	|scalarseq	|OP* o
 p	|OP*	|scalarvoid	|OP* o
-p	|UV	|scan_bin	|char* start|I32 len|I32* retlen
-p	|UV	|scan_hex	|char* start|I32 len|I32* retlen
+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	|UV	|scan_oct	|char* start|I32 len|I32* retlen
+p	|NV	|scan_oct	|char* start|I32 len|I32* retlen
 p	|OP*	|scope		|OP* o
 p	|char*	|screaminstr	|SV* bigsv|SV* littlesv|I32 start_shift \
 				|I32 end_shift|I32 *state|I32 last
@@ -1305,6 +1660,7 @@ 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
@@ -1347,6 +1703,7 @@ 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
@@ -1368,15 +1725,15 @@ 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 \
 				|va_list* args|SV** svargs|I32 svmax \
-				|bool *used_locale
+				|bool *maybe_tainted
 p	|void	|sv_vsetpvfn	|SV* sv|const char* pat|STRLEN patlen \
 				|va_list* args|SV** svargs|I32 svmax \
-				|bool *used_locale
+				|bool *maybe_tainted
 p	|SV*	|swash_init	|char* pkg|char* name|SV* listsv \
 				|I32 minbits|I32 none
 p	|UV	|swash_fetch	|SV *sv|U8 *ptr
 p	|void	|taint_env
-p	|void	|taint_proper	|const char* f|char* s
+p	|void	|taint_proper	|const char* f|const char* s
 p	|UV	|to_utf8_lower	|U8 *p
 p	|UV	|to_utf8_upper	|U8 *p
 p	|UV	|to_utf8_title	|U8 *p
@@ -1397,9 +1754,12 @@ p	|UV	|utf8_to_uv	|U8 *s|I32* retlen
 p	|U8*	|uv_to_utf8	|U8 *d|UV uv
 p	|void	|vivify_defelem	|SV* sv
 p	|void	|vivify_ref	|SV* sv|U32 to_what
-p	|I32	|wait4pid	|int pid|int* statusp|int flags
+p	|I32	|wait4pid	|Pid_t pid|int* statusp|int flags
+p	|void	|report_uninit
 p	|void	|warn		|const char* pat|...
+p	|void	|vwarn		|const char* pat|va_list* args
 p	|void	|warner		|U32 err|const char* pat|...
+p	|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
@@ -1412,40 +1772,29 @@ p	|int	|yyparse
 p	|int	|yywarn		|char* s
 #if defined(MYMALLOC)
 p	|void	|dump_mstats	|char* s
-pno	|Malloc_t|malloc	|MEM_SIZE nbytes
-pno	|Malloc_t|calloc	|MEM_SIZE elements|MEM_SIZE size
-pno	|Malloc_t|realloc	|Malloc_t where|MEM_SIZE nbytes
-pno	|Free_t	|mfree		|Malloc_t where
 #endif
-pn	|Malloc_t|safesysmalloc	|MEM_SIZE nbytes
-pn	|Malloc_t|safesyscalloc	|MEM_SIZE elements|MEM_SIZE size
-pn	|Malloc_t|safesysrealloc|Malloc_t where|MEM_SIZE nbytes
-pn	|Free_t	|safesysfree	|Malloc_t where
+np	|Malloc_t|safesysmalloc	|MEM_SIZE nbytes
+np	|Malloc_t|safesyscalloc	|MEM_SIZE elements|MEM_SIZE size
+np	|Malloc_t|safesysrealloc|Malloc_t where|MEM_SIZE nbytes
+np	|Free_t	|safesysfree	|Malloc_t where
 #if defined(LEAKTEST)
-pn	|Malloc_t|safexmalloc	|I32 x|MEM_SIZE size
-pn	|Malloc_t|safexcalloc	|I32 x|MEM_SIZE elements|MEM_SIZE size
-pn	|Malloc_t|safexrealloc	|Malloc_t where|MEM_SIZE size
-pn	|void	|safexfree	|Malloc_t where
+np	|Malloc_t|safexmalloc	|I32 x|MEM_SIZE size
+np	|Malloc_t|safexcalloc	|I32 x|MEM_SIZE elements|MEM_SIZE size
+np	|Malloc_t|safexrealloc	|Malloc_t where|MEM_SIZE size
+np	|void	|safexfree	|Malloc_t where
 #endif
 #if defined(PERL_GLOBAL_STRUCT)
 p	|struct perl_vars *|GetVars
 #endif
-p	|void	|yydestruct	|void *ptr
 p	|int	|runops_standard
 p	|int	|runops_debug
-
-#if defined(WIN32)
-#if defined(PERL_OBJECT)
-p	|int& 	|ErrorNo
-#else
-p	|int* 	|ErrorNo
-#endif
-#endif
 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
@@ -1458,6 +1807,8 @@ p	|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 \
+				|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
@@ -1468,7 +1819,10 @@ p	|void	|do_pmop_dump	|I32 level|PerlIO *file|PMOP *pm
 p	|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*	|default_protect|volatile JMPENV *je|int *excpt \
+				|protect_body_t body|...
+p	|void*	|vdefault_protect|volatile JMPENV *je|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
@@ -1476,10 +1830,39 @@ p	|void	|sv_force_normal|SV *sv
 p	|void	|tmps_grow	|I32 n
 p	|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
+p	|OP *	|my_attrs	|OP *o|OP *attrs
+p	|void	|boot_core_xsutils
+#if defined(USE_ITHREADS)
+p	|PERL_CONTEXT*|cx_dup	|PERL_CONTEXT* cx|I32 ix|I32 max
+p	|PERL_SI*|si_dup	|PERL_SI* si
+p	|ANY*	|ss_dup		|PerlInterpreter* proto_perl
+p	|void*	|any_dup	|void* v|PerlInterpreter* proto_perl
+p	|HE*	|he_dup		|HE* e|bool shared
+p	|REGEXP*|re_dup		|REGEXP* r
+p	|PerlIO*|fp_dup		|PerlIO* fp|char type
+p	|DIR*	|dirp_dup	|DIR* dp
+p	|GP*	|gp_dup		|GP* gp
+p	|MAGIC*	|mg_dup		|MAGIC* mg
+p	|SV*	|sv_dup		|SV* sstr
+#if defined(HAVE_INTERP_INTERN)
+p	|void	|sys_intern_dup	|struct interp_intern* src \
+				|struct interp_intern* dst
+#endif
+p	|PTR_TBL_t*|ptr_table_new
+p	|void*	|ptr_table_fetch|PTR_TBL_t *tbl|void *sv
+p	|void	|ptr_table_store|PTR_TBL_t *tbl|void *oldsv|void *newsv
+p	|void	|ptr_table_split|PTR_TBL_t *tbl
+#endif
 
 #if defined(PERL_OBJECT)
 protected:
+#else
+END_EXTERN_C
 #endif
+
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 s	|I32	|avhv_index_sv	|SV* sv
 #endif
@@ -1516,19 +1899,19 @@ 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 \
 				|int n|SV *val
-s	|void	|unwind_handler_stack	|void *p
-s	|void	|restore_magic	|void *p
 #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
 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	|void	|op_clear	|OP* o
 s	|void	|null		|OP* o
 s	|PADOFFSET|pad_findlex	|char* name|PADOFFSET newoff|U32 seq \
 				|CV* startcv|I32 cx_ix|I32 saweval|U32 flags
@@ -1537,8 +1920,12 @@ 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
+s	|OP *	|dup_attrlist	|OP *o
+s	|void	|apply_attrs	|HV *stash|SV *target|OP *attrs
 #  if defined(PL_OP_SLAB_ALLOC)
 s	|void*	|Slab_Alloc	|int m|size_t sz
 #  endif
@@ -1550,7 +1937,6 @@ s	|void	|forbid_setid	|char *
 s	|void	|incpush	|char *|int
 s	|void	|init_interp
 s	|void	|init_ids
-s	|void	|init_debugger
 s	|void	|init_lexer
 s	|void	|init_main_stash
 s	|void	|init_perllib
@@ -1598,25 +1984,16 @@ s	|void	|save_lines	|AV *array|SV *sv
 s	|OP*	|doeval		|int gimme|OP** startop
 s	|PerlIO *|doopen_pmc	|const char *name|const char *mode
 s	|void	|qsortsv	|SV ** array|size_t num_elts|SVCOMPARE_t f
-s	|I32	|sortcv		|SV *a|SV *b
-s	|I32	|sv_ncmp	|SV *a|SV *b
-s	|I32	|sv_i_ncmp	|SV *a|SV *b
-s	|I32	|amagic_ncmp	|SV *a|SV *b
-s	|I32	|amagic_i_ncmp	|SV *a|SV *b
-s	|I32	|amagic_cmp	|SV *str1|SV *str2
-s	|I32	|amagic_cmp_locale|SV *str1|SV *str2
 #endif
 
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 s	|CV*	|get_db_sub	|SV **svp|CV *cv
-#  if defined(USE_THREADS)
-s	|void	|unset_cvowner	|void *cvarg
-#  endif
+s	|SV*	|method_common	|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|int mode
+s	|int	|emulate_eaccess|const char* path|Mode_t mode
 #  if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
 s	|int	|dooneliner	|char *cmd|char *filename
 #  endif
@@ -1627,7 +2004,6 @@ s	|regnode*|reg		|I32|I32 *
 s	|regnode*|reganode	|U8|U32
 s	|regnode*|regatom	|I32 *
 s	|regnode*|regbranch	|I32 *|I32
-s	|void	|regc		|U8|char *
 s	|void	|reguni		|UV|char *|I32*
 s	|regnode*|regclass
 s	|regnode*|regclassutf8
@@ -1641,13 +2017,14 @@ s	|char*|regwhite	|char *|char *
 s	|char*|nextchar
 s	|regnode*|dumpuntil	|regnode *start|regnode *node \
 				|regnode *last|SV* sv|I32 l
-s	|void	|scan_commit	|scan_data_t *data
+s	|void	|scan_commit	|struct scan_data_t *data
 s	|I32	|study_chunk	|regnode **scanp|I32 *deltap \
-				|regnode *last|scan_data_t *data|U32 flags
+				|regnode *last|struct scan_data_t *data \
+				|U32 flags
 s	|I32	|add_data	|I32 n|char *s
 rs	|void|re_croak2	|const char* pat1|const char* pat2|...
-s	|char*|regpposixcc	|I32 value
-s	|void	|clear_re	|void *r
+s	|I32	|regpposixcc	|I32 value
+s	|void	|checkposixcc
 #endif
 
 #if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
@@ -1655,15 +2032,15 @@ 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
 s	|char*|regcp_set_to	|I32 ss
 s	|void	|cache_re	|regexp *prog
-s	|void	|restore_pos	|void *arg
 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)
@@ -1681,20 +2058,40 @@ 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	|do_report_used	|SV *sv
-s	|void	|do_clean_objs	|SV *sv
-s	|void	|do_clean_named_objs|SV *sv
-s	|void	|do_clean_all	|SV *sv
 s	|void	|not_a_number	|SV *sv
 s	|void	|visit		|SVFUNC_t f
 #  if defined(PURIFY)
@@ -1724,7 +2121,7 @@ s	|char*	|scan_ident	|char *s|char *send|char *dest \
 				|STRLEN destlen|I32 ck_uni
 s	|char*	|scan_inputsymbol|char *start
 s	|char*	|scan_pat	|char *start|I32 type
-s	|char*	|scan_str	|char *start
+s	|char*	|scan_str	|char *start|int keep_quoted|int keep_delims
 s	|char*	|scan_subst	|char *start
 s	|char*	|scan_trans	|char *start
 s	|char*	|scan_word	|char *s|char *dest|STRLEN destlen \
@@ -1743,16 +2140,13 @@ 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
 s	|I32	|utf16_textfilter|int idx|SV *sv|int maxlen
 s	|I32	|utf16rev_textfilter|int idx|SV *sv|int maxlen
-s	|void	|restore_rsfp	|void *f
-s	|void	|restore_expect	|void *e
-s	|void	|restore_lex_expect	|void *e
 #  if defined(CRIPPLED_CC)
 s	|int	|uni		|I32 f|char *s
 #  endif
@@ -1767,10 +2161,11 @@ s	|SV*|isa_lookup	|HV *stash|const char *name|int len|int level
 
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
 s	|SV*	|mess_alloc
-rs	|void	|do_croak	|const char *pat|va_list *args
-s	|void	|do_warn	|const char *pat|va_list *args
-s	|OP*	|do_die		|const char *pat|va_list *args
 #  if defined(LEAKTEST)
 s	|void	|xstat		|int
 #  endif
 #endif
+
+#if defined(PERL_OBJECT)
+};
+#endif