X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/60fae8969c3c2f50fa614da8ed36310784b903f5..b2bf251fd850e281217ec1d042c1839e3ed4a09c:/makedef.pl?ds=sidebyside diff --git a/makedef.pl b/makedef.pl index 865b5ff..d2c5f5e 100644 --- a/makedef.pl +++ b/makedef.pl @@ -10,13 +10,14 @@ # # %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,10 +36,12 @@ BEGIN { unshift @INC, "lib" } use Config; use strict; -my %ARGS = (CCTYPE => 'MSVC'); +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+)(?:=(.+))?/; @@ -51,11 +54,15 @@ while (@ARGV) { process_cc_flags($1); } elsif ($flag =~ /^(CCTYPE|FILETYPE|PLATFORM|TARG_DIR)=(.+)$/) { $ARGS{$1} = $2; + } elsif ($flag eq '--sort-fold') { + ++$fold; } } +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} = (); @@ -80,9 +87,12 @@ process_cc_flags(@Config{qw(ccflags optimize)}) # the user might have chosen to disable because the canned configs are # 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"; -$define{$_} = 1 foreach @options; +#don't use the host Perl's -V defines for the WinCE Perl +if($ARGS{PLATFORM} ne 'wince') { + my @options = sort(Config::bincompat_options(), Config::non_bincompat_options()); + print STDERR "Options: (@options)\n" unless $ARGS{PLATFORM} eq 'test'; + $define{$_} = 1 foreach @options; +} my %exportperlmalloc = ( @@ -94,32 +104,18 @@ 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"; +my $config_h = $ARGS{PLATFORM} eq 'wince' ? 'xconfig.h' : 'config.h'; +open(CFG, '<', $config_h) || die "Cannot open $config_h: $!\n"; while () { $define{$1} = 1 if /^\s*\#\s*define\s+(MYMALLOC|MULTIPLICITY |SPRINTF_RETURNS_STRLEN + |KILL_BY_SIGPRC |(?:PERL|USE|HAS)_\w+)\b/x; } 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; @@ -136,7 +132,8 @@ if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $^O ne 'darwin') { # 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; @@ -171,13 +168,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; @@ -202,6 +201,9 @@ if ($ARGS{PLATFORM} ne 'os2') { ); 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 ($ARGS{PLATFORM} ne 'aix') { @@ -246,7 +248,6 @@ unless ($define{'DEBUGGING'}) { Perl_pad_sv Perl_pad_setsv Perl_hv_assert - PL_block_type PL_watchaddr PL_watchok PL_watch_pvx @@ -277,10 +278,15 @@ else { ); } -unless ($define{'PERL_OLD_COPY_ON_WRITE'}) { +unless ($define{'PERL_OLD_COPY_ON_WRITE'} + || $define{'PERL_NEW_COPY_ON_WRITE'}) { ++$skip{Perl_sv_setsv_cow}; } +unless ($define{PERL_SAWAMPERSAND}) { + ++$skip{PL_sawampersand}; +} + unless ($define{'USE_REENTRANT_API'}) { ++$skip{PL_reentrant_buffer}; } @@ -346,6 +352,7 @@ unless ($define{'USE_ITHREADS'}) { unless ($define{'USE_ITHREADS'}) { ++$skip{$_} foreach qw( + PL_check_mutex PL_op_mutex PL_regex_pad PL_regex_padav @@ -353,6 +360,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 @@ -403,27 +414,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}; } @@ -466,7 +456,7 @@ unless ($define{PERL_MAD}) { unless ($define{'MULTIPLICITY'}) { ++$skip{$_} foreach qw( PL_interp_size - PL_interp_size_5_16_0 + PL_interp_size_5_18_0 ); } @@ -487,6 +477,21 @@ 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}; + ++$skip{PL_sig_handlers_initted} unless $define{KILL_BY_SIGPRC}; + } +} + +if ($ARGS{PLATFORM} eq 'vms' && !$define{KILL_BY_SIGPRC}) { + # FAKE_DEFAULT_SIGNAL_HANDLERS defined as KILL_BY_SIGPRC + ++$skip{Perl_csighandler_init}; + ++$skip{Perl_my_kill}; + ++$skip{Perl_sig_to_vmscondition}; + ++$skip{PL_sig_defaulting}; + ++$skip{PL_sig_handlers_initted} unless !$define{HAS_SIGACTION}; } unless ($define{USE_LOCALE_COLLATE}) { @@ -524,16 +529,20 @@ 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 $ARGS{CCTYPE} eq 'GCC'; + try_symbols(qw(PL_Vars PL_VarsPtr)) + unless $ARGS{CCTYPE} eq 'GCC' || $define{PERL_GLOBAL_STRUCT_PRIVATE}; } 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 @@ -546,6 +555,7 @@ my @layer_syms = qw( PerlIOBase_eof PerlIOBase_error PerlIOBase_fileno + PerlIOBase_open PerlIOBase_noop_fail PerlIOBase_noop_ok PerlIOBase_popped @@ -619,7 +629,7 @@ if ($ARGS{PLATFORM} eq 'netware') { 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'}) { @@ -730,35 +740,56 @@ 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 !~ /[xmi]/ || $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}++; + # Should we also skip adding the Perl_ prefix if $flags =~ /o/ ? + $func = "Perl_$func" if ($flags =~ /[pbX]/ && $func !~ /^Perl_/); + ++$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); } } @@ -777,8 +808,6 @@ try_symbols(qw( if ($ARGS{PLATFORM} eq 'win32') { try_symbols(qw( - setgid - setuid win32_free_childdir win32_free_childenv win32_get_childdir @@ -787,6 +816,10 @@ if ($ARGS{PLATFORM} eq 'win32') { )); } +if ($ARGS{PLATFORM} eq 'wince') { + ++$skip{'win32_isatty'}; # commit 4342f4d6df is win32-only +} + if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { try_symbols(qw( Perl_init_os_extras @@ -943,9 +976,6 @@ if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { win32_getchar win32_putchar )); - if ($ARGS{CCTYPE} eq "BORLAND") { - try_symbols('_matherr'); - } } elsif ($ARGS{PLATFORM} eq 'vms') { try_symbols(qw( @@ -1278,11 +1308,12 @@ if ($ARGS{PLATFORM} eq 'os2') { # 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"; @@ -1316,7 +1347,7 @@ elsif ($ARGS{PLATFORM} eq 'aix') { } 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"; } @@ -1324,9 +1355,9 @@ elsif ($ARGS{PLATFORM} eq 'netware') { # Then the symbols -foreach my $symbol (sort keys %export) { +my @symbols = $fold ? sort {lc $a cmp lc $b} keys %export : sort keys %export; +foreach my $symbol (@symbols) { if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { - $symbol = "_$symbol" if $ARGS{CCTYPE} eq 'BORLAND'; print "\t$symbol\n"; } elsif ($ARGS{PLATFORM} eq 'os2') {