fix outdated bytecode.pl

p4raw-id: //depot/perl@1113

diff --git a/bytecode.h b/bytecode.h
index 3e8a6a9..dd08c95 100644 (file)
--- a/bytecode.h
+++ b/bytecode.h
@@ -62,7 +62,7 @@ EXT I32 obj_list_fill INIT(-1);
     } STMT_END
 #endif /* INDIRECT_BGET_MACROS */
 
-#define BGET_comment(arg) \
+#define BGET_comment_t(arg) \
        do { arg = BGET_FGETC(); } while (arg != '\n' && arg != EOF)
 
 /*

diff --git a/bytecode.pl b/bytecode.pl
index 2e3f9c6..91d6bf1 100644 (file)
--- a/bytecode.pl
+++ b/bytecode.pl
@@ -4,7 +4,6 @@ my %alias_to = (
     I32 => [qw(SSize_t long)],
     U16 => [qw(OPCODE line_t short)],
     U8 => [qw(char)],
-    objindex => [qw(svindex opindex)]          
 );
 
 my @optype= qw(OP UNOP BINOP LOGOP CONDOP LISTOP PMOP SVOP GVOP PVOP LOOP COP);
@@ -165,9 +164,6 @@ struct bytestream {
     int (*fread)(char *, size_t, size_t, void*);
     void (*freadpv)(U32, void*);
 };
-void byterun _((struct bytestream));
-#else
-void byterun _((PerlIO *));
 #endif /* INDIRECT_BGET_MACROS */
 
 void *bset_obj_store _((void *, I32));
@@ -215,8 +211,7 @@ print BYTERUN_H <<'EOT';
 
 EOT
 
-printf BYTERUN_H <<'EOT', scalar(@specialsv);
-EXT SV * specialsv_list[%d];
+print BYTERUN_H <<'EOT';
 #define INIT_SPECIALSV_LIST STMT_START { \
 EOT
 for ($i = 0; $i < @specialsv; $i++) {
@@ -244,7 +239,7 @@ EOT
 __END__
 # First set instruction ord("#") to read comment to end-of-line (sneaky)
 %number 35
-comment                arg                     comment
+comment                arg                     comment_t
 # Then make ord("\n") into a no-op
 %number 10
 nop            none                    none

diff --git a/byterun.c b/byterun.c
index 90c07d1..26cb5ac 100644 (file)
--- a/byterun.c
+++ b/byterun.c
@@ -39,7 +39,7 @@ void byterun(PerlIO *fp)
          case INSN_COMMENT:            /* 35 */
            {
                comment_t arg;
-               BGET_comment(arg);
+               BGET_comment_t(arg);
                arg = arg;
                break;
            }

diff --git a/byterun.h b/byterun.h
index d5ff00b..e8f4cc1 100644 (file)
--- a/byterun.h
+++ b/byterun.h
@@ -15,9 +15,6 @@ struct bytestream {
     int (*fread)(char *, size_t, size_t, void*);
     void (*freadpv)(U32, void*);
 };
-void byterun _((struct bytestream));
-/* #else
-void byterun _((PerlIO *)); */
 #endif /* INDIRECT_BGET_MACROS */
 
 void *bset_obj_store _((void *, I32));