X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=bytecode.pl;h=d1e1c708c0dc10cede8cd442be5ea4df4b261e27;hb=9ec58fb7ec19e41fee2f2944750a45a2a85e4a03;hp=63fc7383897bb65fc0552ff880ebd079bda55483;hpb=7934575e193741c310ddb7f01d6d07c9981c3d29;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/bytecode.pl b/bytecode.pl
index 63fc738..d1e1c70 100644
--- a/bytecode.pl
+++ b/bytecode.pl
@@ -47,7 +47,7 @@ package B::Asmdata;
 use Exporter;
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(%insn_data @insn_name @optype @specialsv_name);
-use vars qw(%insn_data @insn_name @optype @specialsv_name);
+our(%insn_data, @insn_name, @optype, @specialsv_name);
 
 EOT
 print ASMDATA_PM <<"EOT";
@@ -339,11 +339,11 @@ xcv_stash	*(SV**)&CvSTASH(bytecode_sv)		svindex
 xcv_start	CvSTART(bytecode_sv)			opindex
 xcv_root	CvROOT(bytecode_sv)			opindex
 xcv_gv		*(SV**)&CvGV(bytecode_sv)		svindex
-xcv_filegv	*(SV**)&CvFILEGV(bytecode_sv)		svindex
+xcv_file	CvFILE(bytecode_sv)			pvcontents
 xcv_depth	CvDEPTH(bytecode_sv)			long
 xcv_padlist	*(SV**)&CvPADLIST(bytecode_sv)		svindex
 xcv_outside	*(SV**)&CvOUTSIDE(bytecode_sv)		svindex
-xcv_flags	CvFLAGS(bytecode_sv)			U8
+xcv_flags	CvFLAGS(bytecode_sv)			U16
 av_extend	bytecode_sv				SSize_t		x
 av_push		bytecode_sv				svindex		x
 xav_fill	AvFILLp(bytecode_sv)			SSize_t
@@ -366,7 +366,7 @@ gp_refcnt_add	GvREFCNT(bytecode_sv)			I32		x
 gp_av		*(SV**)&GvAV(bytecode_sv)		svindex
 gp_hv		*(SV**)&GvHV(bytecode_sv)		svindex
 gp_cv		*(SV**)&GvCV(bytecode_sv)		svindex
-gp_filegv	*(SV**)&GvFILEGV(bytecode_sv)		svindex
+gp_file		GvFILE(bytecode_sv)			pvcontents
 gp_io		*(SV**)&GvIOp(bytecode_sv)		svindex
 gp_form		*(SV**)&GvFORM(bytecode_sv)		svindex
 gp_cvgen	GvCVGEN(bytecode_sv)			U32
@@ -400,11 +400,11 @@ op_redoop	cLOOP->op_redoop			opindex
 op_nextop	cLOOP->op_nextop			opindex
 op_lastop	cLOOP->op_lastop			opindex
 cop_label	cCOP->cop_label				pvcontents
-cop_stash	*(SV**)&cCOP->cop_stash			svindex
-cop_filegv	*(SV**)&cCOP->cop_filegv		svindex
+cop_stashpv	cCOP					pvcontents	x
+cop_file	cCOP					pvcontents	x
 cop_seq		cCOP->cop_seq				U32
 cop_arybase	cCOP->cop_arybase			I32
-cop_line	cCOP->cop_line				line_t
+cop_line	cCOP					line_t		x
 cop_warnings	cCOP->cop_warnings			svindex
 main_start	PL_main_start				opindex
 main_root	PL_main_root				opindex