This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
pp_pack.c: Use safe UTF8SKIP
[perl5.git] / makedef.pl
index 5f26bcb..42436c7 100644 (file)
 #    perl.imp    NetWare
 #    makedef.lis VMS
 
-BEGIN { unshift @INC, "lib" }
-use Config;
-use strict;
-
-my %ARGS = (CCTYPE => 'MSVC', TARG_DIR => '');
-
+my $fold;
+my %ARGS;
 my %define;
 
-my $fold;
+BEGIN {
+    BEGIN { unshift @INC, "lib" }
+    use Config;
+    use strict;
 
-sub process_cc_flags {
-    foreach (map {split /\s+/, $_} @_) {
-       $define{$1} = $2 // 1 if /^-D(\w+)(?:=(.+))?/;
-    }
-}
+    %ARGS = (CCTYPE => 'MSVC', TARG_DIR => '');
 
-while (@ARGV) {
-    my $flag = shift;
-    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;
+    sub process_cc_flags {
+       foreach (map {split /\s+/, $_} @_) {
+           $define{$1} = $2 // 1 if /^-D(\w+)(?:=(.+))?/;
+       }
     }
-}
-
-require "$ARGS{TARG_DIR}regen/embed_lib.pl";
 
-{
+    while (@ARGV) {
+       my $flag = shift;
+       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;
+       }
+    }
     my @PLATFORM = qw(aix win32 wince os2 netware vms test);
     my %PLATFORM;
     @PLATFORM{@PLATFORM} = ();
@@ -71,6 +68,9 @@ require "$ARGS{TARG_DIR}regen/embed_lib.pl";
     die "PLATFORM must be one of: @PLATFORM\n"
        unless exists $PLATFORM{$ARGS{PLATFORM}};
 }
+use constant PLATFORM => $ARGS{PLATFORM};
+
+require "./$ARGS{TARG_DIR}regen/embed_lib.pl";
 
 # Is the following guard strictly necessary? Added during refactoring
 # to keep the same behaviour when merging other code into here.
@@ -108,7 +108,6 @@ my $config_h = 'config.h';
 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
                                            |KILL_BY_SIGPRC
                                            |(?:PERL|USE|HAS)_\w+)\b/x;
 }
@@ -126,10 +125,47 @@ $define{PERL_IMPLICIT_CONTEXT} ||=
     $define{USE_ITHREADS} ||
     $define{MULTIPLICITY} ;
 
-if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $^O ne 'darwin') {
+if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $ARGS{PLATFORM} ne 'netware') {
     $define{USE_REENTRANT_API} = 1;
 }
 
+if (! $define{NO_LOCALE}) {
+    if ( ! $define{NO_POSIX_2008_LOCALE}
+        && $define{HAS_NEWLOCALE}
+        && $define{HAS_USELOCALE}
+        && $define{HAS_DUPLOCALE}
+        && $define{HAS_FREELOCALE})
+    {
+        $define{HAS_POSIX_2008_LOCALE} = 1;
+        $define{USE_LOCALE} = 1;
+    }
+    elsif ($define{HAS_SETLOCALE}) {
+        $define{USE_LOCALE} = 1;
+    }
+}
+
+my $cctype = $ARGS{CCTYPE} =~ s/MSVC//r;
+if (! $define{HAS_SETLOCALE} && $define{HAS_POSIX_2008_LOCALE}) {
+    $define{USE_POSIX_2008_LOCALE} = 1;
+    $define{USE_THREAD_SAFE_LOCALE} = 1;
+}
+elsif (   ($define{USE_ITHREADS} || $define{USE_THREAD_SAFE_LOCALE})
+       && (    $define{HAS_POSIX_2008_LOCALE}
+           || ($ARGS{PLATFORM} eq 'win32' && (   $cctype !~ /\D/
+                                              && $cctype >= 80)))
+       && ! $define{NO_THREAD_SAFE_LOCALE})
+{
+    $define{USE_THREAD_SAFE_LOCALE} = 1 unless $define{USE_THREAD_SAFE_LOCALE};
+    $define{USE_POSIX_2008_LOCALE} = 1 if $define{HAS_POSIX_2008_LOCALE};
+}
+
+if (   $ARGS{PLATFORM} eq 'win32'
+    && $define{USE_THREAD_SAFE_LOCALE}
+    && $cctype < 140)
+{
+    $define{TS_W32_BROKEN_LOCALECONV} = 1;
+}
+
 # perl.h logic duplication ends
 
 print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n"
@@ -206,13 +242,13 @@ if ($ARGS{PLATFORM} ne 'os2') {
         ++$skip{Perl_my_symlink} unless $Config{d_symlink};
     } else {
        ++$skip{PL_statusvalue_vms};
+       ++$skip{PL_perllib_sep};
        if ($ARGS{PLATFORM} ne 'aix') {
            ++$skip{$_} foreach qw(
                                PL_DBcv
                                PL_generation
                                PL_lastgotoprobe
                                PL_modcount
-                               PL_timesbuf
                                main
                                 );
        }
@@ -253,11 +289,11 @@ unless ($define{'DEBUGGING'}) {
                    Perl_debstackptrs
                    Perl_pad_sv
                    Perl_pad_setsv
+                    Perl__setlocale_debug_string
                    Perl_set_padlist
                    Perl_hv_assert
                    PL_watchaddr
                    PL_watchok
-                   PL_watch_pvx
                         );
 }
 
@@ -285,8 +321,7 @@ else {
                         );
 }
 
-unless ($define{'PERL_OLD_COPY_ON_WRITE'}
-     || $define{'PERL_NEW_COPY_ON_WRITE'}) {
+if (!$define{'PERL_COPY_ON_WRITE'} || $define{'PERL_NO_COW'}) {
     ++$skip{Perl_sv_setsv_cow};
 }
 
@@ -327,6 +362,8 @@ if ($define{'PERL_USE_SAFE_PUTENV'}) {
 
 unless ($define{'USE_ITHREADS'}) {
     ++$skip{PL_thr_key};
+    ++$skip{PL_user_prop_mutex};
+    ++$skip{PL_user_def_props_aTHX};
 }
 
 # USE_5005THREADS symbols. Kept as reference for easier removal
@@ -359,12 +396,16 @@ unless ($define{'USE_ITHREADS'}) {
 
 unless ($define{'USE_ITHREADS'}) {
     ++$skip{$_} foreach qw(
+                    PL_keyword_plugin_mutex
                    PL_check_mutex
                    PL_op_mutex
                    PL_regex_pad
                    PL_regex_padav
                    PL_dollarzero_mutex
                    PL_hints_mutex
+                   PL_locale_mutex
+                   PL_lc_numeric_mutex
+                   PL_lc_numeric_mutex_depth
                    PL_my_ctx_mutex
                    PL_perlio_mutex
                    PL_stashpad
@@ -398,12 +439,33 @@ unless ($define{'USE_ITHREADS'}) {
                         );
 }
 
+if (      $define{NO_LOCALE}
+    || (! $define{USE_ITHREADS} && ! $define{USE_THREAD_SAFE_LOCALE}))
+{
+    ++$skip{$_} foreach qw(
+        PL_C_locale_obj
+        PL_curlocales
+    );
+}
+
+unless ( $define{'HAS_NEWLOCALE'}
+    &&   $define{'HAS_FREELOCALE'}
+    &&   $define{'HAS_USELOCALE'}
+    && ! $define{'NO_POSIX_2008_LOCALE'})
+{
+    ++$skip{$_} foreach qw(
+        PL_C_locale_obj
+        PL_underlying_numeric_obj
+    );
+}
+
 unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
     ++$skip{$_} foreach qw(
                    PL_my_cxt_index
                    PL_my_cxt_list
                    PL_my_cxt_size
                    PL_my_cxt_keys
+                   PL_my_cxt_keys_size
                    Perl_croak_nocontext
                    Perl_die_nocontext
                    Perl_deb_nocontext
@@ -421,157 +483,22 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
                    Perl_my_cxt_index
                         );
 }
-if ($define{'NO_MATHOMS'}) {
+
+if ($define{USE_THREAD_SAFE_LOCALE}) {
+    ++$skip{PL_lc_numeric_mutex};
+    ++$skip{PL_lc_numeric_mutex_depth};
+    if (! $define{TS_W32_BROKEN_LOCALECONV}) {
+        ++$skip{PL_locale_mutex};
+    }
+}
+
+unless ($define{'USE_DTRACE'}) {
     ++$skip{$_} foreach qw(
-                   ASCII_TO_NEED
-                   NATIVE_TO_NEED
-                   Perl_custom_op_desc
-                   Perl_custom_op_name
-                   Perl_do_aexec
-                   Perl_do_binmode
-                   Perl_do_open
-                   Perl_do_open9
-                   Perl_fprintf_nocontext
-                   Perl_gv_AVadd
-                   Perl_gv_HVadd
-                   Perl_gv_IOadd
-                   Perl_gv_SVadd
-                   Perl_gv_efullname
-                   Perl_gv_efullname3
-                   Perl_gv_fetchmethod
-                   Perl_gv_fullname
-                   Perl_gv_fullname3
-                   Perl_hv_delete
-                   Perl_hv_delete_ent
-                   Perl_hv_exists
-                   Perl_hv_exists_ent
-                   Perl_hv_fetch
-                   Perl_hv_fetch_ent
-                   Perl_hv_iternext
-                   Perl_hv_magic
-                   Perl_hv_store
-                   Perl_hv_store_ent
-                   Perl_hv_store_flags
-                   Perl_init_i18nl14n
-                   Perl_isALNUM_lazy
-                   Perl_isIDFIRST_lazy
-                   Perl_is_uni_alnum
-                   Perl_is_uni_alnum_lc
-                   Perl_is_uni_alnumc
-                   Perl_is_uni_alnumc_lc
-                   Perl_is_uni_alpha
-                   Perl_is_uni_alpha_lc
-                   Perl_is_uni_ascii
-                   Perl_is_uni_ascii_lc
-                   Perl_is_uni_blank
-                   Perl_is_uni_blank_lc
-                   Perl_is_uni_cntrl
-                   Perl_is_uni_cntrl_lc
-                   Perl_is_uni_digit
-                   Perl_is_uni_digit_lc
-                   Perl_is_uni_graph
-                   Perl_is_uni_graph_lc
-                   Perl_is_uni_idfirst
-                   Perl_is_uni_idfirst_lc
-                   Perl_is_uni_lower
-                   Perl_is_uni_lower_lc
-                   Perl_is_uni_print
-                   Perl_is_uni_print_lc
-                   Perl_is_uni_punct
-                   Perl_is_uni_punct_lc
-                   Perl_is_uni_space
-                   Perl_is_uni_space_lc
-                   Perl_is_uni_upper
-                   Perl_is_uni_upper_lc
-                   Perl_is_uni_xdigit
-                   Perl_is_uni_xdigit_lc
-                   Perl_is_utf8_alnum
-                   Perl_is_utf8_alnumc
-                   Perl_is_utf8_alpha
-                   Perl_is_utf8_ascii
-                   Perl_is_utf8_blank
-                   Perl_is_utf8_char
-                   Perl_is_utf8_cntrl
-                   Perl_is_utf8_digit
-                   Perl_is_utf8_graph
-                   Perl_is_utf8_idcont
-                   Perl_is_utf8_idfirst
-                   Perl_is_utf8_lower
-                   Perl_is_utf8_mark
-                   Perl_is_utf8_perl_space
-                   Perl_is_utf8_perl_word
-                   Perl_is_utf8_posix_digit
-                   Perl_is_utf8_print
-                   Perl_is_utf8_punct
-                   Perl_is_utf8_space
-                   Perl_is_utf8_string_loc
-                   Perl_is_utf8_upper
-                   Perl_is_utf8_xdigit
-                   Perl_is_utf8_xidcont
-                   Perl_is_utf8_xidfirst
-                   Perl_my_lstat
-                   Perl_my_stat
-                   Perl_newAV
-                   Perl_newHV
-                   Perl_newIO
-                   Perl_newSUB
-                   Perl_pack_cat
-                   Perl_printf_nocontext
-                   Perl_ref
-                   Perl_save_freeop
-                   Perl_save_freepv
-                   Perl_save_freesv
-                   Perl_save_iv
-                   Perl_save_list
-                   Perl_save_long
-                   Perl_save_mortalizesv
-                   Perl_save_nogv
-                   Perl_save_op
-                   Perl_save_re_context
-                   Perl_sv_2iv
-                   Perl_sv_2pv
-                   Perl_sv_2pv_nolen
-                   Perl_sv_2pvbyte_nolen
-                   Perl_sv_2pvutf8_nolen
-                   Perl_sv_2uv
-                   Perl_sv_catpvn
-                   Perl_sv_catpvn_mg
-                   Perl_sv_catsv
-                   Perl_sv_catsv_mg
-                   Perl_sv_force_normal
-                   Perl_sv_insert
-                   Perl_sv_iv
-                   Perl_sv_mortalcopy
-                   Perl_sv_nolocking
-                   Perl_sv_nounlocking
-                   Perl_sv_nv
-                   Perl_sv_pv
-                   Perl_sv_pvbyte
-                   Perl_sv_pvbyten
-                   Perl_sv_pvn
-                   Perl_sv_pvn_force
-                   Perl_sv_pvn_nomg
-                   Perl_sv_pvutf8
-                   Perl_sv_pvutf8n
-                   Perl_sv_setsv
-                   Perl_sv_taint
-                   Perl_sv_unref
-                   Perl_sv_usepvn
-                   Perl_sv_usepvn_mg
-                   Perl_sv_utf8_upgrade
-                   Perl_sv_uv
-                   Perl_to_uni_lower_lc
-                   Perl_to_uni_title_lc
-                   Perl_to_uni_upper_lc
-                   Perl_to_utf8_fold
-                   Perl_to_utf8_lower
-                   Perl_to_utf8_title
-                   Perl_to_utf8_upper
-                   Perl_unpack_str
-                   Perl_utf8_to_uvchr
-                   Perl_utf8_to_uvuni
-                   Perl_valid_utf8_to_uvuni
-                        );
+                    Perl_dtrace_probe_call
+                    Perl_dtrace_probe_load
+                    Perl_dtrace_probe_op
+                    Perl_dtrace_probe_phase
+                );
 }
 
 unless ($define{'PERL_NEED_APPCTX'}) {
@@ -594,10 +521,6 @@ unless ($define{'PERL_DONT_CREATE_GVSV'}) {
     ++$skip{Perl_gv_SVadd};
 }
 
-if ($define{'SPRINTF_RETURNS_STRLEN'}) {
-    ++$skip{Perl_my_sprintf};
-}
-
 unless ($define{'PERL_USES_PL_PIDSTATUS'}) {
     ++$skip{PL_pidstatus};
 }
@@ -610,6 +533,10 @@ unless ($define{'MULTIPLICITY'}) {
     ++$skip{$_} foreach qw(
                    PL_interp_size
                    PL_interp_size_5_18_0
+                    PL_sv_yes
+                    PL_sv_undef
+                    PL_sv_no
+                    PL_sv_zero
                         );
 }
 
@@ -620,6 +547,7 @@ unless ($define{'PERL_GLOBAL_STRUCT'}) {
 unless ($define{'PERL_GLOBAL_STRUCT_PRIVATE'}) {
     ++$skip{$_} foreach qw(
                    PL_my_cxt_keys
+                   PL_my_cxt_keys_size
                    Perl_my_cxt_index
                         );
 }
@@ -647,6 +575,11 @@ if ($ARGS{PLATFORM} eq 'vms' && !$define{KILL_BY_SIGPRC}) {
     ++$skip{PL_sig_handlers_initted} unless !$define{HAS_SIGACTION};
 }
 
+if ($define{'HAS_STRNLEN'})
+{
+    ++$skip{Perl_my_strnlen};
+}
+
 unless ($define{USE_LOCALE_COLLATE}) {
     ++$skip{$_} foreach qw(
                    PL_collation_ix
@@ -656,6 +589,9 @@ unless ($define{USE_LOCALE_COLLATE}) {
                    PL_collxfrm_mult
                    Perl_sv_collxfrm
                    Perl_sv_collxfrm_flags
+                    PL_strxfrm_NUL_replacement
+                    PL_strxfrm_is_behaved
+                    PL_strxfrm_max_cp
                         );
 }
 
@@ -665,6 +601,9 @@ unless ($define{USE_LOCALE_NUMERIC}) {
                    PL_numeric_name
                    PL_numeric_radix_sv
                    PL_numeric_standard
+                    PL_numeric_underlying
+                    PL_numeric_underlying_is_standard
+                    PL_underlying_numeric_obj
                         );
 }
 
@@ -701,6 +640,9 @@ if ($define{'PERL_GLOBAL_STRUCT'}) {
 ++$skip{PL_op_exec_cnt}
     unless $define{PERL_TRACE_OPS};
 
+++$skip{PL_hash_chars}
+    unless $define{PERL_USE_SINGLE_CHAR_HASH_CACHE};
+
 # functions from *.sym files
 
 my @syms = qw(globvar.sym);
@@ -772,6 +714,8 @@ my @layer_syms = qw(
                    Perl_PerlIO_get_cnt
                    Perl_PerlIO_get_ptr
                    Perl_PerlIO_read
+                   Perl_PerlIO_restore_errno
+                   Perl_PerlIO_save_errno
                    Perl_PerlIO_seek
                    Perl_PerlIO_set_cnt
                    Perl_PerlIO_set_ptrcnt
@@ -787,33 +731,13 @@ if ($ARGS{PLATFORM} eq 'netware') {
     push(@layer_syms,'PL_def_layerlist','PL_known_layers','PL_perlio');
 }
 
-if ($define{'USE_PERLIO'}) {
-    # Export the symbols that make up the PerlIO abstraction, regardless
-    # of its implementation - read from a file
-    push @syms, 'perlio.sym';
+# Export the symbols that make up the PerlIO abstraction, regardless
+# of its implementation - read from a file
+push @syms, 'perlio.sym';
 
-    # PerlIO with layers - export implementation
-    try_symbols(@layer_syms, 'perlsio_binmode');
-} else {
-       # -Uuseperlio
-       # Skip the PerlIO layer symbols - although
-       # nothing should have exported them anyway.
-       ++$skip{$_} foreach @layer_syms;
-       ++$skip{$_} foreach qw(
-                       perlsio_binmode
-                       PL_def_layerlist
-                       PL_known_layers
-                       PL_perlio
-                       PL_perlio_debug_fd
-                       PL_perlio_fd_refcnt
-                       PL_perlio_fd_refcnt_size
-                       PL_perlio_mutex
-                            );
+# PerlIO with layers - export implementation
+try_symbols(@layer_syms, 'perlsio_binmode');
 
-       # Also do NOT add abstraction symbols from $perlio_sym
-       # abstraction is done as #define to stdio
-       # Remaining remnants that _may_ be functions are handled below.
-}
 
 unless ($define{'USE_QUADMATH'}) {
   ++$skip{Perl_quadmath_format_needed};
@@ -828,11 +752,14 @@ unless ($define{'USE_QUADMATH'}) {
 {
     my %seen;
     my ($embed) = setup_embed($ARGS{TARG_DIR});
+    my $excludedre = $define{'NO_MATHOMS'} ? qr/[xmib]/ : qr/[xmi]/;
 
     foreach (@$embed) {
        my ($flags, $retval, $func, @args) = @$_;
        next unless $func;
-       if ($flags =~ /[AX]/ && $flags !~ /[xmi]/ || $flags =~ /b/) {
+       if (($flags =~ /[AX]/ && $flags !~ $excludedre)
+            || (!$define{'NO_MATHOMS'} && $flags =~ /b/))
+        {
            # public API, so export
 
            # If a function is defined twice, for example before and after
@@ -841,7 +768,7 @@ unless ($define{'USE_QUADMATH'}) {
            # 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_/); 
+           $func = "Perl_$func" if ($flags =~ /[pX]/ && $func !~ /^Perl_/);
            ++$export{$func} unless exists $skip{$func};
        }
     }
@@ -986,6 +913,7 @@ if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
                            win32_realloc
                            win32_free
                            win32_sleep
+                           win32_pause
                            win32_times
                            win32_access
                            win32_alarm
@@ -1084,11 +1012,11 @@ elsif ($ARGS{PLATFORM} eq 'vms') {
                      Perl_my_gconvert
                      Perl_my_getenv
                      Perl_my_getenv_len
-                     Perl_my_getlogin
                      Perl_my_getpwnam
                      Perl_my_getpwuid
                      Perl_my_gmtime
                      Perl_my_kill
+                     Perl_my_killpg
                      Perl_my_localtime
                      Perl_my_mkdir
                      Perl_my_sigaction
@@ -1371,7 +1299,7 @@ if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
 
 if ($ARGS{PLATFORM} eq 'os2') {
     my (%mapped, @missing);
-    open MAP, 'miniperl.map' or die 'Cannot read miniperl.map';
+    open MAP, '<', 'miniperl.map' or die 'Cannot read miniperl.map';
     /^\s*[\da-f:]+\s+(\w+)/i and $mapped{$1}++ foreach <MAP>;
     close MAP or die 'Cannot close miniperl.map';
 
@@ -1437,10 +1365,16 @@ elsif ($ARGS{PLATFORM} eq 'netware') {
 
 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";
+    if (PLATFORM eq 'win32' || PLATFORM eq 'wince') {
+       # Remembering the origin file of each symbol is an alternative to PL_ matching
+       if (substr($symbol, 0, 3) eq 'PL_') {
+           print "\t$symbol DATA\n";
+       }
+       else {
+           print "\t$symbol\n";
+       }
     }
-    elsif ($ARGS{PLATFORM} eq 'os2') {
+    elsif (PLATFORM eq 'os2') {
        printf qq(    %-31s \@%s\n),
          qq("$symbol"), $ordinal{$symbol} || ++$sym_ord;
        printf qq(    %-31s \@%s\n),
@@ -1448,7 +1382,7 @@ foreach my $symbol (@symbols) {
          $ordinal{$exportperlmalloc{$symbol}} || ++$sym_ord
          if $exportperlmalloc and exists $exportperlmalloc{$symbol};
     }
-    elsif ($ARGS{PLATFORM} eq 'netware') {
+    elsif (PLATFORM eq 'netware') {
        print "\t$symbol,\n";
     } else {
        print "$symbol\n";