Convert ByteLoader to use CopARYBASE_set().

[p5sagit/p5-mst-13.2.git] / ext / ByteLoader / byterun.c

diff --git a/ext/ByteLoader/byterun.c b/ext/ByteLoader/byterun.c
index 4506066..8c82798 100644 (file)
--- a/ext/ByteLoader/byterun.c
+++ b/ext/ByteLoader/byterun.c
@@ -54,7 +54,7 @@ byterun(pTHX_ register struct byteloader_state *bstate)
     SV *specialsv_list[6];
 
     BYTECODE_HEADER_CHECK;     /* croak if incorrect platform */
-    New(666, bstate->bs_obj_list, 32, void*); /* set op objlist */
+    Newx(bstate->bs_obj_list, 32, void*); /* set op objlist */
     bstate->bs_obj_list_fill = 31;
     bstate->bs_obj_list[0] = NULL; /* first is always Null */
     bstate->bs_ix = 1;
@@ -116,7 +116,7 @@ byterun(pTHX_ register struct byteloader_state *bstate)
            {
                U32 arg;
                BGET_U32(arg);
-               BSET_stpv(bstate->bs_pv.xpv_pv, arg);
+               BSET_stpv(bstate->bs_pv.pvx, arg);
                break;
            }
          case INSN_LDSPECSV:           /* 6 */
@@ -178,12 +178,12 @@ byterun(pTHX_ register struct byteloader_state *bstate)
            {
                STRLEN arg;
                BGET_PADOFFSET(arg);
-               bstate->bs_pv.xpv_cur = arg;
+               bstate->bs_pv.xpv.xpv_cur = arg;
                break;
            }
          case INSN_PV_FREE:            /* 16 */
            {
-               BSET_pv_free(bstate->bs_pv);
+               BSET_pv_free(bstate->bs_pv.pvx);
                break;
            }
          case INSN_SV_UPGRADE:         /* 17 */
@@ -524,7 +524,7 @@ byterun(pTHX_ register struct byteloader_state *bstate)
            {
                pvindex arg;
                BGET_pvindex(arg);
-               HvNAME(bstate->bs_sv) = arg;
+               BSET_xhv_name(bstate->bs_sv, arg);
                break;
            }
          case INSN_HV_STORE:           /* 67 */
@@ -964,7 +964,7 @@ byterun(pTHX_ register struct byteloader_state *bstate)
            {
                I32 arg;
                BGET_I32(arg);
-               cCOP->cop_arybase = arg;
+               BSET_cop_arybase(cCOP, arg);
                break;
            }
          case INSN_COP_LINE:           /* 129 */