#
# %Config::Config (ie config.sh)
# config.h
-# global.sym
+# embed.fnc
# globvar.sym
# intrpvar.h
# miniperl.map (on OS/2)
# perl5.def (on OS/2; this is the old version of the file being made)
# perlio.sym
# perlvars.h
+# regen/opcodes
#
# plus long lists of function names hard-coded directly in this script.
#
use Config;
use strict;
-my %ARGS = (CCTYPE => 'MSVC');
+my %ARGS = (CCTYPE => 'MSVC', TARG_DIR => '');
my %define;
}
}
+require "$ARGS{TARG_DIR}regen/embed_lib.pl";
+
{
- my @PLATFORM = qw(aix win32 wince os2 netware vms);
+ my @PLATFORM = qw(aix win32 wince os2 netware vms test);
my %PLATFORM;
@PLATFORM{@PLATFORM} = ();
# minimal configs that don't include any of those options.
my @options = sort(Config::bincompat_options(), Config::non_bincompat_options());
-print STDERR "Options: (@options)\n";
+print STDERR "Options: (@options)\n" unless $ARGS{PLATFORM} eq 'test';
$define{$_} = 1 foreach @options;
my %exportperlmalloc =
my $exportperlmalloc = $ARGS{PLATFORM} eq 'os2';
-my $config_h = "config.h";
-my $intrpvar_h = "intrpvar.h";
-my $perlvars_h = "perlvars.h";
-my $global_sym = "global.sym";
-my $globvar_sym = "globvar.sym";
-my $perlio_sym = "perlio.sym";
-
-if (exists $ARGS{TARG_DIR}) {
- s/^/$ARGS{TARG_DIR}/
- foreach $intrpvar_h, $perlvars_h, $global_sym, $globvar_sym, $perlio_sym;
-}
-
-open(CFG,$config_h) || die "Cannot open $config_h: $!\n";
+open(CFG, '<', 'config.h') || die "Cannot open config.h: $!\n";
while (<CFG>) {
$define{$1} = 1 if /^\s*\#\s*define\s+(MYMALLOC|MULTIPLICITY
|SPRINTF_RETURNS_STRLEN
# perl.h logic duplication ends
-print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n";
+print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n"
+ unless $ARGS{PLATFORM} eq 'test';
my $sym_ord = 0;
my %ordinal;
# we're doing, as in that case we skip adding something to the skip hash
# for the second time.
- my ($file, $hash, $proc) = @_;
+ my $file = $ARGS{TARG_DIR} . shift;
+ my $hash = shift;
+ my $proc = shift;
open my $vars, '<', $file or die die "Cannot open $file: $!\n";
while (<$vars>) {
# All symbols have a Perl_ prefix because that's what embed.h sticks
# in front of them. The A?I?S?C? is strictly speaking wrong.
- next unless /\bPERLVAR(A?I?S?C?)\(([IGT])(\w+)/;
+ next unless /\bPERLVAR(A?I?S?C?)\(([IGT]),\s*(\w+)/;
my $var = "PL_$3";
my $symbol = $proc ? &$proc($1,$2,$3) : $var;
if ($define{HAS_SIGACTION}) {
++$skip{PL_sig_trapped};
+
+ if ($ARGS{PLATFORM} eq 'vms') {
+ # FAKE_PERSISTENT_SIGNAL_HANDLERS defined as !defined(HAS_SIGACTION)
+ ++$skip{PL_sig_ignoring};
+ }
}
unless ($define{USE_LOCALE_COLLATE}) {
}
if ($define{'PERL_GLOBAL_STRUCT'}) {
- readvar($perlvars_h, \%skip);
+ readvar('perlvars.h', \%skip);
+ # This seems like the least ugly way to cope with the fact that PL_sh_path
+ # is mentioned in perlvar.h and globvar.sym, and always exported.
+ delete $skip{PL_sh_path};
++$export{Perl_GetVars};
try_symbols(qw(PL_Vars PL_VarsPtr)) unless $ARGS{CCTYPE} eq 'GCC';
} else {
# functions from *.sym files
-my @syms = ($global_sym, $globvar_sym);
+my @syms = qw(globvar.sym);
# Symbols that are the public face of the PerlIO layers implementation
# These are in _addition to_ the public face of the abstraction
if ($define{'USE_PERLIO'}) {
# Export the symols that make up the PerlIO abstraction, regardless
# of its implementation - read from a file
- push @syms, $perlio_sym;
+ push @syms, 'perlio.sym';
# This part is then dependent on how the abstraction is implemented
if ($define{'USE_SFIO'}) {
# At this point all skip lists should be completed, as we are about to test
# many symbols against them.
-for my $syms (@syms) {
- open (GLOBAL, "<$syms") || die "failed to open $syms: $!\n";
- while (<GLOBAL>) {
- next if (!/^[A-Za-z]/);
- # Functions have a Perl_ prefix
- # Variables have a PL_ prefix
- chomp($_);
- my $symbol = ($syms =~ /var\.sym$/i ? "PL_" : "");
- $symbol .= $_;
+{
+ my %seen;
+ my ($embed) = setup_embed($ARGS{TARG_DIR});
+
+ foreach (@$embed) {
+ my ($flags, $retval, $func, @args) = @$_;
+ next unless $func;
+ if ($flags =~ /[AX]/ && $flags !~ /[xm]/ || $flags =~ /b/) {
+ # public API, so export
+
+ # If a function is defined twice, for example before and after
+ # an #else, only export its name once. Important to do this test
+ # within the block, as the *first* definition may have flags which
+ # mean "don't export"
+ next if $seen{$func}++;
+ $func = "Perl_$func" if $flags =~ /[pbX]/;
+ ++$export{$func} unless exists $skip{$func};
+ }
+ }
+}
+
+foreach (@syms) {
+ my $syms = $ARGS{TARG_DIR} . $_;
+ open my $global, '<', $syms or die "failed to open $syms: $!\n";
+ # Functions already have a Perl_ prefix
+ # Variables need a PL_ prefix
+ my $prefix = $syms =~ /var\.sym$/i ? 'PL_' : '';
+ while (<$global>) {
+ next unless /^([A-Za-z].*)/;
+ my $symbol = "$prefix$1";
++$export{$symbol} unless exists $skip{$symbol};
}
- close(GLOBAL);
}
# variables
if ($define{'MULTIPLICITY'} && $define{PERL_GLOBAL_STRUCT}) {
- readvar($perlvars_h, \%export, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
+ readvar('perlvars.h', \%export, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
# XXX AIX seems to want the perlvars.h symbols, for some reason
if ($ARGS{PLATFORM} eq 'aix' or $ARGS{PLATFORM} eq 'os2') { # OS/2 needs PL_thr_key
- readvar($perlvars_h, \%export);
+ readvar('perlvars.h', \%export);
}
}
else {
unless ($define{'PERL_GLOBAL_STRUCT'}) {
- readvar($perlvars_h, \%export);
+ readvar('perlvars.h', \%export);
}
unless ($define{MULTIPLICITY}) {
- readvar($intrpvar_h, \%export);
+ readvar('intrpvar.h', \%export);
}
}
win32_getchar
win32_putchar
));
- if ($ARGS{CCTYPE} eq "BORLAND") {
- try_symbols('_matherr');
- }
}
elsif ($ARGS{PLATFORM} eq 'vms') {
try_symbols(qw(
# Start with platform specific headers:
if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
- (my $dll = ($define{PERL_DLL} || "perl515")) =~ s/\.dll$//i;
+ my $dll = $define{PERL_DLL} ? $define{PERL_DLL} =~ s/\.dll$//ir
+ : "perl$Config{api_revision}$Config{api_version}";
print "LIBRARY $dll\n";
# The DESCRIPTION module definition file statement is not supported
# by VC7 onwards.
- if ($ARGS{CCTYPE} =~ /^(?:MSVC60|GCC|BORLAND)$/) {
+ if ($ARGS{CCTYPE} =~ /^(?:MSVC60|GCC)$/) {
print "DESCRIPTION 'Perl interpreter'\n";
}
print "EXPORTS\n";
}
elsif ($ARGS{PLATFORM} eq 'netware') {
if ($ARGS{FILETYPE} eq 'def') {
- print "LIBRARY perl515\n";
+ print "LIBRARY perl$Config{api_revision}$Config{api_version}\n";
print "DESCRIPTION 'Perl interpreter for NetWare'\n";
print "EXPORTS\n";
}
foreach my $symbol (sort keys %export) {
if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
- $symbol = "_$symbol" if $ARGS{CCTYPE} eq 'BORLAND';
print "\t$symbol\n";
}
elsif ($ARGS{PLATFORM} eq 'os2') {
https://perl5.git.perl.org / perl5.git / blobdiff