X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/208d7614b345d1fbee3347436a4ce3868b50efbd..f4cdb42cbeec255c36ec708cc36f0243138d9645:/makedef.pl?ds=sidebyside diff --git a/makedef.pl b/makedef.pl index 69e90ca..c1fd4c1 100644 --- a/makedef.pl +++ b/makedef.pl @@ -3,20 +3,21 @@ # Create the export list for perl. # # Needed by WIN32 and OS/2 for creating perl.dll, -# and by AIX for creating libperl.a when -Dusershrplib is in effect, +# and by AIX for creating libperl.a when -Duseshrplib is in effect, # and by VMS for creating perlshr.exe. # # Reads from information stored in # # %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. # @@ -35,44 +36,47 @@ BEGIN { unshift @INC, "lib" } use Config; use strict; -use vars qw($PLATFORM $CCTYPE $FILETYPE $TARG_DIR); - -$CCTYPE = 'MSVC'; -$TARG_DIR = ''; +my %ARGS = (CCTYPE => 'MSVC', TARG_DIR => ''); my %define; +my $fold; + +sub process_cc_flags { + foreach (map {split /\s+/, $_} @_) { + $define{$1} = $2 // 1 if /^-D(\w+)(?:=(.+))?/; + } +} + while (@ARGV) { my $flag = shift; - if ($flag =~ s/^CC_FLAGS=/ /) { - for my $fflag ($flag =~ /(?:^|\s)-D(\S+)/g) { - $fflag .= '=1' unless $fflag =~ /^(\w+)=/; - $define{$1} = $2 if $fflag =~ /^(\w+)=(.+)$/; - } - next; + if ($flag =~ /^(?:CC_FLAGS=)?(-D\w.*)/) { + process_cc_flags($1); + } elsif ($flag =~ /^(CCTYPE|FILETYPE|PLATFORM|TARG_DIR)=(.+)$/) { + $ARGS{$1} = $2; + } elsif ($flag eq '--sort-fold') { + ++$fold; } - $define{$1} = 1 if ($flag =~ /^-D(\w+)$/); - $define{$1} = $2 if ($flag =~ /^-D(\w+)=(.+)$/); - $CCTYPE = $1 if ($flag =~ /^CCTYPE=(\w+)$/); - $PLATFORM = $1 if ($flag =~ /^PLATFORM=(\w+)$/); - $FILETYPE = $1 if ($flag =~ /^FILETYPE=(\w+)$/); - $TARG_DIR = $1 if $flag =~ /^TARG_DIR=(.+)$/; } -my @PLATFORM = qw(aix win32 wince os2 netware vms); -my %PLATFORM; -@PLATFORM{@PLATFORM} = (); +require "$ARGS{TARG_DIR}regen/embed_lib.pl"; -defined $PLATFORM || die "PLATFORM undefined, must be one of: @PLATFORM\n"; -exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n"; +{ + my @PLATFORM = qw(aix win32 wince os2 netware vms test); + my %PLATFORM; + @PLATFORM{@PLATFORM} = (); + + die "PLATFORM undefined, must be one of: @PLATFORM\n" + unless defined $ARGS{PLATFORM}; + die "PLATFORM must be one of: @PLATFORM\n" + unless exists $PLATFORM{$ARGS{PLATFORM}}; +} # Is the following guard strictly necessary? Added during refactoring # to keep the same behaviour when merging other code into here. -if ($PLATFORM ne 'win32' && $PLATFORM ne 'wince' && $PLATFORM ne 'netware') { - foreach (@Config{qw(ccflags optimize)}) { - $define{$1} = 1 while /-D(\w+)/g; - } -} +process_cc_flags(@Config{qw(ccflags optimize)}) + if $ARGS{PLATFORM} ne 'win32' && $ARGS{PLATFORM} ne 'wince' + && $ARGS{PLATFORM} ne 'netware'; # Add the compile-time options that miniperl was built with to %define. # On Win32 these are not the same options as perl itself will be built @@ -84,7 +88,7 @@ if ($PLATFORM ne 'win32' && $PLATFORM ne 'wince' && $PLATFORM ne 'netware') { # 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 = @@ -95,19 +99,9 @@ my %exportperlmalloc = Perl_calloc => "calloc", ); -my $exportperlmalloc = $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"; - -s/^/$TARG_DIR/ foreach($intrpvar_h, $perlvars_h, $global_sym, $globvar_sym, - $perlio_sym); +my $exportperlmalloc = $ARGS{PLATFORM} eq 'os2'; -open(CFG,$config_h) || die "Cannot open $config_h: $!\n"; +open(CFG, '<', 'config.h') || die "Cannot open config.h: $!\n"; while () { $define{$1} = 1 if /^\s*\#\s*define\s+(MYMALLOC|MULTIPLICITY |SPRINTF_RETURNS_STRLEN @@ -117,10 +111,6 @@ close(CFG); # perl.h logic duplication begins -if ($define{PERL_IMPLICIT_SYS}) { - $define{PL_OP_SLAB_ALLOC} = 1; -} - if ($define{USE_ITHREADS}) { if (!$define{MULTIPLICITY}) { $define{MULTIPLICITY} = 1; @@ -131,18 +121,19 @@ $define{PERL_IMPLICIT_CONTEXT} ||= $define{USE_ITHREADS} || $define{MULTIPLICITY} ; -if ($define{USE_ITHREADS} && $PLATFORM ne 'win32' && $^O ne 'darwin') { +if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $^O ne 'darwin') { $define{USE_REENTRANT_API} = 1; } # 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; -if ($PLATFORM eq 'os2') { +if ($ARGS{PLATFORM} eq 'os2') { if (open my $fh, '<', 'perl5.def') { while (<$fh>) { last if /^\s*EXPORTS\b/; @@ -172,13 +163,15 @@ sub readvar { # 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; @@ -186,7 +179,7 @@ sub readvar { } } -if ($PLATFORM ne 'os2') { +if ($ARGS{PLATFORM} ne 'os2') { ++$skip{$_} foreach qw( PL_cryptseen PL_opsave @@ -201,11 +194,14 @@ if ($PLATFORM ne 'os2') { Perl_my_ntohl Perl_my_swap ); - if ($PLATFORM eq 'vms') { + if ($ARGS{PLATFORM} eq 'vms') { ++$skip{PL_statusvalue_posix}; + # This is a wrapper if we have symlink, not a replacement + # if we don't. + ++$skip{Perl_my_symlink} unless $Config{d_symlink}; } else { ++$skip{PL_statusvalue_vms}; - if ($PLATFORM ne 'aix') { + if ($ARGS{PLATFORM} ne 'aix') { ++$skip{$_} foreach qw( PL_DBcv PL_generation @@ -218,14 +214,14 @@ if ($PLATFORM ne 'os2') { } } -if ($PLATFORM ne 'vms') { +if ($ARGS{PLATFORM} ne 'vms') { # VMS does its own thing for these symbols. ++$skip{$_} foreach qw( PL_sig_handlers_initted PL_sig_ignoring PL_sig_defaulting ); - if ($PLATFORM ne 'win32') { + if ($ARGS{PLATFORM} ne 'win32') { ++$skip{$_} foreach qw( Perl_do_spawn Perl_do_spawn_nowait @@ -247,7 +243,6 @@ unless ($define{'DEBUGGING'}) { Perl_pad_sv Perl_pad_setsv Perl_hv_assert - PL_block_type PL_watchaddr PL_watchok PL_watch_pvx @@ -347,6 +342,7 @@ unless ($define{'USE_ITHREADS'}) { unless ($define{'USE_ITHREADS'}) { ++$skip{$_} foreach qw( + PL_check_mutex PL_op_mutex PL_regex_pad PL_regex_padav @@ -354,6 +350,10 @@ unless ($define{'USE_ITHREADS'}) { PL_hints_mutex PL_my_ctx_mutex PL_perlio_mutex + PL_stashpad + PL_stashpadix + PL_stashpadmax + Perl_alloccopstash Perl_clone_params_del Perl_clone_params_new Perl_parser_dup @@ -404,27 +404,6 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) { ); } -unless ($define{'PL_OP_SLAB_ALLOC'}) { - ++$skip{$_} foreach qw( - PL_OpPtr - PL_OpSlab - PL_OpSpace - Perl_Slab_Alloc - Perl_Slab_Free - ); -} - -unless ($define{'PERL_DEBUG_READONLY_OPS'}) { - ++$skip{$_} foreach qw( - PL_slab_count - PL_slabs - ); -} - -unless ($define{'THREADS_HAVE_PIDS'}) { - ++$skip{PL_ppid}; -} - unless ($define{'PERL_NEED_APPCTX'}) { ++$skip{PL_appctx}; } @@ -488,6 +467,11 @@ unless ($define{HAS_MMAP}) { 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}) { @@ -525,16 +509,19 @@ if ($define{HAS_SIGNBIT}) { } 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 $CCTYPE eq 'GCC'; + try_symbols(qw(PL_Vars PL_VarsPtr)) unless $ARGS{CCTYPE} eq 'GCC'; } else { ++$skip{$_} foreach qw(Perl_init_global_struct Perl_free_global_struct); } # 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 @@ -547,6 +534,7 @@ my @layer_syms = qw( PerlIOBase_eof PerlIOBase_error PerlIOBase_fileno + PerlIOBase_open PerlIOBase_noop_fail PerlIOBase_noop_ok PerlIOBase_popped @@ -613,14 +601,14 @@ my @layer_syms = qw( Perl_PerlIO_unread Perl_PerlIO_write ); -if ($PLATFORM eq 'netware') { +if ($ARGS{PLATFORM} eq 'netware') { push(@layer_syms,'PL_def_layerlist','PL_known_layers','PL_perlio'); } 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'}) { @@ -731,35 +719,55 @@ if ($define{'USE_PERLIO'}) { # 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 () { - 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 ($PLATFORM eq 'aix' or $PLATFORM eq 'os2') { # OS/2 needs PL_thr_key - readvar($perlvars_h, \%export); + if ($ARGS{PLATFORM} eq 'aix' or $ARGS{PLATFORM} eq 'os2') { # OS/2 needs PL_thr_key + 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); } } @@ -776,7 +784,7 @@ try_symbols(qw( PerlIO_vsprintf )); -if ($PLATFORM eq 'win32') { +if ($ARGS{PLATFORM} eq 'win32') { try_symbols(qw( setgid setuid @@ -788,7 +796,7 @@ if ($PLATFORM eq 'win32') { )); } -if ($PLATFORM =~ /^win(?:32|ce)$/) { +if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { try_symbols(qw( Perl_init_os_extras Perl_thread_create @@ -944,11 +952,8 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) { win32_getchar win32_putchar )); - if ($CCTYPE eq "BORLAND") { - try_symbols('_matherr'); - } } -elsif ($PLATFORM eq 'vms') { +elsif ($ARGS{PLATFORM} eq 'vms') { try_symbols(qw( Perl_cando Perl_cando_by_name @@ -1033,7 +1038,7 @@ elsif ($PLATFORM eq 'vms') { PerlIO_openn )); } -elsif ($PLATFORM eq 'os2') { +elsif ($ARGS{PLATFORM} eq 'os2') { try_symbols(qw( ctermid get_sysinfo @@ -1102,7 +1107,7 @@ elsif ($PLATFORM eq 'os2') { PL_do_undump )); } -elsif ($PLATFORM eq 'netware') { +elsif ($ARGS{PLATFORM} eq 'netware') { try_symbols(qw( Perl_init_os_extras Perl_thread_create @@ -1251,7 +1256,7 @@ elsif ($PLATFORM eq 'netware') { # static extensions with -fPIC, but links them to perl, not libperl.so # The VMS build scripts don't yet implement static extensions at all. -if ($PLATFORM =~ /^win(?:32|ce)$/) { +if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { # records of type boot_module for statically linked modules (except Dynaloader) my $static_ext = $Config{static_ext} // ""; $static_ext =~ s/\//__/g; @@ -1260,7 +1265,7 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) { try_symbols("init_Win32CORE") if $static_ext =~ /\bWin32CORE\b/; } -if ($PLATFORM eq 'os2') { +if ($ARGS{PLATFORM} eq 'os2') { my (%mapped, @missing); open MAP, 'miniperl.map' or die 'Cannot read miniperl.map'; /^\s*[\da-f:]+\s+(\w+)/i and $mapped{$1}++ foreach ; @@ -1278,17 +1283,18 @@ if ($PLATFORM eq 'os2') { # Start with platform specific headers: -if ($PLATFORM =~ /^win(?:32|ce)$/) { - (my $dll = ($define{PERL_DLL} || "perl515")) =~ s/\.dll$//i; +if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { + 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 ($CCTYPE =~ /^(?:MSVC60|GCC|BORLAND)$/) { + if ($ARGS{CCTYPE} =~ /^(?:MSVC60|GCC)$/) { print "DESCRIPTION 'Perl interpreter'\n"; } print "EXPORTS\n"; } -elsif ($PLATFORM eq 'os2') { +elsif ($ARGS{PLATFORM} eq 'os2') { (my $v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/; $v .= '-thread' if $Config{archname} =~ /-thread/; (my $dll = $define{PERL_DLL}) =~ s/\.dll$//i; @@ -1304,7 +1310,7 @@ DATA LOADONCALL NONSHARED MULTIPLE EXPORTS ---EOP--- } -elsif ($PLATFORM eq 'aix') { +elsif ($ARGS{PLATFORM} eq 'aix') { my $OSVER = `uname -v`; chop $OSVER; my $OSREL = `uname -r`; @@ -1315,9 +1321,9 @@ elsif ($PLATFORM eq 'aix') { print "#!\n"; } } -elsif ($PLATFORM eq 'netware') { - if ($FILETYPE eq 'def') { - print "LIBRARY perl515\n"; +elsif ($ARGS{PLATFORM} eq 'netware') { + if ($ARGS{FILETYPE} eq 'def') { + print "LIBRARY perl$Config{api_revision}$Config{api_version}\n"; print "DESCRIPTION 'Perl interpreter for NetWare'\n"; print "EXPORTS\n"; } @@ -1325,12 +1331,12 @@ elsif ($PLATFORM eq 'netware') { # Then the symbols -foreach my $symbol (sort keys %export) { - if ($PLATFORM =~ /^win(?:32|ce)$/) { - $symbol = "_$symbol" if $CCTYPE eq 'BORLAND'; +my @symbols = $fold ? sort {lc $a cmp lc $b} keys %export : sort keys %export; +foreach my $symbol (@symbols) { + if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { print "\t$symbol\n"; } - elsif ($PLATFORM eq 'os2') { + elsif ($ARGS{PLATFORM} eq 'os2') { printf qq( %-31s \@%s\n), qq("$symbol"), $ordinal{$symbol} || ++$sym_ord; printf qq( %-31s \@%s\n), @@ -1338,7 +1344,7 @@ foreach my $symbol (sort keys %export) { $ordinal{$exportperlmalloc{$symbol}} || ++$sym_ord if $exportperlmalloc and exists $exportperlmalloc{$symbol}; } - elsif ($PLATFORM eq 'netware') { + elsif ($ARGS{PLATFORM} eq 'netware') { print "\t$symbol,\n"; } else { print "$symbol\n"; @@ -1347,7 +1353,7 @@ foreach my $symbol (sort keys %export) { # Then platform specific footers. -if ($PLATFORM eq 'os2') { +if ($ARGS{PLATFORM} eq 'os2') { print <