END
for (@ops) {
- print "\tPerl_pp_$_,\n";
+ print "\tMEMBER_TO_FPTR(Perl_pp_$_),\n";
}
print <<END;
END
for (@ops) {
- print "\t", &tab(3, "Perl_$check{$_},"), "/* $_ */\n";
+ print "\t", &tab(3, "MEMBER_TO_FPTR(Perl_$check{$_}),"), "\t/* $_ */\n";
}
print <<END;
'|', 3, # logop
'@', 4, # listop
'/', 5, # pmop
- '$', 6, # svop
- '*', 7, # gvop
+ '$', 6, # svop_or_padop
+ '#', 7, # padop
'"', 8, # pvop_or_svop
'{', 9, # loop
';', 10, # cop
'}', 13, # loopexop
);
+my %OP_IS_SOCKET;
+my %OP_IS_FILETEST;
+
for (@ops) {
$argsum = 0;
$flags = $flags{$_};
$argsum |= $opclass{$1} << 9;
$mul = 0x2000; # 2 ^ OASHIFT
for $arg (split(' ',$args{$_})) {
+ if ($arg =~ /^F/) {
+ $OP_IS_SOCKET{$_} = 1 if $arg =~ s/s//;
+ $OP_IS_FILETEST{$_} = 1 if $arg =~ s/-//;
+ }
$argnum = ($arg =~ s/\?//) ? 8 : 0;
+ die "op = $_, arg = $arg\n" unless length($arg) == 1;
$argnum += $argnum{$arg};
warn "# Conflicting bit 32 for '$_'.\n"
if $argnum & 8 and $mul == 0x10000000;
END_EXTERN_C
END
+if (keys %OP_IS_SOCKET) {
+ print ON "\n#define OP_IS_SOCKET(op) \\\n\t(";
+ print ON join(" || \\\n\t ",
+ map { "(op) == OP_" . uc() } sort keys %OP_IS_SOCKET);
+ print ON ")\n\n";
+}
+
+if (keys %OP_IS_FILETEST) {
+ print ON "\n#define OP_IS_FILETEST(op) \\\n\t(";
+ print ON join(" || \\\n\t ",
+ map { "(op) == OP_" . uc() } sort keys %OP_IS_FILETEST);
+ print ON ")\n\n";
+}
+
close OC or die "Error closing opcode.h: $!";
close ON or die "Error closing opnames.h: $!";
# lt and friends do SETs (including ncmp, but not scmp)
+# Additional mode of failure: the opcode can modify TARG before it "used"
+# all the arguments (or may call an external function which does the same).
+# If the target coincides with one of the arguments ==> kaboom.
+
# pp.c pos substr each not OK (RETPUSHUNDEF)
# substr vec also not OK due to LV to target (are they???)
# ref not OK (RETPUSHNO)
# trans not OK (dTARG; TARG = sv_newmortal();)
# ucfirst etc not OK: TMP arg processed inplace
-# each repeat not OK too due to array context
+# quotemeta not OK (unsafe when TARG == arg)
+# each repeat not OK too due to list context
# pack split - unknown whether they are safe
# sprintf: is calling do_sprintf(TARG,...) which can act on TARG
# before other args are processed.
+# Suspicious wrt "additional mode of failure" (and only it):
+# schop, chop, postinc/dec, bit_and etc, negate, complement.
+
+# Also suspicious: 4-arg substr, sprintf, uc/lc (POK_only), reverse, pack.
+
+# substr/vec: doing TAINT_off()???
+
# pp_hot.c
# readline - unknown whether it is safe
# match subst not OK (dTARG)
# grepwhile not OK (not always setting)
+# join not OK (unsafe when TARG == arg)
+
+# Suspicious wrt "additional mode of failure": concat (dealt with
+# in ck_sassign()), join (same).
# pp_ctl.c
# mapwhile flip caller not OK (not always setting)
# sselect shm* sem* msg* syscall - unknown whether they are safe
# gmtime not OK (list context)
+# Suspicious wrt "additional mode of failure": warn, die, select.
+
__END__
# New ops always go at the very end
const constant item ck_svconst s$
-gvsv scalar variable ck_null ds*
-gv glob value ck_null ds*
+gvsv scalar variable ck_null ds$
+gv glob value ck_null ds$
gelem glob elem ck_null d2 S S
padsv private variable ck_null ds0
padav private array ck_null d0
# References and stuff.
rv2gv ref-to-glob cast ck_rvconst ds1
-rv2sv scalar deref ck_rvconst ds1
+rv2sv scalar dereference ck_rvconst ds1
av2arylen array length ck_null is1
-rv2cv subroutine deref ck_rvconst d1
+rv2cv subroutine dereference ck_rvconst d1
anoncode anonymous subroutine ck_anoncode $
prototype subroutine prototype ck_null s% S
refgen reference constructor ck_spair m1 L
# Pushy I/O.
-backtick quoted execution (``, qx) ck_null t%
+backtick quoted execution (``, qx) ck_open t%
# glob defaults its first arg to $_
-glob glob ck_glob t@ S? S?
+glob glob ck_glob t@ S?
readline <HANDLE> ck_null t%
rcatline append I/O operator ck_null t%
sassign scalar assignment ck_sassign s0
aassign list assignment ck_null t2 L L
-chop chop ck_spair mTs% L
-schop scalar chop ck_null sTu% S?
+chop chop ck_spair mts% L
+schop scalar chop ck_null stu% S?
chomp chomp ck_spair mTs% L
schomp scalar chomp ck_null sTu% S?
defined defined operator ck_defined isu% S?
i_preinc integer preincrement (++) ck_lfun dis1 S
predec predecrement (--) ck_lfun dIs1 S
i_predec integer predecrement (--) ck_lfun dis1 S
-postinc postincrement (++) ck_lfun dIsT1 S
+postinc postincrement (++) ck_lfun dIst1 S
i_postinc integer postincrement (++) ck_lfun disT1 S
-postdec postdecrement (--) ck_lfun dIsT1 S
+postdec postdecrement (--) ck_lfun dIst1 S
i_postdec integer postdecrement (--) ck_lfun disT1 S
# Ordinary operators.
i_add integer addition (+) ck_null ifsT2 S S
subtract subtraction (-) ck_null IfsT2 S S
i_subtract integer subtraction (-) ck_null ifsT2 S S
-concat concatenation (.) ck_concat fsT2 S S
+concat concatenation (.) or string ck_concat fsT2 S S
stringify string ck_fun fsT@ S
left_shift left bitshift (<<) ck_bitop fsT2 S S
sne string ne ck_null ifs2 S S
scmp string comparison (cmp) ck_scmp ifst2 S S
-bit_and bitwise and (&) ck_bitop fsT2 S S
-bit_xor bitwise xor (^) ck_bitop fsT2 S S
-bit_or bitwise or (|) ck_bitop fsT2 S S
+bit_and bitwise and (&) ck_bitop fst2 S S
+bit_xor bitwise xor (^) ck_bitop fst2 S S
+bit_or bitwise or (|) ck_bitop fst2 S S
-negate negation (-) ck_null IfsT1 S
+negate negation (-) ck_null Ifst1 S
i_negate integer negation (-) ck_null ifsT1 S
not not ck_null ifs1 S
-complement 1's complement (~) ck_bitop fsT1 S
+complement 1's complement (~) ck_bitop fst1 S
# High falutin' math.
# String stuff.
length length ck_lengthconst isTu% S?
-substr substr ck_fun st@ S S S? S?
+substr substr ck_substr st@ S S S? S?
vec vec ck_fun ist@ S S S
index index ck_index isT@ S S S?
lcfirst lcfirst ck_fun_locale fstu% S?
uc uc ck_fun_locale fstu% S?
lc lc ck_fun_locale fstu% S?
-quotemeta quotemeta ck_fun fsTu% S?
+quotemeta quotemeta ck_fun fstu% S?
# Arrays.
rv2av array dereference ck_rvconst dt1
-aelemfast constant array element ck_null s* A S
+aelemfast constant array element ck_null s$ A S
aelem array element ck_null s2 A S
aslice array slice ck_null m@ A L
unpack unpack ck_fun @ S S
pack pack ck_fun mst@ S L
split split ck_split t@ S S S
-join join ck_join msT@ S L
+join join or string ck_join mst@ S L
# List operators.
redo redo ck_null ds}
dump dump ck_null ds}
goto goto ck_null ds}
-exit exit ck_fun ds% S?
+exit exit ck_exit ds% S?
# continued below
#nswitch numeric switch ck_null d
# I/O.
-open open ck_fun ist@ F S? S?
+open open ck_open ist@ F S? L
close close ck_fun is% F?
pipe_op pipe ck_fun is@ F F
fileno fileno ck_fun ist% F
umask umask ck_fun ist% S?
-binmode binmode ck_fun s% F
+binmode binmode ck_fun s@ F S?
tie tie ck_fun idms@ R S L
untie untie ck_fun is% R
sysread sysread ck_fun imst@ F R S S?
syswrite syswrite ck_fun imst@ F S S? S?
-send send ck_fun imst@ F S S S?
-recv recv ck_fun imst@ F R S S
+send send ck_fun imst@ Fs S S S?
+recv recv ck_fun imst@ Fs R S S
eof eof ck_eof is% F?
tell tell ck_fun st% F?
# Sockets.
-socket socket ck_fun is@ F S S S
-sockpair socketpair ck_fun is@ F F S S S
+socket socket ck_fun is@ Fs S S S
+sockpair socketpair ck_fun is@ Fs Fs S S S
-bind bind ck_fun is@ F S
-connect connect ck_fun is@ F S
-listen listen ck_fun is@ F S
-accept accept ck_fun ist@ F F
-shutdown shutdown ck_fun ist@ F S
+bind bind ck_fun is@ Fs S
+connect connect ck_fun is@ Fs S
+listen listen ck_fun is@ Fs S
+accept accept ck_fun ist@ Fs Fs
+shutdown shutdown ck_fun ist@ Fs S
-gsockopt getsockopt ck_fun is@ F S S
-ssockopt setsockopt ck_fun is@ F S S S
+gsockopt getsockopt ck_fun is@ Fs S S
+ssockopt setsockopt ck_fun is@ Fs S S S
-getsockname getsockname ck_fun is% F
-getpeername getpeername ck_fun is% F
+getsockname getsockname ck_fun is% Fs
+getpeername getpeername ck_fun is% Fs
# Stat calls.
lstat lstat ck_ftst u- F
stat stat ck_ftst u- F
-ftrread -R ck_ftst isu- F
-ftrwrite -W ck_ftst isu- F
-ftrexec -X ck_ftst isu- F
-fteread -r ck_ftst isu- F
-ftewrite -w ck_ftst isu- F
-fteexec -x ck_ftst isu- F
-ftis -e ck_ftst isu- F
-fteowned -O ck_ftst isu- F
-ftrowned -o ck_ftst isu- F
-ftzero -z ck_ftst isu- F
-ftsize -s ck_ftst istu- F
-ftmtime -M ck_ftst stu- F
-ftatime -A ck_ftst stu- F
-ftctime -C ck_ftst stu- F
-ftsock -S ck_ftst isu- F
-ftchr -c ck_ftst isu- F
-ftblk -b ck_ftst isu- F
-ftfile -f ck_ftst isu- F
-ftdir -d ck_ftst isu- F
-ftpipe -p ck_ftst isu- F
-ftlink -l ck_ftst isu- F
-ftsuid -u ck_ftst isu- F
-ftsgid -g ck_ftst isu- F
-ftsvtx -k ck_ftst isu- F
-fttty -t ck_ftst is- F
-fttext -T ck_ftst isu- F
-ftbinary -B ck_ftst isu- F
+ftrread -R ck_ftst isu- F-
+ftrwrite -W ck_ftst isu- F-
+ftrexec -X ck_ftst isu- F-
+fteread -r ck_ftst isu- F-
+ftewrite -w ck_ftst isu- F-
+fteexec -x ck_ftst isu- F-
+ftis -e ck_ftst isu- F-
+fteowned -O ck_ftst isu- F-
+ftrowned -o ck_ftst isu- F-
+ftzero -z ck_ftst isu- F-
+ftsize -s ck_ftst istu- F-
+ftmtime -M ck_ftst stu- F-
+ftatime -A ck_ftst stu- F-
+ftctime -C ck_ftst stu- F-
+ftsock -S ck_ftst isu- F-
+ftchr -c ck_ftst isu- F-
+ftblk -b ck_ftst isu- F-
+ftfile -f ck_ftst isu- F-
+ftdir -d ck_ftst isu- F-
+ftpipe -p ck_ftst isu- F-
+ftlink -l ck_ftst isu- F-
+ftsuid -u ck_ftst isu- F-
+ftsgid -g ck_ftst isu- F-
+ftsvtx -k ck_ftst isu- F-
+fttty -t ck_ftst is- F-
+fttext -T ck_ftst isu- F-
+ftbinary -B ck_ftst isu- F-
# File calls.
link link ck_fun isT@ S S
symlink symlink ck_fun isT@ S S
readlink readlink ck_fun stu% S?
-mkdir mkdir ck_fun isT@ S S
+mkdir mkdir ck_fun isT@ S S?
rmdir rmdir ck_fun isTu% S?
# Directory calls.
# Time calls.
+# NOTE: MacOS patches the 'i' of time() away later when the interpreter
+# is created because in MacOS time() is already returning times > 2**31-1,
+# that is, non-integers.
+
time time ck_null isT0
tms times ck_null 0
localtime localtime ck_fun t% S?