X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=bytecode.pl;h=fc2cae4786c429dd16c2869705f9197d877fd230;hb=b1fbf5c3d1dc6dd7934002da04dede2ae2e3ef65;hp=fa9019f16da95f73c9e0d2014d427e7a63455d40;hpb=11ca45c0440b891278a1e7129025dd5644026556;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/bytecode.pl b/bytecode.pl
index fa9019f..fc2cae4 100644
--- a/bytecode.pl
+++ b/bytecode.pl
@@ -112,7 +112,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;
@@ -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;
 };
 
@@ -320,7 +325,7 @@ A simple mapping of the op type number to its type (like 'COP' or 'BINOP').
   my $sv_name = $specialsv_name[$sv_index];
 
 Certain SV types are considered 'special'.  They're represented by
-B::SPECIAL and are refered to by a number from the specialsv_list.
+B::SPECIAL and are referred to by a number from the specialsv_list.
 This array maps that number back to the name of the SV (like 'Nullsv'
 or '&PL_sv_undef').
 
@@ -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