X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/86593e8d8ee0ffb23da66937d9707ed328109754..5d09376139b46c5461305dad36ad2e2ee513e399:/makedef.pl diff --git a/makedef.pl b/makedef.pl index 02305c2..8dc1f14 100644 --- a/makedef.pl +++ b/makedef.pl @@ -50,14 +50,17 @@ while (@ARGV) { $define{$1} = $2 if ($flag =~ /^-D(\w+)=(.+)$/); $CCTYPE = $1 if ($flag =~ /^CCTYPE=(\w+)$/); $PLATFORM = $1 if ($flag =~ /^PLATFORM=(\w+)$/); + if ($PLATFORM eq 'netware') { + $FILETYPE = $1 if ($flag =~ /^FILETYPE=(\w+)$/); + } } -my @PLATFORM = qw(aix win32 os2 MacOS); +my @PLATFORM = qw(aix win32 os2 MacOS netware); my %PLATFORM; @PLATFORM{@PLATFORM} = (); defined $PLATFORM || die "PLATFORM undefined, must be one of: @PLATFORM\n"; -exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n"; +exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n"; my $config_sh = "config.sh"; my $config_h = "config.h"; @@ -69,10 +72,10 @@ my $pp_sym = "pp.sym"; my $globvar_sym = "globvar.sym"; my $perlio_sym = "perlio.sym"; -if ($PLATFORM eq 'aix') { +if ($PLATFORM eq 'aix') { # Nothing for now. } -elsif ($PLATFORM eq 'win32') { +elsif ($PLATFORM eq 'win32' || $PLATFORM eq 'netware') { $CCTYPE = "MSVC" unless defined $CCTYPE; foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym, $pp_sym, $globvar_sym, $perlio_sym) { @@ -86,7 +89,7 @@ elsif ($PLATFORM eq 'MacOS') { } } -unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS') { +unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS' || $PLATFORM eq 'netware') { open(CFG,$config_sh) || die "Cannot open $config_sh: $!\n"; while () { if (/^(?:ccflags|optimize)='(.+)'$/) { @@ -94,8 +97,9 @@ unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS') { $define{$1} = 1 while /-D(\w+)/g; } if ($PLATFORM eq 'os2') { - $CONFIG_ARGS = $1 if /^(?:config_args)='(.+)'$/; - $ARCHNAME = $1 if /^(?:archname)='(.+)'$/; + $CONFIG_ARGS = $1 if /^config_args='(.+)'$/; + $ARCHNAME = $1 if /^archname='(.+)'$/; + $PATCHLEVEL = $1 if /^perl_patchlevel='(.+)'$/; } } close(CFG); @@ -112,8 +116,12 @@ 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{PERL_OBJECT}) { + if (!$define{MULTIPLICITY}) { $define{MULTIPLICITY} = 1; } } @@ -123,20 +131,10 @@ $define{PERL_IMPLICIT_CONTEXT} ||= $define{USE_5005THREADS} || $define{MULTIPLICITY} ; -if ($define{PERL_CAPI}) { - delete $define{PERL_OBJECT}; - $define{MULTIPLICITY} = 1; - $define{PERL_IMPLICIT_CONTEXT} = 1; - $define{PERL_IMPLICIT_SYS} = 1; -} - -if ($define{PERL_OBJECT}) { - $define{PERL_IMPLICIT_CONTEXT} = 1; - $define{PERL_IMPLICIT_SYS} = 1; -} - # perl.h logic duplication ends +my $sym_ord = 0; + if ($PLATFORM eq 'win32') { warn join(' ',keys %define)."\n"; print "LIBRARY Perl57\n"; @@ -145,15 +143,30 @@ if ($PLATFORM eq 'win32') { if ($define{PERL_IMPLICIT_SYS}) { output_symbol("perl_get_host_info"); output_symbol("perl_alloc_override"); + output_symbol("perl_clone_host"); } } elsif ($PLATFORM eq 'os2') { + if (open my $fh, '<', 'perl5.def') { + while (<$fh>) { + last if /^\s*EXPORTS\b/; + } + while (<$fh>) { + $ordinal{$1} = $2 if /^\s*"(\w+)"\s*\@(\d+)\s*$/; + # This allows skipping ordinals which were used in older versions + $sym_ord = $1 if /^\s*;\s*LAST_ORDINAL\s*=\s*(\d+)\s*$/; + } + $sym_ord < $_ and $sym_ord = $_ for values %ordinal; # Take the max + } ($v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/; $v .= '-thread' if $ARCHNAME =~ /-thread/; ($dll = $define{PERL_DLL}) =~ s/\.dll$//i; + $v .= "\@$PATCHLEVEL" if $PATCHLEVEL; + $d = "DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $CONFIG_ARGS'"; + $d = substr($d, 0, 249) . "...'" if length $d > 253; print <<"---EOP---"; LIBRARY '$dll' INITINSTANCE TERMINSTANCE -DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter' +$d STACKSIZE 32768 CODE LOADONCALL DATA LOADONCALL NONSHARED MULTIPLE @@ -161,7 +174,27 @@ EXPORTS ---EOP--- } elsif ($PLATFORM eq 'aix') { - print "#!\n"; + $OSVER = `uname -v`; + chop $OSVER; + $OSREL = `uname -r`; + chop $OSREL; + if ($OSVER > 4 || ($OSVER == 4 && $OSREL >= 3)) { + print "#! ..\n"; + } else { + print "#!\n"; + } +} +elsif ($PLATFORM eq 'netware') { + if ($FILETYPE eq 'def') { + print "LIBRARY Perl57\n"; + print "DESCRIPTION 'Perl interpreter for NetWare'\n"; + print "EXPORTS\n"; + } + if ($define{PERL_IMPLICIT_SYS}) { + output_symbol("perl_get_host_info"); + output_symbol("perl_alloc_override"); + output_symbol("perl_clone_host"); + } } my %skip; @@ -179,7 +212,7 @@ sub emit_symbols { foreach my $symbol (@$list) { my $skipsym = $symbol; # XXX hack - if ($define{PERL_OBJECT} || $define{MULTIPLICITY}) { + if ($define{MULTIPLICITY}) { $skipsym =~ s/^Perl_[GIT](\w+)_ptr$/PL_$1/; } emit_symbol($symbol) unless exists $skip{$skipsym}; @@ -213,6 +246,7 @@ if ($PLATFORM eq 'win32') { Perl_dump_fds Perl_init_thread_intern Perl_my_bzero + Perl_my_bcopy Perl_my_htonl Perl_my_ntohl Perl_my_swap @@ -269,6 +303,8 @@ elsif ($PLATFORM eq 'os2') { ctermid get_sysinfo Perl_OS2_init + Perl_OS2_init3 + Perl_OS2_term OS2_Perl_data dlopen dlsym @@ -277,6 +313,16 @@ elsif ($PLATFORM eq 'os2') { my_tmpfile my_tmpnam my_flock + my_rmdir + my_mkdir + my_getpwuid + my_getpwnam + my_getpwent + my_setpwent + my_endpwent + setgrent + endgrent + getgrent malloc_mutex threads_mutex nthreads @@ -305,6 +351,11 @@ elsif ($PLATFORM eq 'os2') { init_PMWIN_entries PMWIN_entries Perl_hab_GET + loadByOrdinal + pExtFCN + os2error + ResetWinError + CroakWinError )]); } elsif ($PLATFORM eq 'MacOS') { @@ -335,7 +386,56 @@ elsif ($PLATFORM eq 'MacOS') { Perl_sys_intern_init )]; } - +elsif ($PLATFORM eq 'netware') { + skip_symbols [qw( + PL_statusvalue_vms + PL_archpat_auto + PL_cryptseen + PL_DBcv + PL_generation + PL_lastgotoprobe + PL_linestart + PL_modcount + PL_pending_ident + PL_sortcxix + PL_sublex_info + PL_timesbuf + main + Perl_ErrorNo + Perl_GetVars + Perl_do_exec3 + Perl_do_ipcctl + Perl_do_ipcget + Perl_do_msgrcv + Perl_do_msgsnd + Perl_do_semop + Perl_do_shmio + Perl_dump_fds + Perl_init_thread_intern + Perl_my_bzero + Perl_my_htonl + Perl_my_ntohl + Perl_my_swap + Perl_my_chsize + Perl_same_dirent + Perl_setenv_getix + Perl_unlnk + Perl_watch + Perl_safexcalloc + Perl_safexmalloc + Perl_safexfree + Perl_safexrealloc + Perl_my_memcmp + Perl_my_memset + PL_cshlen + PL_cshname + PL_opsave + Perl_do_exec + Perl_getenv_len + Perl_my_pclose + Perl_my_popen + )]; +} unless ($define{'DEBUGGING'}) { skip_symbols [qw( @@ -344,7 +444,6 @@ unless ($define{'DEBUGGING'}) { Perl_debprofdump Perl_debstack Perl_debstackptrs - Perl_runops_debug Perl_sv_peek PL_block_type PL_watchaddr @@ -381,14 +480,18 @@ unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) { )]; } +unless ($define{'USE_REENTRANT_API'}) { + skip_symbols [qw( + PL_reentrant_buffer + )]; +} + if ($define{'MYMALLOC'}) { emit_symbols [qw( Perl_dump_mstats Perl_get_mstats - Perl_malloc - Perl_mfree - Perl_realloc - Perl_calloc + Perl_strdup + Perl_putenv )]; if ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) { emit_symbols [qw( @@ -406,10 +509,6 @@ else { PL_malloc_mutex Perl_dump_mstats Perl_get_mstats - Perl_malloc - Perl_mfree - Perl_realloc - Perl_calloc Perl_malloced_size )]; } @@ -453,6 +552,10 @@ unless ($define{'USE_ITHREADS'}) { skip_symbols [qw( PL_ptr_table PL_op_mutex + PL_regex_pad + PL_regex_padav + PL_sharedsv_space + PL_sharedsv_space_mutex Perl_dirp_dup Perl_cx_dup Perl_si_dup @@ -475,6 +578,13 @@ unless ($define{'USE_ITHREADS'}) { Perl_ptr_table_store perl_clone perl_clone_using + Perl_sharedsv_find + Perl_sharedsv_init + Perl_sharedsv_lock + Perl_sharedsv_new + Perl_sharedsv_thrcnt_dec + Perl_sharedsv_thrcnt_inc + Perl_sharedsv_unlock )]; } @@ -507,6 +617,14 @@ unless ($define{'FAKE_THREADS'}) { skip_symbols [qw(PL_curthr)]; } +unless ($define{'PL_OP_SLAB_ALLOC'}) { + skip_symbols [qw( + PL_OpPtr + PL_OpSlab + PL_OpSpace + )]; +} + sub readvar { my $file = shift; my $proc = shift || sub { "PL_$_[2]" }; @@ -516,8 +634,8 @@ sub readvar { # All symbols have a Perl_ prefix because that's what embed.h # sticks in front of them. push(@syms, &$proc($1,$2,$3)) if (/\bPERLVAR(A?I?C?)\(([IGT])(\w+)/); - } - close(VARS); + } + close(VARS); return \@syms; } @@ -537,9 +655,46 @@ if ($define{'PERL_GLOBAL_STRUCT'}) { my @syms = ($global_sym, $globvar_sym); # $pp_sym is not part of the API +my @layer_syms = qw( + PerlIOBase_clearerr + PerlIOBase_close + PerlIOBase_dup + PerlIOBase_eof + PerlIOBase_error + PerlIOBase_fileno + PerlIOBase_pushed + PerlIOBase_read + PerlIOBase_setlinebuf + PerlIOBase_unread + PerlIOBuf_bufsiz + PerlIOBuf_fill + PerlIOBuf_flush + PerlIOBuf_get_cnt + PerlIOBuf_get_ptr + PerlIOBuf_open + PerlIOBuf_pushed + PerlIOBuf_read + PerlIOBuf_seek + PerlIOBuf_set_ptrcnt + PerlIOBuf_tell + PerlIOBuf_unread + PerlIOBuf_write + PerlIO_allocate + PerlIO_arg_fetch + PerlIO_define_layer + PerlIO_modestr + PerlIO_pending + PerlIO_push + PerlIO_sv_dup + PL_def_layerlist + PL_known_layers + PL_perlio +); + if ($define{'USE_PERLIO'}) { push @syms, $perlio_sym; if ($define{'USE_SFIO'}) { + skip_symbols \@layer_syms; # SFIO defines most of the PerlIO routines as macros skip_symbols [qw( PerlIO_canset_cnt @@ -585,36 +740,9 @@ if ($define{'USE_PERLIO'}) { PerlIO_write )]; } - else { +} else { # Skip the PerlIO New Generation symbols. - skip_symbols [qw( - PerlIOBase_clearerr - PerlIOBase_close - PerlIOBase_eof - PerlIOBase_error - PerlIOBase_fileno - PerlIOBuf_bufsiz - PerlIOBuf_fdopen - PerlIOBuf_fill - PerlIOBuf_flush - PerlIOBuf_get_cnt - PerlIOBuf_get_ptr - PerlIOBuf_open - PerlIOBuf_pushed - PerlIOBuf_read - PerlIOBuf_reopen - PerlIOBuf_seek - PerlIOBuf_set_ptrcnt - PerlIOBuf_setlinebuf - PerlIOBuf_tell - PerlIOBuf_unread - PerlIOBuf_write - PerlIO_define_layer - PerlIO_pending - PerlIO_push - PerlIO_unread - )]; - } + skip_symbols \@layer_syms; } for my $syms (@syms) { @@ -633,7 +761,7 @@ for my $syms (@syms) { # variables -if ($define{'PERL_OBJECT'} || $define{'MULTIPLICITY'}) { +if ($define{'MULTIPLICITY'}) { for my $f ($perlvars_h, $intrpvar_h, $thrdvar_h) { my $glob = readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" }); emit_symbols $glob; @@ -648,21 +776,21 @@ else { unless ($define{'PERL_GLOBAL_STRUCT'}) { my $glob = readvar($perlvars_h); emit_symbols $glob; - } + } unless ($define{'MULTIPLICITY'}) { my $glob = readvar($intrpvar_h); emit_symbols $glob; - } + } unless ($define{'MULTIPLICITY'} || $define{'USE_5005THREADS'}) { my $glob = readvar($thrdvar_h); emit_symbols $glob; - } + } } sub try_symbol { my $symbol = shift; - return if $symbol !~ /^[A-Za-z]/; + return if $symbol !~ /^[A-Za-z_]/; return if $symbol =~ /^\#/; $symbol =~s/\r//g; chomp($symbol); @@ -683,6 +811,7 @@ if ($PLATFORM eq 'win32') { Perl_thread_create Perl_win32_init RunPerl + win32_async_check win32_errno win32_environ win32_abort @@ -786,7 +915,11 @@ if ($PLATFORM eq 'win32') { win32_getpid win32_crypt win32_dynaload - + win32_get_childenv + win32_free_childenv + win32_clearenv + win32_get_childdir + win32_free_childdir win32_stdin win32_stdout win32_stderr @@ -850,6 +983,142 @@ elsif ($PLATFORM eq 'MacOS') { close MACSYMS; } +elsif ($PLATFORM eq 'netware') { +foreach my $symbol (qw( + boot_DynaLoader + Perl_init_os_extras + Perl_thread_create + Perl_nw5_init + RunPerl + AllocStdPerl + FreeStdPerl + do_spawn2 + do_aspawn + nw_uname + nw_stdin + nw_stdout + nw_stderr + nw_feof + nw_ferror + nw_fopen + nw_fclose + nw_clearerr + nw_getc + nw_fgets + nw_fputc + nw_fputs + nw_fflush + nw_ungetc + nw_fileno + nw_fdopen + nw_freopen + nw_fread + nw_fwrite + nw_setbuf + nw_setvbuf + nw_vfprintf + nw_ftell + nw_fseek + nw_rewind + nw_tmpfile + nw_fgetpos + nw_fsetpos + nw_dup + nw_access + nw_chmod + nw_chsize + nw_close + nw_dup2 + nw_flock + nw_isatty + nw_link + nw_lseek + nw_stat + nw_mktemp + nw_open + nw_read + nw_rename + nw_setmode + nw_unlink + nw_utime + nw_write + nw_chdir + nw_rmdir + nw_closedir + nw_opendir + nw_readdir + nw_rewinddir + nw_seekdir + nw_telldir + nw_htonl + nw_htons + nw_ntohl + nw_ntohs + nw_accept + nw_bind + nw_connect + nw_endhostent + nw_endnetent + nw_endprotoent + nw_endservent + nw_gethostbyaddr + nw_gethostbyname + nw_gethostent + nw_gethostname + nw_getnetbyaddr + nw_getnetbyname + nw_getnetent + nw_getpeername + nw_getprotobyname + nw_getprotobynumber + nw_getprotoent + nw_getservbyname + nw_getservbyport + nw_getservent + nw_getsockname + nw_getsockopt + nw_inet_addr + nw_listen + nw_socket + nw_recv + nw_recvfrom + nw_select + nw_send + nw_sendto + nw_sethostent + nw_setnetent + nw_setprotoent + nw_setservent + nw_setsockopt + nw_inet_ntoa + nw_shutdown + nw_crypt + nw_execvp + nw_kill + nw_Popen + nw_Pclose + nw_Pipe + nw_times + nw_waitpid + nw_getpid + nw_spawnvp + nw_os_id + nw_open_osfhandle + nw_get_osfhandle + nw_abort + nw_sleep + nw_wait + nw_dynaload + nw_strerror + fnFpSetMode + fnInsertHashListAddrs + fnGetHashListAddrs + Perl_deb + )) + { + try_symbol($symbol); + } +} # Now all symbols should be defined because # next we are going to output them. @@ -858,9 +1127,18 @@ foreach my $symbol (sort keys %export) { output_symbol($symbol); } +if ($PLATFORM eq 'netware') { + # This may not be the right way to do. This is to make sure + # that the last symbol will not contain a comma else + # Watcom linker cribs + print "\tdummy\n"; +} elsif ($PLATFORM eq 'os2') { + print "; LAST_ORDINAL=$sym_ord\n"; +} + sub emit_symbol { my $symbol = shift; - chomp($symbol); + chomp($symbol); $export{$symbol} = 1; } @@ -894,16 +1172,21 @@ sub output_symbol { # } } elsif ($PLATFORM eq 'os2') { - print qq( "$symbol"\n); + printf qq( %-31s \@%s\n), + qq("$symbol"), $ordinal{$symbol} || ++$sym_ord; } elsif ($PLATFORM eq 'aix' || $PLATFORM eq 'MacOS') { print "$symbol\n"; } + elsif ($PLATFORM eq 'netware') { + print "\t$symbol,\n"; + } } 1; __DATA__ # extra globals not included above. +Perl_cxinc perl_alloc perl_alloc_using perl_clone @@ -913,38 +1196,44 @@ perl_destruct perl_free perl_parse perl_run -PerlIO_define_layer -PerlIOBuf_set_ptrcnt -PerlIOBuf_get_cnt -PerlIOBuf_get_ptr -PerlIOBuf_bufsiz -PerlIOBuf_setlinebuf PerlIOBase_clearerr -PerlIOBase_error +PerlIOBase_close +PerlIOBase_dup PerlIOBase_eof -PerlIOBuf_tell -PerlIOBuf_seek -PerlIOBuf_write -PerlIOBuf_unread -PerlIOBuf_read -PerlIOBuf_reopen -PerlIOBuf_open -PerlIOBuf_fdopen +PerlIOBase_error PerlIOBase_fileno -PerlIOBuf_pushed +PerlIOBase_pushed +PerlIOBase_read +PerlIOBase_setlinebuf +PerlIOBase_unread +PerlIOBuf_bufsiz PerlIOBuf_fill PerlIOBuf_flush -PerlIOBase_close -PerlIO_define_layer -PerlIO_pending -PerlIO_unread -PerlIO_push +PerlIOBuf_get_cnt +PerlIOBuf_get_ptr +PerlIOBuf_open +PerlIOBuf_pushed +PerlIOBuf_read +PerlIOBuf_seek +PerlIOBuf_set_ptrcnt +PerlIOBuf_tell +PerlIOBuf_unread +PerlIOBuf_write +PerlIO_allocate PerlIO_apply_layers -perlsio_binmode +PerlIO_arg_fetch PerlIO_binmode +PerlIO_define_layer +PerlIO_define_layer +PerlIO_getpos PerlIO_init -PerlIO_tmpfile +PerlIO_modestr +PerlIO_pending +PerlIO_perlio +PerlIO_push PerlIO_setpos -PerlIO_getpos -PerlIO_vsprintf PerlIO_sprintf +PerlIO_sv_dup +PerlIO_tmpfile +PerlIO_vsprintf +perlsio_binmode