X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=opcode.pl;h=1c1d9bf8d6ee99c4389e43e37afc41174aaf12c0;hb=9058bc9b7176f7a8d171bb316d39680b3246ce5f;hp=ed458fafd6edc5d7e21b25e5b57ee5124fbf6dff;hpb=42d382189339e56f3bd13a71933349bc8b7e8b42;p=p5sagit%2Fp5-mst-13.2.git diff --git a/opcode.pl b/opcode.pl index ed458fa..1c1d9bf 100755 --- a/opcode.pl +++ b/opcode.pl @@ -129,7 +129,7 @@ EXT OP * (CPERLscope(*PL_ppaddr)[])(pTHX) = { END for (@ops) { - print "\tPerl_pp_$_,\n"; + print "\tMEMBER_TO_FPTR(Perl_pp_$_),\n"; } print < 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 +# quotemeta not OK (unsafe when TARG == arg) # each repeat not OK too due to array 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) @@ -315,6 +333,8 @@ sub tab { # 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 @@ -332,22 +352,22 @@ wantarray wantarray ck_null is0 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 padhv private hash ck_null d0 -padany private something ck_null d0 +padany private value ck_null d0 pushre push regexp ck_null d/ # 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 @@ -357,22 +377,22 @@ bless bless ck_fun s@ S S? # 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 ck_null t% rcatline append I/O operator ck_null t% # Bindable operators. -regcmaybe regexp comp once ck_fun s1 S -regcreset regexp reset interpolation flag ck_fun s1 S -regcomp regexp compilation ck_null s| S -match pattern match (m//) ck_match d/ -qr pattern quote (qr//) ck_match s/ -subst substitution (s///) ck_null dis/ S -substcont substitution cont ck_null dis| -trans character translation (tr///) ck_null is" S +regcmaybe regexp internal guard ck_fun s1 S +regcreset regexp internal reset ck_fun s1 S +regcomp regexp compilation ck_null s| S +match pattern match (m//) ck_match d/ +qr pattern quote (qr//) ck_match s/ +subst substitution (s///) ck_null dis/ S +substcont substitution iterator ck_null dis| +trans transliteration (tr///) ck_null is" S # Lvalue operators. # sassign is special-cased for op class @@ -380,10 +400,10 @@ trans character translation (tr///) ck_null is" S 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? -chomp safe chop ck_spair mTs% L -schomp scalar safe 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? undef undef operator ck_lfun s% S? study study ck_fun su% S? @@ -393,16 +413,16 @@ preinc preincrement (++) ck_lfun dIs1 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. pow exponentiation (**) ck_null fsT2 S S -multiply multiplication (*) ck_null IfsT2 S S +multiply multiplication (*) ck_null IfsT2 S S i_multiply integer multiplication (*) ck_null ifsT2 S S divide division (/) ck_null IfsT2 S S i_divide integer division (/) ck_null ifsT2 S S @@ -414,7 +434,7 @@ add addition (+) ck_null IfsT2 S S 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 @@ -441,27 +461,27 @@ sle string le ck_scmp ifs2 S S sge string ge ck_scmp ifs2 S S seq string eq ck_null ifs2 S S sne string ne ck_null ifs2 S S -scmp string comparison (cmp) ck_scmp ifst2 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 negate (-) ck_null IfsT1 S -i_negate integer negate (-) 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. -atan2 atan2 ck_fun fsT@ S S -sin sin ck_fun fsTu% S? -cos cos ck_fun fsTu% S? -rand rand ck_fun sT% S? -srand srand ck_fun s% S? -exp exp ck_fun fsTu% S? -log log ck_fun fsTu% S? -sqrt sqrt ck_fun fsTu% S? +atan2 atan2 ck_fun fsT@ S S +sin sin ck_fun fsTu% S? +cos cos ck_fun fsTu% S? +rand rand ck_fun sT% S? +srand srand ck_fun s% S? +exp exp ck_fun fsTu% S? +log log ck_fun fsTu% S? +sqrt sqrt ck_fun fsTu% S? # Lowbrow math. @@ -479,7 +499,7 @@ vec vec ck_fun ist@ S S S index index ck_index isT@ S S S? rindex rindex ck_index isT@ S S S? -sprintf sprintf ck_fun_locale mfsT@ S L +sprintf sprintf ck_fun_locale mfst@ S L formline formline ck_fun ms@ S L ord ord ck_fun ifsTu% S? chr chr ck_fun fsTu% S? @@ -488,12 +508,12 @@ ucfirst ucfirst ck_fun_locale fstu% 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 deref ck_rvconst dt1 -aelemfast known array element ck_null s* A S +rv2av array dereference ck_rvconst dt1 +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 @@ -504,8 +524,8 @@ values values ck_fun t% H keys keys ck_fun t% H delete delete ck_delete % S exists exists ck_exists is% S -rv2hv hash deref ck_rvconst dt1 -helem hash elem ck_null s2@ H S +rv2hv hash dereference ck_rvconst dt1 +helem hash element ck_null s2@ H S hslice hash slice ck_null m@ H L # Explosives and implosives. @@ -513,7 +533,7 @@ hslice hash slice ck_null m@ H 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. @@ -530,11 +550,11 @@ unshift unshift ck_fun imsT@ A L sort sort ck_sort m@ C? L reverse reverse ck_fun mt@ L -grepstart grep ck_grep dm@ C L -grepwhile grep iterator ck_null dt| +grepstart grep ck_grep dm@ C L +grepwhile grep iterator ck_null dt| -mapstart map ck_grep dm@ C L -mapwhile map iterator ck_null dt| +mapstart map ck_grep dm@ C L +mapwhile map iterator ck_null dt| # Range stuff. @@ -545,9 +565,9 @@ flop range (or flop) ck_null 1 # Control. and logical and (&&) ck_null | -or logical or (||) ck_null | -xor logical xor ck_null fs2 S S -cond_expr conditional operator (?:) ck_null d| +or logical or (||) ck_null | +xor logical xor ck_null fs2 S S +cond_expr conditional expression ck_null d| andassign logical and assignment (&&=) ck_null s| orassign logical or assignment (||=) ck_null s| @@ -558,7 +578,7 @@ leavesublv lvalue subroutine exit ck_null 1 caller caller ck_fun t% S? warn warn ck_fun imst@ L die die ck_fun dimst@ L -reset reset ck_fun is% S? +reset symbol reset ck_fun is% S? lineseq line sequence ck_null @ nextstate next statement ck_null s; @@ -577,21 +597,21 @@ next next ck_null ds} 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 -#cswitch character switch ck_null d +#nswitch numeric switch ck_null d +#cswitch character 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 @@ -689,7 +709,7 @@ rename rename ck_fun isT@ S S 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. @@ -717,6 +737,10 @@ setpriority setpriority ck_fun isT@ S S S # 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? @@ -747,12 +771,12 @@ semop semop ck_fun imst@ S S # Eval. require require ck_require du% S? -dofile do 'file' ck_fun d1 S +dofile do "file" ck_fun d1 S entereval eval "string" ck_eval d% S -leaveeval eval exit ck_null 1 S +leaveeval eval "string" exit ck_null 1 S #evalonce eval constant string ck_null d1 S entertry eval {block} ck_null | -leavetry eval block exit ck_null @ +leavetry eval {block} exit ck_null @ # Get system info. @@ -794,7 +818,7 @@ syscall syscall ck_fun imst@ S L # For multi-threading lock lock ck_rfun s% S -threadsv per-thread variable ck_null ds0 +threadsv per-thread value ck_null ds0 # Control (contd.) setstate set statement info ck_null s;