fix refcnt on PL_main_cv (variant of suggestion by Vishal Bhatia

[perl5.git] / opcode.pl

diff --git a/opcode.pl b/opcode.pl
index 8fa6e29..7b6e796 100755 (executable)
--- a/opcode.pl
+++ b/opcode.pl
@@ -47,9 +47,9 @@ print "\n#define MAXO ", scalar @ops, "\n\n";
 
 print <<END;
 #ifndef DOINIT
-EXT char *op_name[];
+EXT char *PL_op_name[];
 #else
-EXT char *op_name[] = {
+EXT char *PL_op_name[] = {
 END
 
 for (@ops) {
@@ -64,9 +64,9 @@ END
 
 print <<END;
 #ifndef DOINIT
-EXT char *op_desc[];
+EXT char *PL_op_desc[];
 #else
-EXT char *op_desc[] = {
+EXT char *PL_op_desc[] = {
 END
 
 for (@ops) {
@@ -80,19 +80,26 @@ print <<END;
 #ifndef PERL_OBJECT
 START_EXTERN_C
 
-END
+#undef PERL_CKDEF
+#undef PERL_PPDEF
+#define PERL_CKDEF(s) OP *s _((OP *o));
+#define PERL_PPDEF(s) OP *s _((ARGSproto));
 
-# Emit function declarations.
+#include "pp_proto.h"
 
-for (sort keys %ckname) {
-    print "OP *\t", &tab(3,$_),"_((OP* o));\n";
-}
+END
 
-print "\n";
+# Emit function declarations.
 
-for (@ops) {
-    print "OP *\t", &tab(3, "pp_$_"), "_((ARGSproto));\n";
-}
+#for (sort keys %ckname) {
+#    print "OP *\t", &tab(3,$_),"_((OP* o));\n";
+#}
+#
+#print "\n";
+#
+#for (@ops) {
+#    print "OP *\t", &tab(3, "pp_$_"), "_((ARGSproto));\n";
+#}
 
 # Emit ppcode switch array.
 
@@ -102,10 +109,9 @@ END_EXTERN_C
 #endif /* PERL_OBJECT */
 
 #ifndef DOINIT
-EXT OP * (CPERLscope(*ppaddr)[])(ARGSproto);
+EXT OP * (CPERLscope(*PL_ppaddr)[])(ARGSproto);
 #else
-#ifndef PERL_OBJECT
-EXT OP * (CPERLscope(*ppaddr)[])(ARGSproto) = {
+EXT OP * (CPERLscope(*PL_ppaddr)[])(ARGSproto) = {
 END
 
 for (@ops) {
@@ -114,7 +120,6 @@ for (@ops) {
 
 print <<END;
 };
-#endif /* PERL_OBJECT */
 #endif
 
 END
@@ -123,10 +128,9 @@ END
 
 print <<END;
 #ifndef DOINIT
-EXT OP * (CPERLscope(*check)[]) _((OP *op));
+EXT OP * (CPERLscope(*PL_check)[]) _((OP *op));
 #else
-#ifndef PERL_OBJECT
-EXT OP * (CPERLscope(*check)[]) _((OP *op)) = {
+EXT OP * (CPERLscope(*PL_check)[]) _((OP *op)) = {
 END
 
 for (@ops) {
@@ -135,7 +139,6 @@ for (@ops) {
 
 print <<END;
 };
-#endif /* PERL_OBJECT */
 #endif
 
 END
@@ -144,9 +147,9 @@ END
 
 print <<END;
 #ifndef DOINIT
-EXT U32 opargs[];
+EXT U32 PL_opargs[];
 #else
-EXT U32 opargs[] = {
+EXT U32 PL_opargs[] = {
 END
 
 %argnum = (
@@ -169,7 +172,7 @@ END
     '/',  6,           # pmop
     '$',  7,           # svop
     '*',  8,           # gvop
-    '"',  9,           # pvop
+    '"',  9,           # pvop_or_svop
     '{',  10,          # loop
     ';',  11,          # cop
     '%',  12,          # baseop_or_unop
@@ -189,7 +192,7 @@ for (@ops) {
     $argsum |= 64 if $flags =~ /d/;            # danger, unknown side effects
     $argsum |= 128 if $flags =~ /u/;           # defaults to $_
 
-    $flags =~ /([^a-zA-Z])/ or die qq[Opcode "$_" has no class indicator];
+    $flags =~ /([\W\d_])/ or die qq[Opcode "$_" has no class indicator];
     $argsum |= $opclass{$1} << 8;
     $mul = 4096;                               # 2 ^ OASHIFT
     for $arg (split(' ',$args{$_})) {
@@ -209,12 +212,26 @@ END
 
 close OC or die "Error closing opcode.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: $!";
+
+for (sort keys %ckname) {
+    print PP "PERL_CKDEF($_)\n";
+#OP *\t", &tab(3,$_),"_((OP* o));\n";
+}
+
+print PP "\n\n";
+
 for (@ops) {
-    print PP "PPDEF(pp_$_)\n";
+    next if /^i_(pre|post)(inc|dec)$/;
+    print PP "PERL_PPDEF(pp_$_)\n";
+    print PPSYM "pp_$_\n";
 }
 
 close PP or die "Error closing pp_proto.h: $!";
+close PPSYM or die "Error closing pp.sym: $!";
 
 ###########################################################################
 sub tab {
@@ -246,7 +263,7 @@ padav               private array           ck_null         d0
 padhv          private hash            ck_null         d0
 padany         private something       ck_null         d0
 
-pushre         push regexp             ck_null         /
+pushre         push regexp             ck_null         d/
 
 # References and stuff.
 
@@ -272,8 +289,10 @@ 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           ck_match        d/
+qr             pattern quote           ck_match        s/
 subst          substitution            ck_null         dis/    S
 substcont      substitution cont       ck_null         dis|    
 trans          character translation   ck_null         is"     S
@@ -428,7 +447,7 @@ anonhash    anonymous hash          ck_fun          ms@     L
 
 splice         splice                  ck_fun          m@      A S? S? L
 push           push                    ck_fun          imst@   A L
-pop            pop                     ck_shift        si%     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
@@ -466,7 +485,7 @@ reset               reset                   ck_fun          is%     S?
 lineseq                line sequence           ck_null         @       
 nextstate      next statement          ck_null         s;      
 dbstate                debug next statement    ck_null         s;      
-unstack                unstack                 ck_null         s0
+unstack                iteration finalizer     ck_null         s0
 enter          block entry             ck_null         0       
 leave          block exit              ck_null         @       
 scope          block                   ck_null         @       
@@ -515,7 +534,7 @@ print               print                   ck_listiob      ims@    F? L
 sysopen                sysopen                 ck_fun          s@      F S S S?
 sysseek                sysseek                 ck_fun          s@      F S S
 sysread                sysread                 ck_fun          imst@   F R S S?
-syswrite       syswrite                ck_fun          imst@   F S 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