X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/1d7c184104c076988718a01b77c8706aae05b092..6adc6a4516fbc0fe7fb1a4cf50d84355f2947fd1:/makedef.pl

diff --git a/makedef.pl b/makedef.pl
index 1d585a2..1065801 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -11,7 +11,11 @@ my $PLATFORM;
 my $CCTYPE;
 
 my %bincompat5005 =
-      (Perl_call_argv		=>	"perl_call_argv",
+      (
+       Perl_call_atexit		=>	"perl_atexit",
+       Perl_eval_sv		=>	"perl_eval_sv",
+       Perl_eval_pv		=>	"perl_eval_pv",
+       Perl_call_argv		=>	"perl_call_argv",
        Perl_call_method		=>	"perl_call_method",
        Perl_call_pv		=>	"perl_call_pv",
        Perl_call_sv		=>	"perl_call_sv",
@@ -34,7 +38,8 @@ my %bincompat5005 =
        Perl_malloc		=>	"malloc",
        Perl_mfree		=>	"free",
        Perl_realloc		=>	"realloc",
-       Perl_calloc		=>	"calloc",);
+       Perl_calloc		=>	"calloc",
+      );
 
 my $bincompat5005 = join("|", keys %bincompat5005);
 
@@ -46,7 +51,7 @@ while (@ARGV) {
     $PLATFORM = $1 if ($flag =~ /^PLATFORM=(\w+)$/);
 }
 
-my @PLATFORM = qw(aix win32 os2);
+my @PLATFORM = qw(aix win32 os2 MacOS);
 my %PLATFORM;
 @PLATFORM{@PLATFORM} = ();
 
@@ -68,12 +73,19 @@ if ($PLATFORM eq 'aix') {
 }
 elsif ($PLATFORM eq 'win32') {
     $CCTYPE = "MSVC" unless defined $CCTYPE;
-    foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym, $pp_sym, $globvar_sym) {
+    foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
+		$pp_sym, $globvar_sym, $perlio_sym) {
 	s!^!..\\!;
     }
 }
+elsif ($PLATFORM eq 'MacOS') {
+    foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
+		$pp_sym, $globvar_sym, $perlio_sym) {
+	s!^!::!;
+    }
+}
 
-unless ($PLATFORM eq 'win32') {
+unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS') {
     open(CFG,$config_sh) || die "Cannot open $config_sh: $!\n";
     while (<CFG>) {
 	if (/^(?:ccflags|optimize)='(.+)'$/) {
@@ -82,7 +94,7 @@ unless ($PLATFORM eq 'win32') {
 	}
 	if ($PLATFORM eq 'os2') {
 	    $CONFIG_ARGS = $1 if /^(?:config_args)='(.+)'$/;
-	    $ARCHNAME = $1 if /^(?:archname)='(.+)'$/;
+	    $ARCHNAME =    $1 if /^(?:archname)='(.+)'$/;
 	}
     }
     close(CFG);
@@ -91,58 +103,56 @@ unless ($PLATFORM eq 'win32') {
 open(CFG,$config_h) || die "Cannot open $config_h: $!\n";
 while (<CFG>) {
     $define{$1} = 1 if /^\s*#\s*define\s+(MYMALLOC)\b/;
-    $define{$1} = 1 if /^\s*#\s*define\s+(USE_THREADS)\b/;
-    $define{$1} = 1 if /^\s*#\s*define\s+(USE_PERLIO)\b/;
     $define{$1} = 1 if /^\s*#\s*define\s+(MULTIPLICITY)\b/;
-    $define{$1} = 1 if /^\s*#\s*define\s+(PERL_BINCOMPAT_5005)\b/;
+    $define{$1} = 1 if /^\s*#\s*define\s+(PERL_\w+)\b/;
+    $define{$1} = 1 if /^\s*#\s*define\s+(USE_\w+)\b/;
 }
 close(CFG);
 
+# perl.h logic duplication begins
+
+if ($define{USE_ITHREADS}) {
+    if (!$define{MULTIPLICITY} && !$define{PERL_OBJECT}) {
+        $define{MULTIPLICITY} = 1;
+    }
+}
+
+$define{PERL_IMPLICIT_CONTEXT} ||=
+    $define{USE_ITHREADS} ||
+    $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
+
 if ($PLATFORM eq 'win32') {
     warn join(' ',keys %define)."\n";
-    if ($define{PERL_OBJECT}) {
-	print "LIBRARY Perl56\n";
-	print "DESCRIPTION 'Perl interpreter'\n";
-	print "EXPORTS\n";
-#    output_symbol("perl_alloc");
+    print "LIBRARY Perl57\n";
+    print "DESCRIPTION 'Perl interpreter'\n";
+    print "EXPORTS\n";
+    if ($define{PERL_IMPLICIT_SYS}) {
 	output_symbol("perl_get_host_info");
 	output_symbol("perl_alloc_override");
-#    output_symbol("perl_construct");
-#    output_symbol("perl_destruct");
-#    output_symbol("perl_free");
-#    output_symbol("perl_parse");
-#    output_symbol("perl_run");
-#    output_symbol("RunPerl");
-#    exit(0);
     }
-    else {
-	if ($CCTYPE ne 'GCC') {
-	    print "LIBRARY Perl\n";
-	    print "DESCRIPTION 'Perl interpreter, export autogenerated'\n";
-	}
-	else {
-	    $define{'PERL_GLOBAL_STRUCT'} = 1;
-	    $define{'MULTIPLICITY'} = 1;
-	}
-	print "EXPORTS\n";
-    } 
 }
 elsif ($PLATFORM eq 'os2') {
     ($v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/;
     $v .= '-thread' if $ARCHNAME =~ /-thread/;
-    #$sum = 0;
-    #for (split //, $v) {
-    #	$sum = ($sum * 33) + ord;
-    #	$sum &= 0xffffff;
-    #}
-    #$sum += $sum >> 5;
-    #$sum &= 0xffff;
-    #$sum = printf '%X', $sum;
     ($dll = $define{PERL_DLL}) =~ s/\.dll$//i;
-    # print STDERR "'$dll' <= '$define{PERL_DLL}'\n";
     print <<"---EOP---";
 LIBRARY '$dll' INITINSTANCE TERMINSTANCE
-DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $CONFIG_ARGS'
+DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter'
 STACKSIZE 32768
 CODE LOADONCALL
 DATA LOADONCALL NONSHARED MULTIPLE
@@ -168,7 +178,7 @@ sub emit_symbols {
     foreach my $symbol (@$list) {
 	my $skipsym = $symbol;
 	# XXX hack
-	if ($define{PERL_OBJECT}) {
+	if ($define{PERL_OBJECT} || $define{MULTIPLICITY}) {
 	    $skipsym =~ s/^Perl_[GIT](\w+)_ptr$/PL_$1/;
 	}
 	emit_symbol($symbol) unless exists $skip{$skipsym};
@@ -244,6 +254,9 @@ elsif ($PLATFORM eq 'aix') {
 		     Perl_safexrealloc
 		     Perl_same_dirent
 		     Perl_unlnk
+		     Perl_sys_intern_clear
+		     Perl_sys_intern_dup
+		     Perl_sys_intern_init
 		     PL_cryptseen
 		     PL_opsave
 		     PL_statusvalue_vms
@@ -259,6 +272,7 @@ elsif ($PLATFORM eq 'os2') {
 		    dlopen
 		    dlsym
 		    dlerror
+		    dlclose
 		    my_tmpfile
 		    my_tmpnam
 		    my_flock
@@ -292,10 +306,38 @@ elsif ($PLATFORM eq 'os2') {
 		    Perl_hab_GET
 		    )]);
 }
+elsif ($PLATFORM eq 'MacOS') {
+    skip_symbols [qw(
+		    Perl_GetVars
+		    PL_cryptseen
+		    PL_cshlen
+		    PL_cshname
+		    PL_statusvalue_vms
+		    PL_sys_intern
+		    PL_opsave
+		    PL_timesbuf
+		    Perl_dump_fds
+		    Perl_my_bcopy
+		    Perl_my_bzero
+		    Perl_my_chsize
+		    Perl_my_htonl
+		    Perl_my_memcmp
+		    Perl_my_memset
+		    Perl_my_ntohl
+		    Perl_my_swap
+		    Perl_safexcalloc
+		    Perl_safexfree
+		    Perl_safexmalloc
+		    Perl_safexrealloc
+		    Perl_unlnk
+		    Perl_sys_intern_clear
+		    Perl_sys_intern_init
+		    )];
+}
+
 
 unless ($define{'DEBUGGING'}) {
     skip_symbols [qw(
-		    Perl_deb
 		    Perl_deb_growlevel
 		    Perl_debop
 		    Perl_debprofdump
@@ -330,19 +372,39 @@ else {
 		    )];
 }
 
+unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) {
+    skip_symbols [qw(
+		    PL_protect
+		    Perl_default_protect
+		    Perl_vdefault_protect
+		    )];
+}
+
 if ($define{'MYMALLOC'}) {
     emit_symbols [qw(
 		    Perl_dump_mstats
+		    Perl_get_mstats
 		    Perl_malloc
 		    Perl_mfree
 		    Perl_realloc
 		    Perl_calloc
 		    )];
+    if ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) {
+	emit_symbols [qw(
+			PL_malloc_mutex
+			)];
+    }
+    else {
+	skip_symbols [qw(
+			PL_malloc_mutex
+			)];
+    }
 }
 else {
     skip_symbols [qw(
 		    PL_malloc_mutex
 		    Perl_dump_mstats
+		    Perl_get_mstats
 		    Perl_malloc
 		    Perl_mfree
 		    Perl_realloc
@@ -351,15 +413,21 @@ else {
 		    )];
 }
 
-unless ($define{'USE_THREADS'}) {
+unless ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) {
     skip_symbols [qw(
 		    PL_thr_key
+		    )];
+}
+
+unless ($define{'USE_5005THREADS'}) {
+    skip_symbols [qw(
 		    PL_sv_mutex
 		    PL_strtab_mutex
 		    PL_svref_mutex
-		    PL_malloc_mutex
 		    PL_cred_mutex
 		    PL_eval_mutex
+		    PL_fdpid_mutex
+		    PL_sv_lock_mutex
 		    PL_eval_cond
 		    PL_eval_owner
 		    PL_threads_mutex
@@ -369,8 +437,6 @@ unless ($define{'USE_THREADS'}) {
 		    PL_threadsv_names
 		    PL_thrsv
 		    PL_vtbl_mutex
-		    Perl_getTHR
-		    Perl_setTHR
 		    Perl_condpair_magic
 		    Perl_new_struct_thread
 		    Perl_per_thread_magicals
@@ -378,12 +444,14 @@ unless ($define{'USE_THREADS'}) {
 		    Perl_find_threadsv
 		    Perl_unlock_condpair
 		    Perl_magic_mutexfree
+		    Perl_sv_lock
 		    )];
 }
 
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
 		    PL_ptr_table
+		    PL_op_mutex
 		    Perl_dirp_dup
 		    Perl_cx_dup
 		    Perl_si_dup
@@ -411,6 +479,7 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
 		    Perl_die_nocontext
 		    Perl_deb_nocontext
 		    Perl_form_nocontext
+		    Perl_load_module_nocontext
 		    Perl_mess_nocontext
 		    Perl_warn_nocontext
 		    Perl_warner_nocontext
@@ -447,16 +516,11 @@ sub readvar {
     return \@syms;
 }
 
-if ($define{'USE_THREADS'} || $define{'MULTIPLICITY'}) {
+if ($define{'USE_5005THREADS'}) {
     my $thrd = readvar($thrdvar_h);
     skip_symbols $thrd;
 }
 
-if ($define{'MULTIPLICITY'}) {
-    my $interp = readvar($intrpvar_h);
-    skip_symbols $interp;
-}
-
 if ($define{'PERL_GLOBAL_STRUCT'}) {
     my $global = readvar($perlvars_h);
     skip_symbols $global;
@@ -466,10 +530,56 @@ if ($define{'PERL_GLOBAL_STRUCT'}) {
 
 # functions from *.sym files
 
-my @syms = ($global_sym, $pp_sym, $globvar_sym);
+my @syms = ($global_sym, $globvar_sym); # $pp_sym is not part of the API
 
 if ($define{'USE_PERLIO'}) {
-     push @syms, $perlio_sym;
+    push @syms, $perlio_sym;
+    if ($define{'USE_SFIO'}) {
+	# SFIO defines most of the PerlIO routines as macros
+	skip_symbols [qw(
+			 PerlIO_canset_cnt
+			 PerlIO_clearerr
+			 PerlIO_close
+			 PerlIO_eof
+			 PerlIO_error
+			 PerlIO_exportFILE
+			 PerlIO_fast_gets
+			 PerlIO_fdopen
+			 PerlIO_fileno
+			 PerlIO_findFILE
+			 PerlIO_flush
+			 PerlIO_get_base
+			 PerlIO_get_bufsiz
+			 PerlIO_get_cnt
+			 PerlIO_get_ptr
+			 PerlIO_getc
+			 PerlIO_getname
+			 PerlIO_has_base
+			 PerlIO_has_cntptr
+			 PerlIO_importFILE
+			 PerlIO_open
+			 PerlIO_printf
+			 PerlIO_putc
+			 PerlIO_puts
+			 PerlIO_read
+			 PerlIO_releaseFILE
+			 PerlIO_reopen
+			 PerlIO_rewind
+			 PerlIO_seek
+			 PerlIO_set_cnt
+			 PerlIO_set_ptrcnt
+			 PerlIO_setlinebuf
+			 PerlIO_sprintf
+			 PerlIO_stderr
+			 PerlIO_stdin
+			 PerlIO_stdout
+			 PerlIO_stdoutf
+			 PerlIO_tell
+			 PerlIO_ungetc
+			 PerlIO_vprintf
+			 PerlIO_write
+			 )];
+    }
 }
 
 for my $syms (@syms) {
@@ -488,11 +598,16 @@ for my $syms (@syms) {
 
 # variables
 
-if ($define{'PERL_OBJECT'}) {
+if ($define{'PERL_OBJECT'} || $define{'MULTIPLICITY'}) {
     for my $f ($perlvars_h, $intrpvar_h, $thrdvar_h) {
 	my $glob = readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
 	emit_symbols $glob;
     }
+    # XXX AIX seems to want the perlvars.h symbols, for some reason
+    if ($PLATFORM eq 'aix') {
+	my $glob = readvar($perlvars_h);
+	emit_symbols $glob;
+    }
 }
 else {
     unless ($define{'PERL_GLOBAL_STRUCT'}) {
@@ -503,7 +618,7 @@ else {
 	my $glob = readvar($intrpvar_h);
 	emit_symbols $glob;
     } 
-    unless ($define{'MULTIPLICITY'} || $define{'USE_THREADS'}) {
+    unless ($define{'MULTIPLICITY'} || $define{'USE_5005THREADS'}) {
 	my $glob = readvar($thrdvar_h);
 	emit_symbols $glob;
     } 
@@ -526,46 +641,15 @@ while (<DATA>) {
 
 if ($PLATFORM eq 'win32') {
     foreach my $symbol (qw(
+			    setuid
+			    setgid
 			    boot_DynaLoader
-			    Perl_getTHR
 			    Perl_init_os_extras
-			    Perl_setTHR
 			    Perl_thread_create
 			    Perl_win32_init
 			    RunPerl
-			    GetPerlInterpreter
-			    SetPerlInterpreter
 			    win32_errno
 			    win32_environ
-			    win32_stdin
-			    win32_stdout
-			    win32_stderr
-			    win32_ferror
-			    win32_feof
-			    win32_strerror
-			    win32_fprintf
-			    win32_printf
-			    win32_vfprintf
-			    win32_vprintf
-			    win32_fread
-			    win32_fwrite
-			    win32_fopen
-			    win32_fdopen
-			    win32_freopen
-			    win32_fclose
-			    win32_fputs
-			    win32_fputc
-			    win32_ungetc
-			    win32_getc
-			    win32_fileno
-			    win32_clearerr
-			    win32_fflush
-			    win32_ftell
-			    win32_fseek
-			    win32_fgetpos
-			    win32_fsetpos
-			    win32_rewind
-			    win32_tmpfile
 			    win32_abort
 			    win32_fstat
 			    win32_stat
@@ -636,17 +720,6 @@ if ($PLATFORM eq 'win32') {
 			    win32_getenv
 			    win32_putenv
 			    win32_perror
-			    win32_setbuf
-			    win32_setvbuf
-			    win32_flushall
-			    win32_fcloseall
-			    win32_fgets
-			    win32_gets
-			    win32_fgetc
-			    win32_putc
-			    win32_puts
-			    win32_getchar
-			    win32_putchar
 			    win32_malloc
 			    win32_calloc
 			    win32_realloc
@@ -678,6 +751,47 @@ if ($PLATFORM eq 'win32') {
 			    win32_getpid
 			    win32_crypt
 			    win32_dynaload
+
+			    win32_stdin
+			    win32_stdout
+			    win32_stderr
+			    win32_ferror
+			    win32_feof
+			    win32_strerror
+			    win32_fprintf
+			    win32_printf
+			    win32_vfprintf
+			    win32_vprintf
+			    win32_fread
+			    win32_fwrite
+			    win32_fopen
+			    win32_fdopen
+			    win32_freopen
+			    win32_fclose
+			    win32_fputs
+			    win32_fputc
+			    win32_ungetc
+			    win32_getc
+			    win32_fileno
+			    win32_clearerr
+			    win32_fflush
+			    win32_ftell
+			    win32_fseek
+			    win32_fgetpos
+			    win32_fsetpos
+			    win32_rewind
+			    win32_tmpfile
+			    win32_setbuf
+			    win32_setvbuf
+			    win32_flushall
+			    win32_fcloseall
+			    win32_fgets
+			    win32_gets
+			    win32_fgetc
+			    win32_putc
+			    win32_puts
+			    win32_getchar
+			    win32_putchar
 			   ))
     {
 	try_symbol($symbol);
@@ -692,6 +806,15 @@ elsif ($PLATFORM eq 'os2') {
 		    keys %export;
     delete $export{$_} foreach @missing;
 }
+elsif ($PLATFORM eq 'MacOS') {
+    open MACSYMS, 'macperl.sym' or die 'Cannot read macperl.sym';
+
+    while (<MACSYMS>) {
+	try_symbol($_);
+    }
+
+    close MACSYMS;
+}
 
 # Now all symbols should be defined because
 # next we are going to output them.
@@ -738,7 +861,7 @@ sub output_symbol {
     elsif ($PLATFORM eq 'os2') {
 	print qq(    "$symbol"\n);
     }
-    elsif ($PLATFORM eq 'aix') {
+    elsif ($PLATFORM eq 'aix' || $PLATFORM eq 'MacOS') {
 	print "$symbol\n";
     }
 }
@@ -755,3 +878,38 @@ 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_eof
+PerlIOBuf_tell
+PerlIOBuf_seek
+PerlIOBuf_write
+PerlIOBuf_unread
+PerlIOBuf_read
+PerlIOBuf_reopen
+PerlIOBuf_open
+PerlIOBuf_fdopen
+PerlIOBase_fileno
+PerlIOBuf_pushed
+PerlIOBuf_fill
+PerlIOBuf_flush
+PerlIOBase_close
+PerlIO_define_layer
+PerlIO_pending
+PerlIO_unread
+PerlIO_push
+PerlIO_apply_layers
+perlsio_binmode
+PerlIO_binmode
+PerlIO_init
+PerlIO_tmpfile
+PerlIO_setpos
+PerlIO_getpos
+PerlIO_vsprintf
+PerlIO_sprintf