Change 24838 breaks deparse.t, which checks that embedded NULs work.

[p5sagit/p5-mst-13.2.git] / bytecode.pl

diff --git a/bytecode.pl b/bytecode.pl
index fa9019f..bc527bb 100644 (file)
--- a/bytecode.pl
+++ b/bytecode.pl
@@ -212,13 +212,18 @@ struct byteloader_fdata {
     int        idx;
 };
 
+struct byteloader_pv_state {
+    char                       *pvx;
+    XPV                                xpv;
+};
+
 struct byteloader_state {
     struct byteloader_fdata    *bs_fdata;
     SV                         *bs_sv;
     void                       **bs_obj_list;
     int                                bs_obj_list_fill;
     int                                bs_ix;
-    XPV                                bs_pv;
+    struct byteloader_pv_state bs_pv;
     int                                bs_iv_overflows;
 };
 
@@ -361,7 +366,7 @@ ldsv                bstate->bs_sv                           svindex
 ldop           PL_op                                   opindex
 stsv           bstate->bs_sv                           U32             s
 stop           PL_op                                   U32             s
-stpv           bstate->bs_pv.xpv_pv                    U32             x
+stpv           bstate->bs_pv.pvx                       U32             x
 ldspecsv       bstate->bs_sv                           U8              x
 ldspecsvx      bstate->bs_sv                           U8              x
 newsv          bstate->bs_sv                           U8              x
@@ -370,8 +375,8 @@ newop               PL_op                                   U8              x
 newopx         PL_op                                   U16             x
 newopn         PL_op                                   U8              x
 newpv          none                                    PV
-pv_cur         bstate->bs_pv.xpv_cur                   STRLEN
-pv_free                bstate->bs_pv                           none            x
+pv_cur         bstate->bs_pv.xpv.xpv_cur               STRLEN
+pv_free                bstate->bs_pv.pvx                       none            x
 sv_upgrade     bstate->bs_sv                           U8              x
 sv_refcnt      SvREFCNT(bstate->bs_sv)                 U32
 sv_refcnt_add  SvREFCNT(bstate->bs_sv)                 I32             x
@@ -420,8 +425,7 @@ av_push             bstate->bs_sv                           svindex         x
 xav_fill       AvFILLp(bstate->bs_sv)                  SSize_t
 xav_max                AvMAX(bstate->bs_sv)                    SSize_t
 xhv_riter      HvRITER(bstate->bs_sv)                  I32
-xhv_name       HvNAME(bstate->bs_sv)                   pvindex
-xhv_pmroot     *(OP**)&HvPMROOT(bstate->bs_sv)         opindex
+xhv_name       bstate->bs_sv                           pvindex         x
 hv_store       bstate->bs_sv                           svindex         x
 sv_magic       bstate->bs_sv                           char            x
 mg_obj         SvMAGIC(bstate->bs_sv)->mg_obj          svindex