Mingw32 PERL_OBJECT tweaks
[p5sagit/p5-mst-13.2.git] / bytecode.pl
index 2e3f9c6..945b496 100644 (file)
@@ -4,14 +4,13 @@ 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);
 
 # Nullsv *must* come first in the following so that the condition
 # ($$sv == 0) can continue to be used to test (sv == Nullsv).
-my @specialsv = qw(Nullsv &sv_undef &sv_yes &sv_no);
+my @specialsv = qw(Nullsv &PL_sv_undef &PL_sv_yes &PL_sv_no);
 
 my (%alias_from, $from, $tos);
 while (($from, $tos) = each %alias_to) {
@@ -69,14 +68,14 @@ print BYTERUN_C $c_header, <<'EOT';
 void *
 bset_obj_store(void *obj, I32 ix)
 {
-    if (ix > obj_list_fill) {
-       if (obj_list_fill == -1)
-           New(666, obj_list, ix + 1, void*);
+    if (ix > PL_obj_list_fill) {
+       if (PL_obj_list_fill == -1)
+           New(666, PL_obj_list, ix + 1, void*);
        else
-           Renew(obj_list, ix + 1, void*);
-       obj_list_fill = ix;
+           Renew(PL_obj_list, ix + 1, void*);
+       PL_obj_list_fill = ix;
     }
-    obj_list[ix] = obj;
+    PL_obj_list[ix] = obj;
     return obj;
 }
 
@@ -122,7 +121,7 @@ while (<DATA>) {
     if ($flags =~ /x/) {
        print BYTERUN_C "\t\tBSET_$insn($lvalue$optarg);\n";
     } elsif ($flags =~ /s/) {
-       # Store instructions store to obj_list[arg]. "lvalue" field is rvalue.
+       # Store instructions store to PL_obj_list[arg]. "lvalue" field is rvalue.
        print BYTERUN_C "\t\tBSET_OBJ_STORE($lvalue$optarg);\n";
     }
     elsif ($optarg && $lvalue ne "none") {
@@ -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,12 +211,11 @@ 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++) {
-    print BYTERUN_H "\tspecialsv_list[$i] = $specialsv[$i]; \\\n";
+    print BYTERUN_H "\tPL_specialsv_list[$i] = $specialsv[$i]; \\\n";
 }
 print BYTERUN_H <<'EOT';
     } STMT_END
@@ -239,12 +234,32 @@ while (($insn_name, $insn_data) = each %insn_data) {
 @insn_name = map($_ || "unused", @insn_name);
 
 1;
+
+__END__
+
+=head1 NAME
+
+B::Asmdata - Autogenerated data about Perl ops, used to generate bytecode
+
+=head1 SYNOPSIS
+
+       use Asmdata;
+
+=head1 DESCRIPTION
+
+See F<ext/B/B/Asmdata.pm>.
+
+=head1 AUTHOR
+
+Malcolm Beattie, C<mbeattie@sable.ox.ac.uk>
+
+=cut
 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
@@ -255,93 +270,93 @@ nop               none                    none
 #opcode                lvalue                  argtype         flags   
 #
 ret            none                    none            x
-ldsv           sv                      svindex
-ldop           op                      opindex
-stsv           sv                      U32             s
-stop           op                      U32             s
-ldspecsv       sv                      U8              x
-newsv          sv                      U8              x
-newop          op                      U8              x
-newopn         op                      U8              x
+ldsv           PL_sv                   svindex
+ldop           PL_op                   opindex
+stsv           PL_sv                   U32             s
+stop           PL_op                   U32             s
+ldspecsv       PL_sv                   U8              x
+newsv          PL_sv                   U8              x
+newop          PL_op                   U8              x
+newopn         PL_op                   U8              x
 newpv          none                    PV
-pv_cur         pv.xpv_cur              STRLEN
-pv_free                pv                      none            x
-sv_upgrade     sv                      char            x
-sv_refcnt      SvREFCNT(sv)            U32
-sv_refcnt_add  SvREFCNT(sv)            I32             x
-sv_flags       SvFLAGS(sv)             U32
-xrv            SvRV(sv)                svindex
-xpv            sv                      none            x
-xiv32          SvIVX(sv)               I32
-xiv64          SvIVX(sv)               IV64
-xnv            SvNVX(sv)               double
-xlv_targoff    LvTARGOFF(sv)           STRLEN
-xlv_targlen    LvTARGLEN(sv)           STRLEN
-xlv_targ       LvTARG(sv)              svindex
-xlv_type       LvTYPE(sv)              char
-xbm_useful     BmUSEFUL(sv)            I32
-xbm_previous   BmPREVIOUS(sv)          U16
-xbm_rare       BmRARE(sv)              U8
-xfm_lines      FmLINES(sv)             I32
-xio_lines      IoLINES(sv)             long
-xio_page       IoPAGE(sv)              long
-xio_page_len   IoPAGE_LEN(sv)          long
-xio_lines_left IoLINES_LEFT(sv)        long
-xio_top_name   IoTOP_NAME(sv)          pvcontents
-xio_top_gv     *(SV**)&IoTOP_GV(sv)    svindex
-xio_fmt_name   IoFMT_NAME(sv)          pvcontents
-xio_fmt_gv     *(SV**)&IoFMT_GV(sv)    svindex
-xio_bottom_name        IoBOTTOM_NAME(sv)       pvcontents
-xio_bottom_gv  *(SV**)&IoBOTTOM_GV(sv) svindex
-xio_subprocess IoSUBPROCESS(sv)        short
-xio_type       IoTYPE(sv)              char
-xio_flags      IoFLAGS(sv)             char
-xcv_stash      *(SV**)&CvSTASH(sv)     svindex
-xcv_start      CvSTART(sv)             opindex
-xcv_root       CvROOT(sv)              opindex
-xcv_gv         *(SV**)&CvGV(sv)        svindex
-xcv_filegv     *(SV**)&CvFILEGV(sv)    svindex
-xcv_depth      CvDEPTH(sv)             long
-xcv_padlist    *(SV**)&CvPADLIST(sv)   svindex
-xcv_outside    *(SV**)&CvOUTSIDE(sv)   svindex
-xcv_flags      CvFLAGS(sv)             U8
-av_extend      sv                      SSize_t         x
-av_push                sv                      svindex         x
-xav_fill       AvFILLp(sv)             SSize_t
-xav_max                AvMAX(sv)               SSize_t
-xav_flags      AvFLAGS(sv)             U8
-xhv_riter      HvRITER(sv)             I32
-xhv_name       HvNAME(sv)              pvcontents
-hv_store       sv                      svindex         x
-sv_magic       sv                      char            x
-mg_obj         SvMAGIC(sv)->mg_obj     svindex
-mg_private     SvMAGIC(sv)->mg_private U16
-mg_flags       SvMAGIC(sv)->mg_flags   U8
-mg_pv          SvMAGIC(sv)             pvcontents      x
-xmg_stash      *(SV**)&SvSTASH(sv)     svindex
-gv_fetchpv     sv                      strconst        x
-gv_stashpv     sv                      strconst        x
-gp_sv          GvSV(sv)                svindex
-gp_refcnt      GvREFCNT(sv)            U32
-gp_refcnt_add  GvREFCNT(sv)            I32             x
-gp_av          *(SV**)&GvAV(sv)        svindex
-gp_hv          *(SV**)&GvHV(sv)        svindex
-gp_cv          *(SV**)&GvCV(sv)        svindex
-gp_filegv      *(SV**)&GvFILEGV(sv)    svindex
-gp_io          *(SV**)&GvIOp(sv)       svindex
-gp_form                *(SV**)&GvFORM(sv)      svindex
-gp_cvgen       GvCVGEN(sv)             U32
-gp_line                GvLINE(sv)              line_t
-gp_share       sv                      svindex         x
-xgv_flags      GvFLAGS(sv)             U8
-op_next                op->op_next             opindex
-op_sibling     op->op_sibling          opindex
-op_ppaddr      op->op_ppaddr           strconst        x
-op_targ                op->op_targ             PADOFFSET
-op_type                op                      OPCODE          x
-op_seq         op->op_seq              U16
-op_flags       op->op_flags            U8
-op_private     op->op_private          U8
+pv_cur         PL_pv.xpv_cur           STRLEN
+pv_free                PL_pv                   none            x
+sv_upgrade     PL_sv                   char            x
+sv_refcnt      SvREFCNT(PL_sv)         U32
+sv_refcnt_add  SvREFCNT(PL_sv)         I32             x
+sv_flags       SvFLAGS(PL_sv)          U32
+xrv            SvRV(PL_sv)             svindex
+xpv            PL_sv                   none            x
+xiv32          SvIVX(PL_sv)            I32
+xiv64          SvIVX(PL_sv)            IV64
+xnv            SvNVX(PL_sv)            double
+xlv_targoff    LvTARGOFF(PL_sv)                STRLEN
+xlv_targlen    LvTARGLEN(PL_sv)                STRLEN
+xlv_targ       LvTARG(PL_sv)           svindex
+xlv_type       LvTYPE(PL_sv)           char
+xbm_useful     BmUSEFUL(PL_sv)         I32
+xbm_previous   BmPREVIOUS(PL_sv)               U16
+xbm_rare       BmRARE(PL_sv)           U8
+xfm_lines      FmLINES(PL_sv)          I32
+xio_lines      IoLINES(PL_sv)          long
+xio_page       IoPAGE(PL_sv)           long
+xio_page_len   IoPAGE_LEN(PL_sv)               long
+xio_lines_left IoLINES_LEFT(PL_sv)     long
+xio_top_name   IoTOP_NAME(PL_sv)               pvcontents
+xio_top_gv     *(SV**)&IoTOP_GV(PL_sv) svindex
+xio_fmt_name   IoFMT_NAME(PL_sv)               pvcontents
+xio_fmt_gv     *(SV**)&IoFMT_GV(PL_sv) svindex
+xio_bottom_name        IoBOTTOM_NAME(PL_sv)    pvcontents
+xio_bottom_gv  *(SV**)&IoBOTTOM_GV(PL_sv)      svindex
+xio_subprocess IoSUBPROCESS(PL_sv)     short
+xio_type       IoTYPE(PL_sv)           char
+xio_flags      IoFLAGS(PL_sv)          char
+xcv_stash      *(SV**)&CvSTASH(PL_sv)  svindex
+xcv_start      CvSTART(PL_sv)          opindex
+xcv_root       CvROOT(PL_sv)           opindex
+xcv_gv         *(SV**)&CvGV(PL_sv)     svindex
+xcv_filegv     *(SV**)&CvFILEGV(PL_sv) svindex
+xcv_depth      CvDEPTH(PL_sv)          long
+xcv_padlist    *(SV**)&CvPADLIST(PL_sv)        svindex
+xcv_outside    *(SV**)&CvOUTSIDE(PL_sv)        svindex
+xcv_flags      CvFLAGS(PL_sv)          U8
+av_extend      PL_sv                   SSize_t         x
+av_push                PL_sv                   svindex         x
+xav_fill       AvFILLp(PL_sv)          SSize_t
+xav_max                AvMAX(PL_sv)            SSize_t
+xav_flags      AvFLAGS(PL_sv)          U8
+xhv_riter      HvRITER(PL_sv)          I32
+xhv_name       HvNAME(PL_sv)           pvcontents
+hv_store       PL_sv                   svindex         x
+sv_magic       PL_sv                   char            x
+mg_obj         SvMAGIC(PL_sv)->mg_obj  svindex
+mg_private     SvMAGIC(PL_sv)->mg_private      U16
+mg_flags       SvMAGIC(PL_sv)->mg_flags        U8
+mg_pv          SvMAGIC(PL_sv)          pvcontents      x
+xmg_stash      *(SV**)&SvSTASH(PL_sv)  svindex
+gv_fetchpv     PL_sv                   strconst        x
+gv_stashpv     PL_sv                   strconst        x
+gp_sv          GvSV(PL_sv)             svindex
+gp_refcnt      GvREFCNT(PL_sv)         U32
+gp_refcnt_add  GvREFCNT(PL_sv)         I32             x
+gp_av          *(SV**)&GvAV(PL_sv)     svindex
+gp_hv          *(SV**)&GvHV(PL_sv)     svindex
+gp_cv          *(SV**)&GvCV(PL_sv)     svindex
+gp_filegv      *(SV**)&GvFILEGV(PL_sv) svindex
+gp_io          *(SV**)&GvIOp(PL_sv)    svindex
+gp_form                *(SV**)&GvFORM(PL_sv)   svindex
+gp_cvgen       GvCVGEN(PL_sv)          U32
+gp_line                GvLINE(PL_sv)           line_t
+gp_share       PL_sv                   svindex         x
+xgv_flags      GvFLAGS(PL_sv)          U8
+op_next                PL_op->op_next          opindex
+op_sibling     PL_op->op_sibling       opindex
+op_ppaddr      PL_op->op_ppaddr        strconst        x
+op_targ                PL_op->op_targ          PADOFFSET
+op_type                PL_op                   OPCODE          x
+op_seq         PL_op->op_seq           U16
+op_flags       PL_op->op_flags         U8
+op_private     PL_op->op_private       U8
 op_first       cUNOP->op_first         opindex
 op_last                cBINOP->op_last         opindex
 op_other       cLOGOP->op_other        opindex
@@ -352,7 +367,7 @@ op_pmreplroot       cPMOP->op_pmreplroot    opindex
 op_pmreplrootgv        *(SV**)&cPMOP->op_pmreplroot    svindex
 op_pmreplstart cPMOP->op_pmreplstart   opindex
 op_pmnext      *(OP**)&cPMOP->op_pmnext        opindex
-pregcomp       op                      pvcontents      x
+pregcomp       PL_op                   pvcontents      x
 op_pmflags     cPMOP->op_pmflags       U16
 op_pmpermflags cPMOP->op_pmpermflags   U16
 op_sv          cSVOP->op_sv            svindex
@@ -368,6 +383,6 @@ cop_filegv  *(SV**)&cCOP->cop_filegv        svindex
 cop_seq                cCOP->cop_seq           U32
 cop_arybase    cCOP->cop_arybase       I32
 cop_line       cCOP->cop_line          line_t
-main_start     main_start              opindex
-main_root      main_root               opindex
-curpad         curpad                  svindex         x
+main_start     PL_main_start           opindex
+main_root      PL_main_root            opindex
+curpad         PL_curpad               svindex         x