X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=bytecode.pl;h=bc527bb64518fc03ed6caecd78a7544c0cf03e12;hb=8141890a98cb18fe79a9b720aaed544527266f99;hp=d3ca4c84534534a5857317358b2e4141e4eadc29;hpb=2814eb746a9281fd66cc5c45be3b127463ec07c7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/bytecode.pl b/bytecode.pl
index d3ca4c8..bc527bb 100644
--- a/bytecode.pl
+++ b/bytecode.pl
@@ -22,7 +22,8 @@ while (($from, $tos) = each %alias_to) {
 }
 
 my $c_header = <<'EOT';
-/*
+/* -*- buffer-read-only: t -*-
+ *
  *      Copyright (c) 1996-1999 Malcolm Beattie
  *
  *      You may distribute under the terms of either the GNU General Public
@@ -43,6 +44,7 @@ safer_unlink "ext/ByteLoader/byterun.c", "ext/ByteLoader/byterun.h", "ext/B/B/As
 # Start with boilerplate for Asmdata.pm
 #
 open(ASMDATA_PM, ">ext/B/B/Asmdata.pm") or die "ext/B/B/Asmdata.pm: $!";
+binmode ASMDATA_PM;
 print ASMDATA_PM $perl_header, <<'EOT';
 package B::Asmdata;
 
@@ -67,6 +69,7 @@ EOT
 # Boilerplate for byterun.c
 #
 open(BYTERUN_C, ">ext/ByteLoader/byterun.c") or die "ext/ByteLoader/byterun.c: $!";
+binmode BYTERUN_C;
 print BYTERUN_C $c_header, <<'EOT';
 
 #define PERL_NO_GET_CONTEXT
@@ -103,6 +106,7 @@ bset_obj_store(pTHX_ struct byteloader_state *bstate, void *obj, I32 ix)
 int
 byterun(pTHX_ register struct byteloader_state *bstate)
 {
+    dVAR;
     register int insn;
     U32 ix;
     SV *specialsv_list[6];
@@ -192,12 +196,15 @@ print BYTERUN_C <<'EOT';
     }
     return 0;
 }
+
+/* ex: set ro: */
 EOT
 
 #
 # Write the instruction and optype enum constants into byterun.h
 #
 open(BYTERUN_H, ">ext/ByteLoader/byterun.h") or die "ext/ByteLoader/byterun.h: $!";
+binmode BYTERUN_H;
 print BYTERUN_H $c_header, <<'EOT';
 struct byteloader_fdata {
     SV	*datasv;
@@ -205,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;
 };
 
@@ -247,6 +259,8 @@ for ($i = 0; $i < @optype - 1; $i++) {
 }
 printf BYTERUN_H "    OPt_%s\t\t/* %d */\n};\n\n", $optype[$i], $i;
 
+print BYTERUN_H "/* ex: set ro: */\n";
+
 #
 # Finish off insn_data and create array initialisers in Asmdata.pm
 #
@@ -322,6 +336,8 @@ or '&PL_sv_undef').
 Malcolm Beattie, C<mbeattie@sable.ox.ac.uk>
 
 =cut
+
+# ex: set ro:
 EOT
 
 
@@ -350,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
@@ -359,18 +375,18 @@ 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
 sv_flags	SvFLAGS(bstate->bs_sv)			U32
-xrv		SvRV(bstate->bs_sv)			svindex
+xrv		bstate->bs_sv				svindex		x
 xpv		bstate->bs_sv				none		x
-xpv_cur		SvCUR(bstate->bs_sv)			STRLEN
-xpv_len		SvLEN(bstate->bs_sv)			STRLEN
-xiv		SvIVX(bstate->bs_sv)			IV
-xnv		SvNVX(bstate->bs_sv)			NV
+xpv_cur		bstate->bs_sv	 			STRLEN		x
+xpv_len		bstate->bs_sv				STRLEN		x
+xiv		bstate->bs_sv				IV		x
+xnv		bstate->bs_sv				NV		x
 xlv_targoff	LvTARGOFF(bstate->bs_sv)		STRLEN
 xlv_targlen	LvTARGLEN(bstate->bs_sv)		STRLEN
 xlv_targ	LvTARG(bstate->bs_sv)			svindex
@@ -408,10 +424,8 @@ av_pushx	bstate->bs_sv				svindex		x
 av_push		bstate->bs_sv				svindex		x
 xav_fill	AvFILLp(bstate->bs_sv)			SSize_t
 xav_max		AvMAX(bstate->bs_sv)			SSize_t
-xav_flags	AvFLAGS(bstate->bs_sv)			U8
 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
@@ -419,7 +433,7 @@ mg_private	SvMAGIC(bstate->bs_sv)->mg_private	U16
 mg_flags	SvMAGIC(bstate->bs_sv)->mg_flags	U8
 mg_name		SvMAGIC(bstate->bs_sv)			pvcontents	x
 mg_namex	SvMAGIC(bstate->bs_sv)			svindex		x
-xmg_stash	*(SV**)&SvSTASH(bstate->bs_sv)		svindex
+xmg_stash	bstate->bs_sv				svindex		x
 gv_fetchpv	bstate->bs_sv				strconst	x
 gv_fetchpvx	bstate->bs_sv				strconst	x
 gv_stashpv	bstate->bs_sv				strconst	x