X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=bytecode.pl;h=4da765a86f34252733a2b65702da8e1d1b7ee128;hb=92c6daad83acab71abd7df8769e308064578da8e;hp=0fd036229c5eef635028f0e764e99b12b44f77bb;hpb=d5e9ef99e58bef05952c3b4469da723a74bed8f1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/bytecode.pl b/bytecode.pl
index 0fd0362..4da765a 100644
--- a/bytecode.pl
+++ b/bytecode.pl
@@ -4,8 +4,8 @@ BEGIN {
 }
 use strict;
 my %alias_to = (
-    U32 => [qw(PADOFFSET STRLEN line_t)],
-    I32 => [qw(SSize_t long)],
+    U32 => [qw(line_t)],
+    PADOFFSET => [qw(STRLEN SSize_t)],
     U16 => [qw(OPCODE short)],
     U8  => [qw(char)],
 );
@@ -14,7 +14,8 @@ my @optype= qw(OP UNOP BINOP LOGOP LISTOP PMOP SVOP PADOP PVOP LOOP COP);
 
 # Nullsv *must* come first in the following so that the condition
 # ($$sv == 0) can continue to be used to test (sv == Nullsv).
-my @specialsv = qw(Nullsv &PL_sv_undef &PL_sv_yes &PL_sv_no pWARN_ALL pWARN_NONE);
+my @specialsv = qw(Nullsv &PL_sv_undef &PL_sv_yes &PL_sv_no
+		   (SV*)pWARN_ALL (SV*)pWARN_NONE (SV*)pWARN_STD);
 
 my (%alias_from, $from, $tos);
 while (($from, $tos) = each %alias_to) {
@@ -22,7 +23,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,10 +45,11 @@ 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;
 
-our $VERSION = '1.00';
+our $VERSION = '1.01';
 
 use Exporter;
 @ISA = qw(Exporter);
@@ -67,6 +70,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
@@ -86,7 +90,10 @@ for ($i = 0; $i < @optype - 1; $i++) {
     printf BYTERUN_C "    sizeof(%s),\n", $optype[$i], $i;
 }
 printf BYTERUN_C "    sizeof(%s)\n", $optype[$i], $i;
-print BYTERUN_C <<'EOT';
+
+my $size = @specialsv;
+
+print BYTERUN_C <<"EOT";
 };
 
 void *
@@ -100,16 +107,19 @@ bset_obj_store(pTHX_ struct byteloader_state *bstate, void *obj, I32 ix)
     return obj;
 }
 
-void
+int
 byterun(pTHX_ register struct byteloader_state *bstate)
 {
+    dVAR;
     register int insn;
     U32 ix;
-    SV *specialsv_list[6];
+    SV *specialsv_list[$size];
 
     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;
 
 EOT
 
@@ -127,8 +137,11 @@ EOT
 my (@insn_name, $insn_num, $insn, $lvalue, $argtype, $flags, $fundtype);
 
 while (<DATA>) {
+    if (/^\s*#/) {
+	print BYTERUN_C if /^\s*#\s*(?:if|endif|el)/;
+	next;
+    }
     chop;
-    s/#.*//;			# remove comments
     next unless length;
     if (/^%number\s+(.*)/) {
 	$insn_num = $1;
@@ -138,6 +151,10 @@ while (<DATA>) {
 	next;
     }
     ($insn, $lvalue, $argtype, $flags) = split;
+    my $rvalcast = '';
+    if ($argtype =~ m:(.+)/(.+):) {
+	($rvalcast, $argtype) = ("($1)", $2);
+    }
     $insn_name[$insn_num] = $insn;
     $fundtype = $alias_from{$argtype} || $argtype;
 
@@ -157,7 +174,7 @@ while (<DATA>) {
 	print BYTERUN_C "\t\tBSET_OBJ_STORE($lvalue$optarg);\n";
     }
     elsif ($optarg && $lvalue ne "none") {
-	print BYTERUN_C "\t\t$lvalue = arg;\n";
+	print BYTERUN_C "\t\t$lvalue = ${rvalcast}arg;\n";
     }
     print BYTERUN_C "\t\tbreak;\n\t    }\n";
 
@@ -181,13 +198,17 @@ print BYTERUN_C <<'EOT';
 	    /* NOTREACHED */
 	}
     }
+    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;
@@ -195,18 +216,24 @@ 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;
-    XPV				bs_pv;
+    int				bs_ix;
+    struct byteloader_pv_state	bs_pv;
     int				bs_iv_overflows;
 };
 
 int bl_getc(struct byteloader_fdata *);
 int bl_read(struct byteloader_fdata *, char *, size_t, size_t);
-extern void byterun(pTHX_ struct byteloader_state *);
+extern int byterun(pTHX_ struct byteloader_state *);
 
 enum {
 EOT
@@ -236,6 +263,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
 #
@@ -300,7 +329,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').
 
@@ -311,6 +340,8 @@ or '&PL_sv_undef').
 Malcolm Beattie, C<mbeattie@sable.ox.ac.uk>
 
 =cut
+
+# ex: set ro:
 EOT
 
 
@@ -325,10 +356,13 @@ comment		arg			comment_t
 # Then make ord("\n") into a no-op
 %number 10
 nop		none			none
+
 # Now for the rest of the ordinary ones, beginning with \0 which is
 # ret so that \0-terminated strings can be read properly as bytecode.
 %number 0
 #
+# The argtype is either a single type or "rightvaluecast/argtype".
+#
 #opcode		lvalue					argtype		flags	
 #
 ret		none					none		x
@@ -336,23 +370,27 @@ 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
+newsvx		bstate->bs_sv				U32		x
 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
-xiv32		SvIVX(bstate->bs_sv)			I32
-xiv64		SvIVX(bstate->bs_sv)			IV64
-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
@@ -365,15 +403,16 @@ xio_lines	IoLINES(bstate->bs_sv)			IV
 xio_page	IoPAGE(bstate->bs_sv)			IV
 xio_page_len	IoPAGE_LEN(bstate->bs_sv)		IV
 xio_lines_left	IoLINES_LEFT(bstate->bs_sv)	       	IV
-xio_top_name	IoTOP_NAME(bstate->bs_sv)		pvcontents
+xio_top_name	IoTOP_NAME(bstate->bs_sv)		pvindex
 xio_top_gv	*(SV**)&IoTOP_GV(bstate->bs_sv)		svindex
-xio_fmt_name	IoFMT_NAME(bstate->bs_sv)		pvcontents
+xio_fmt_name	IoFMT_NAME(bstate->bs_sv)		pvindex
 xio_fmt_gv	*(SV**)&IoFMT_GV(bstate->bs_sv)		svindex
-xio_bottom_name	IoBOTTOM_NAME(bstate->bs_sv)		pvcontents
+xio_bottom_name	IoBOTTOM_NAME(bstate->bs_sv)		pvindex
 xio_bottom_gv	*(SV**)&IoBOTTOM_GV(bstate->bs_sv)	svindex
 xio_subprocess	IoSUBPROCESS(bstate->bs_sv)		short
 xio_type	IoTYPE(bstate->bs_sv)			char
 xio_flags	IoFLAGS(bstate->bs_sv)			char
+xcv_xsubany	*(SV**)&CvXSUBANY(bstate->bs_sv).any_ptr	svindex
 xcv_stash	*(SV**)&CvSTASH(bstate->bs_sv)		svindex
 xcv_start	CvSTART(bstate->bs_sv)			opindex
 xcv_root	CvROOT(bstate->bs_sv)			opindex
@@ -385,21 +424,24 @@ xcv_outside	*(SV**)&CvOUTSIDE(bstate->bs_sv)	svindex
 xcv_outside_seq	CvOUTSIDE_SEQ(bstate->bs_sv)		U32
 xcv_flags	CvFLAGS(bstate->bs_sv)			U16
 av_extend	bstate->bs_sv				SSize_t		x
+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)			pvcontents
+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
 mg_private	SvMAGIC(bstate->bs_sv)->mg_private	U16
 mg_flags	SvMAGIC(bstate->bs_sv)->mg_flags	U8
-mg_pv		SvMAGIC(bstate->bs_sv)			pvcontents	x
-xmg_stash	*(SV**)&SvSTASH(bstate->bs_sv)		svindex
+mg_name		SvMAGIC(bstate->bs_sv)			pvcontents	x
+mg_namex	SvMAGIC(bstate->bs_sv)			svindex		x
+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
+gv_stashpvx	bstate->bs_sv				strconst	x
 gp_sv		GvSV(bstate->bs_sv)			svindex
 gp_refcnt	GvREFCNT(bstate->bs_sv)			U32
 gp_refcnt_add	GvREFCNT(bstate->bs_sv)			I32		x
@@ -418,19 +460,27 @@ op_sibling	PL_op->op_sibling			opindex
 op_ppaddr	PL_op->op_ppaddr			strconst	x
 op_targ		PL_op->op_targ				PADOFFSET
 op_type		PL_op					OPCODE		x
-op_seq		PL_op->op_seq				U16
+op_opt		PL_op->op_opt				U8
+op_static	PL_op->op_static			U8
 op_flags	PL_op->op_flags				U8
 op_private	PL_op->op_private			U8
 op_first	cUNOP->op_first				opindex
 op_last		cBINOP->op_last				opindex
 op_other	cLOGOP->op_other			opindex
 op_pmreplroot	cPMOP->op_pmreplroot			opindex
-op_pmreplrootgv	*(SV**)&cPMOP->op_pmreplroot		svindex
 op_pmreplstart	cPMOP->op_pmreplstart			opindex
 op_pmnext	*(OP**)&cPMOP->op_pmnext		opindex
+#ifdef USE_ITHREADS
+op_pmstashpv	cPMOP					pvindex		x
+op_pmreplrootpo	cPMOP->op_pmreplroot			OP*/PADOFFSET
+#else
+op_pmstash	*(SV**)&cPMOP->op_pmstash		svindex
+op_pmreplrootgv	*(SV**)&cPMOP->op_pmreplroot		svindex
+#endif
 pregcomp	PL_op					pvcontents	x
 op_pmflags	cPMOP->op_pmflags			U16
 op_pmpermflags	cPMOP->op_pmpermflags			U16
+op_pmdynflags	cPMOP->op_pmdynflags			U8
 op_sv		cSVOP->op_sv				svindex
 op_padix	cPADOP->op_padix			PADOFFSET
 op_pv		cPVOP->op_pv				pvcontents
@@ -439,15 +489,36 @@ op_redoop	cLOOP->op_redoop			opindex
 op_nextop	cLOOP->op_nextop			opindex
 op_lastop	cLOOP->op_lastop			opindex
 cop_label	cCOP->cop_label				pvindex
+#ifdef USE_ITHREADS
 cop_stashpv	cCOP					pvindex		x
 cop_file	cCOP					pvindex		x
+#else
+cop_stash	cCOP					svindex		x
+cop_filegv	cCOP					svindex		x
+#endif
 cop_seq		cCOP->cop_seq				U32
-cop_arybase	cCOP->cop_arybase			I32
-cop_line	cCOP					line_t		x
-cop_warnings	cCOP->cop_warnings			svindex
+cop_arybase	cCOP					I32		x
+cop_line	cCOP->cop_line				line_t
+cop_io		cCOP->cop_io				svindex
+cop_warnings	cCOP					svindex		x
 main_start	PL_main_start				opindex
 main_root	PL_main_root				opindex
+main_cv		*(SV**)&PL_main_cv			svindex
 curpad		PL_curpad				svindex		x
 push_begin	PL_beginav				svindex		x
 push_init	PL_initav				svindex		x
 push_end	PL_endav				svindex		x
+curstash	*(SV**)&PL_curstash			svindex
+defstash	*(SV**)&PL_defstash			svindex
+data		none					U8		x
+incav		*(SV**)&GvAV(PL_incgv)			svindex
+load_glob	none					svindex		x
+#ifdef USE_ITHREADS
+regex_padav	*(SV**)&PL_regex_padav			svindex
+#endif
+dowarn		PL_dowarn				U8
+comppad_name	*(SV**)&PL_comppad_name			svindex
+xgv_stash	*(SV**)&GvSTASH(bstate->bs_sv)		svindex
+signal		bstate->bs_sv				strconst	x
+# to be removed
+formfeed	PL_formfeed				svindex