#!/usr/bin/perl
+BEGIN {
+ # Get function prototypes
+ require 'regen_lib.pl';
+}
-unlink "opcode.h", "opnames.h";
-open(OC, ">opcode.h") || die "Can't create opcode.h: $!\n";
-open(ON, ">opnames.h") || die "Can't create opnames.h: $!\n";
+$opcode_new = 'opcode.h-new';
+$opname_new = 'opnames.h-new';
+open(OC, ">$opcode_new") || die "Can't create $opcode_new: $!\n";
+binmode OC;
+open(ON, ">$opname_new") || die "Can't create $opname_new: $!\n";
+binmode ON;
select OC;
# Read data.
$i = 0;
print <<"END";
-/* !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
- This file is built by opcode.pl from its data. Any changes made here
- will be lost!
-*/
+/* -*- buffer-read-only: t -*-
+ *
+ * opcode.h
+ *
+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ * 2000, 2001, 2002, 2003, 2004, 2005 by Larry Wall and others
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Artistic License, as specified in the README file.
+ *
+ * !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
+ * This file is built by opcode.pl from its data. Any changes made here
+ * will be lost!
+ */
+
+#ifndef PERL_GLOBAL_STRUCT_INIT
#define Perl_pp_i_preinc Perl_pp_preinc
#define Perl_pp_i_predec Perl_pp_predec
END
print ON <<"END";
-/* !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
- This file is built by opcode.pl from its data. Any changes made here
- will be lost!
-*/
+/* -*- buffer-read-only: t -*-
+ *
+ * opnames.h
+ *
+ * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, by Larry Wall and others
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Artistic License, as specified in the README file.
+ *
+ *
+ * !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
+ * This file is built by opcode.pl from its data. Any changes made here
+ * will be lost!
+ */
typedef enum opcode {
END
}
print ON "\t", &tab(3,"OP_max"), "\n";
print ON "} opcode;\n";
-print ON "\n#define MAXO ", scalar @ops, "\n\n";
+print ON "\n#define MAXO ", scalar @ops, "\n";
+print ON "#define OP_phoney_INPUT_ONLY -1\n";
+print ON "#define OP_phoney_OUTPUT_ONLY -2\n\n";
# Emit op names and descriptions.
print <<END;
-
START_EXTERN_C
+#define OP_NAME(o) ((o)->op_type == OP_CUSTOM ? custom_op_name(o) : \\
+ PL_op_name[(o)->op_type])
+#define OP_DESC(o) ((o)->op_type == OP_CUSTOM ? custom_op_desc(o) : \\
+ PL_op_desc[(o)->op_type])
+
#ifndef DOINIT
-EXT char *PL_op_name[];
+EXTCONST char* const PL_op_name[];
#else
-EXT char *PL_op_name[] = {
+EXTCONST char* const PL_op_name[] = {
END
for (@ops) {
print <<END;
#ifndef DOINIT
-EXT char *PL_op_desc[];
+EXTCONST char* const PL_op_desc[];
#else
-EXT char *PL_op_desc[] = {
+EXTCONST char* const PL_op_desc[] = {
END
for (@ops) {
my($safe_desc) = $desc{$_};
- # Have to escape double quotes and escape characters.
+ # Have to escape double quotes and escape characters.
$safe_desc =~ s/(^|[^\\])([\\"])/$1\\$2/g;
print qq(\t"$safe_desc",\n);
END_EXTERN_C
+#endif /* !PERL_GLOBAL_STRUCT_INIT */
END
# Emit function declarations.
START_EXTERN_C
-#ifndef DOINIT
-EXT OP * (CPERLscope(*PL_ppaddr)[])(pTHX);
+#ifdef PERL_GLOBAL_STRUCT_INIT
+static const Perl_ppaddr_t Gppaddr[]
#else
-EXT OP * (CPERLscope(*PL_ppaddr)[])(pTHX) = {
+# ifndef PERL_GLOBAL_STRUCT
+EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
+# endif
+#endif /* PERL_GLOBAL_STRUCT */
+#if (defined(DOINIT) && !defined(PERL_GLOBAL_STRUCT)) || defined(PERL_GLOBAL_STRUCT_INIT)
+= {
END
for (@ops) {
- print "\tMEMBER_TO_FPTR(Perl_pp_$_),\n";
+ print "\tMEMBER_TO_FPTR(Perl_pp_$_),\n" unless $_ eq "custom";
}
print <<END;
-};
+}
#endif
+;
END
# Emit check routines.
print <<END;
-#ifndef DOINIT
-EXT OP * (CPERLscope(*PL_check)[]) (pTHX_ OP *op);
+#ifdef PERL_GLOBAL_STRUCT_INIT
+static const Perl_check_t Gcheck[]
#else
-EXT OP * (CPERLscope(*PL_check)[]) (pTHX_ OP *op) = {
+# ifndef PERL_GLOBAL_STRUCT
+EXT Perl_check_t PL_check[] /* or perlvars.h */
+# endif
+#endif
+#if (defined(DOINIT) && !defined(PERL_GLOBAL_STRUCT)) || defined(PERL_GLOBAL_STRUCT_INIT)
+= {
END
for (@ops) {
}
print <<END;
-};
+}
#endif
+;
END
# Emit allowed argument types.
print <<END;
+#ifndef PERL_GLOBAL_STRUCT_INIT
+
#ifndef DOINIT
-EXT U32 PL_opargs[];
+EXT const U32 PL_opargs[];
#else
-EXT U32 PL_opargs[] = {
+EXT const U32 PL_opargs[] = {
END
%argnum = (
'}', 13, # loopexop
);
+my %OP_IS_SOCKET;
+my %OP_IS_FILETEST;
+
for (@ops) {
$argsum = 0;
$flags = $flags{$_};
$argsum |= 32 if $flags =~ /I/; # has corresponding int op
$argsum |= 64 if $flags =~ /d/; # danger, unknown side effects
$argsum |= 128 if $flags =~ /u/; # defaults to $_
-
$flags =~ /([\W\d_])/ or die qq[Opcode "$_" has no class indicator];
$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;
#endif
END_EXTERN_C
+
+#endif /* !PERL_GLOBAL_STRUCT_INIT */
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";
+}
+
+print OC "/* ex: set ro: */\n";
+print ON "/* ex: set ro: */\n";
+
close OC or die "Error closing opcode.h: $!";
close ON or die "Error closing opnames.h: $!";
-unlink "pp_proto.h";
-unlink "pp.sym";
-open PP, '>pp_proto.h' or die "Error creating pp_proto.h: $!";
-open PPSYM, '>pp.sym' or die "Error creating pp.sym: $!";
+foreach ('opcode.h', 'opnames.h') {
+ safer_rename_silent $_, "$_-old";
+}
+safer_rename $opcode_new, 'opcode.h';
+safer_rename $opname_new, 'opnames.h';
+
+$pp_proto_new = 'pp_proto.h-new';
+$pp_sym_new = 'pp.sym-new';
+
+open PP, ">$pp_proto_new" or die "Error creating $pp_proto_new: $!";
+binmode PP;
+open PPSYM, ">$pp_sym_new" or die "Error creating $pp_sym_new: $!";
+binmode PPSYM;
print PP <<"END";
-/* !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
+/* -*- buffer-read-only: t -*-
+ !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
This file is built by opcode.pl from its data. Any changes made here
will be lost!
*/
END
print PPSYM <<"END";
+# -*- buffer-read-only: t -*-
#
-# !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
+# !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
# This file is built by opcode.pl from its data. Any changes made here
# will be lost!
#
for (@ops) {
next if /^i_(pre|post)(inc|dec)$/;
+ next if /^custom$/;
print PP "PERL_PPDEF(Perl_pp_$_)\n";
print PPSYM "Perl_pp_$_\n";
}
+print PP "\n/* ex: set ro: */\n";
+print PPSYM "\n# ex: set ro:\n";
close PP or die "Error closing pp_proto.h: $!";
close PPSYM or die "Error closing pp.sym: $!";
+foreach ('pp_proto.h', 'pp.sym') {
+ safer_rename_silent $_, "$_-old";
+}
+safer_rename $pp_proto_new, 'pp_proto.h';
+safer_rename $pp_sym_new, 'pp.sym';
+
+END {
+ foreach ('opcode.h', 'opnames.h', 'pp_proto.h', 'pp.sym') {
+ 1 while unlink "$_-old";
+ }
+}
+
###########################################################################
sub tab {
local($l, $t) = @_;
# 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
+# 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.
__END__
-# New ops always go at the very end
+# New ops always go at the end, just before 'custom'
+
+# A recapitulation of the format of this file:
+# The file consists of five columns: the name of the op, an English
+# description, the name of the "check" routine used to optimize this
+# operation, some flags, and a description of the operands.
+
+# The flags consist of options followed by a mandatory op class signifier
+
+# The classes are:
+# baseop - 0 unop - 1 binop - 2
+# logop - | listop - @ pmop - /
+# padop/svop - $ padop - # (unused) loop - {
+# baseop/unop - % loopexop - } filestatop - -
+# pvop/svop - " cop - ;
+
+# Other options are:
+# needs stack mark - m
+# needs constant folding - f
+# produces a scalar - s
+# produces an integer - i
+# needs a target - t
+# target can be in a pad - T
+# has a corresponding integer version - I
+# has side effects - d
+# uses $_ if no argument given - u
+
+# Values for the operands are:
+# scalar - S list - L array - A
+# hash - H sub (CV) - C file - F
+# socket - Fs filetest - F- reference - R
+# "?" denotes an optional operand.
# Nothing.
# 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?
-readline <HANDLE> ck_null t%
-rcatline append I/O operator ck_null t%
+readline <HANDLE> ck_null t% F?
+rcatline append I/O operator ck_null t$
# Bindable operators.
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
+subst substitution (s///) ck_match dis/ S
substcont substitution iterator ck_null dis|
-trans transliteration (tr///) ck_null is" S
+trans transliteration (tr///) ck_match is" S
# Lvalue operators.
# sassign is special-cased for op class
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
ncmp numeric comparison (<=>) ck_null Iifst2 S S
i_ncmp integer comparison (<=>) ck_null ifst2 S S
-slt string lt ck_scmp ifs2 S S
-sgt string gt ck_scmp ifs2 S S
-sle string le ck_scmp ifs2 S S
-sge string ge ck_scmp ifs2 S S
+slt string lt ck_null ifs2 S S
+sgt string gt ck_null ifs2 S S
+sle string le ck_null ifs2 S S
+sge string ge ck_null 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_null ifst2 S S
bit_and bitwise and (&) ck_bitop fst2 S S
bit_xor bitwise xor (^) ck_bitop fst2 S S
# 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?
rindex rindex ck_index isT@ S S S?
-sprintf sprintf ck_fun_locale mfst@ S L
+sprintf sprintf ck_fun mfst@ S L
formline formline ck_fun ms@ S L
ord ord ck_fun ifsTu% S?
chr chr ck_fun fsTu% S?
crypt crypt ck_fun fsT@ S S
-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?
+ucfirst ucfirst ck_fun fstu% S?
+lcfirst lcfirst ck_fun fstu% S?
+uc uc ck_fun fstu% S?
+lc lc ck_fun fstu% S?
quotemeta quotemeta ck_fun fstu% S?
# Arrays.
# Explosives and implosives.
-unpack unpack ck_fun @ S S
+unpack unpack ck_unpack @ 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.
splice splice ck_fun m@ A S? S? L
push push ck_fun imsT@ A L
-pop pop ck_shift s% A
-shift shift ck_shift s% A
+pop pop ck_shift s% A?
+shift shift ck_shift s% A?
unshift unshift ck_fun imsT@ A L
sort sort ck_sort m@ C? L
reverse reverse ck_fun mt@ L
method method lookup ck_method d1
entersub subroutine entry ck_subr dmt1 L
leavesub subroutine exit ck_null 1
-leavesublv lvalue subroutine exit ck_null 1
+leavesublv lvalue subroutine return ck_null 1
caller caller ck_fun t% S?
warn warn ck_fun imst@ L
-die die ck_fun dimst@ L
+die die ck_die dimst@ L
reset symbol reset ck_fun is% S?
lineseq line sequence ck_null @
iter foreach loop iterator ck_null 0
enterloop loop entry ck_null d{
leaveloop loop exit ck_null 2
-return return ck_null dm@ L
+return return ck_return dm@ L
last last ck_null ds}
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
# I/O.
-open open ck_fun ist@ F S? S?
+open open ck_open ismt@ 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 isTu@ S? S?
rmdir rmdir ck_fun isTu% S?
# Directory calls.
syscall syscall ck_fun imst@ S L
# For multi-threading
-lock lock ck_rfun s% S
+lock lock ck_rfun s% R
threadsv per-thread value ck_null ds0
# Control (contd.)
setstate set statement info ck_null s;
method_named method with known name ck_null d$
+
+dor defined or (//) ck_null |
+dorassign defined or assignment (//=) ck_null s|
+
+# Add new ops before this, the custom operator.
+
+custom unknown custom operator ck_null 0
https://perl5.git.perl.org / perl5.git / blobdiff