more cleanup: avoid unused knowledge of "file GV" notion in CV and GV

p4raw-id: //depot/perl@4485

2 files changed, 142 insertions, 150 deletions

diff --git a/ext/ByteLoader/byterun.c b/ext/ByteLoader/byterun.c
index 19b79ac3f1..264cb01e6a 100644
--- a/ext/ByteLoader/byterun.c
+++ b/ext/ByteLoader/byterun.c
@@ -401,490 +401,483 @@ byterun(pTHXo_ struct bytestream bs)
 		*(SV**)&CvGV(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_XCV_FILEGV:		/* 48 */
-	    {
-		svindex arg;
-		BGET_svindex(arg);
-		*(SV**)&CvFILEGV(bytecode_sv) = arg;
-		break;
-	    }
-	  case INSN_XCV_DEPTH:		/* 49 */
+	  case INSN_XCV_DEPTH:		/* 48 */
 	    {
 		long arg;
 		BGET_I32(arg);
 		CvDEPTH(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_XCV_PADLIST:		/* 50 */
+	  case INSN_XCV_PADLIST:		/* 49 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&CvPADLIST(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_XCV_OUTSIDE:		/* 51 */
+	  case INSN_XCV_OUTSIDE:		/* 50 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&CvOUTSIDE(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_XCV_FLAGS:		/* 52 */
+	  case INSN_XCV_FLAGS:		/* 51 */
 	    {
 		U8 arg;
 		BGET_U8(arg);
 		CvFLAGS(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_AV_EXTEND:		/* 53 */
+	  case INSN_AV_EXTEND:		/* 52 */
 	    {
 		SSize_t arg;
 		BGET_I32(arg);
 		BSET_av_extend(bytecode_sv, arg);
 		break;
 	    }
-	  case INSN_AV_PUSH:		/* 54 */
+	  case INSN_AV_PUSH:		/* 53 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		BSET_av_push(bytecode_sv, arg);
 		break;
 	    }
-	  case INSN_XAV_FILL:		/* 55 */
+	  case INSN_XAV_FILL:		/* 54 */
 	    {
 		SSize_t arg;
 		BGET_I32(arg);
 		AvFILLp(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_XAV_MAX:		/* 56 */
+	  case INSN_XAV_MAX:		/* 55 */
 	    {
 		SSize_t arg;
 		BGET_I32(arg);
 		AvMAX(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_XAV_FLAGS:		/* 57 */
+	  case INSN_XAV_FLAGS:		/* 56 */
 	    {
 		U8 arg;
 		BGET_U8(arg);
 		AvFLAGS(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_XHV_RITER:		/* 58 */
+	  case INSN_XHV_RITER:		/* 57 */
 	    {
 		I32 arg;
 		BGET_I32(arg);
 		HvRITER(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_XHV_NAME:		/* 59 */
+	  case INSN_XHV_NAME:		/* 58 */
 	    {
 		pvcontents arg;
 		BGET_pvcontents(arg);
 		HvNAME(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_HV_STORE:		/* 60 */
+	  case INSN_HV_STORE:		/* 59 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		BSET_hv_store(bytecode_sv, arg);
 		break;
 	    }
-	  case INSN_SV_MAGIC:		/* 61 */
+	  case INSN_SV_MAGIC:		/* 60 */
 	    {
 		char arg;
 		BGET_U8(arg);
 		BSET_sv_magic(bytecode_sv, arg);
 		break;
 	    }
-	  case INSN_MG_OBJ:		/* 62 */
+	  case INSN_MG_OBJ:		/* 61 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		SvMAGIC(bytecode_sv)->mg_obj = arg;
 		break;
 	    }
-	  case INSN_MG_PRIVATE:		/* 63 */
+	  case INSN_MG_PRIVATE:		/* 62 */
 	    {
 		U16 arg;
 		BGET_U16(arg);
 		SvMAGIC(bytecode_sv)->mg_private = arg;
 		break;
 	    }
-	  case INSN_MG_FLAGS:		/* 64 */
+	  case INSN_MG_FLAGS:		/* 63 */
 	    {
 		U8 arg;
 		BGET_U8(arg);
 		SvMAGIC(bytecode_sv)->mg_flags = arg;
 		break;
 	    }
-	  case INSN_MG_PV:		/* 65 */
+	  case INSN_MG_PV:		/* 64 */
 	    {
 		pvcontents arg;
 		BGET_pvcontents(arg);
 		BSET_mg_pv(SvMAGIC(bytecode_sv), arg);
 		break;
 	    }
-	  case INSN_XMG_STASH:		/* 66 */
+	  case INSN_XMG_STASH:		/* 65 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&SvSTASH(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GV_FETCHPV:		/* 67 */
+	  case INSN_GV_FETCHPV:		/* 66 */
 	    {
 		strconst arg;
 		BGET_strconst(arg);
 		BSET_gv_fetchpv(bytecode_sv, arg);
 		break;
 	    }
-	  case INSN_GV_STASHPV:		/* 68 */
+	  case INSN_GV_STASHPV:		/* 67 */
 	    {
 		strconst arg;
 		BGET_strconst(arg);
 		BSET_gv_stashpv(bytecode_sv, arg);
 		break;
 	    }
-	  case INSN_GP_SV:		/* 69 */
+	  case INSN_GP_SV:		/* 68 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		GvSV(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_REFCNT:		/* 70 */
+	  case INSN_GP_REFCNT:		/* 69 */
 	    {
 		U32 arg;
 		BGET_U32(arg);
 		GvREFCNT(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_REFCNT_ADD:		/* 71 */
+	  case INSN_GP_REFCNT_ADD:		/* 70 */
 	    {
 		I32 arg;
 		BGET_I32(arg);
 		BSET_gp_refcnt_add(GvREFCNT(bytecode_sv), arg);
 		break;
 	    }
-	  case INSN_GP_AV:		/* 72 */
+	  case INSN_GP_AV:		/* 71 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&GvAV(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_HV:		/* 73 */
+	  case INSN_GP_HV:		/* 72 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&GvHV(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_CV:		/* 74 */
+	  case INSN_GP_CV:		/* 73 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&GvCV(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_FILEGV:		/* 75 */
+	  case INSN_GP_FILE:		/* 74 */
 	    {
-		svindex arg;
-		BGET_svindex(arg);
-		*(SV**)&GvFILEGV(bytecode_sv) = arg;
+		pvcontents arg;
+		BGET_pvcontents(arg);
+		GvFILE(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_IO:		/* 76 */
+	  case INSN_GP_IO:		/* 75 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&GvIOp(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_FORM:		/* 77 */
+	  case INSN_GP_FORM:		/* 76 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&GvFORM(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_CVGEN:		/* 78 */
+	  case INSN_GP_CVGEN:		/* 77 */
 	    {
 		U32 arg;
 		BGET_U32(arg);
 		GvCVGEN(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_LINE:		/* 79 */
+	  case INSN_GP_LINE:		/* 78 */
 	    {
 		line_t arg;
 		BGET_U16(arg);
 		GvLINE(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_GP_SHARE:		/* 80 */
+	  case INSN_GP_SHARE:		/* 79 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		BSET_gp_share(bytecode_sv, arg);
 		break;
 	    }
-	  case INSN_XGV_FLAGS:		/* 81 */
+	  case INSN_XGV_FLAGS:		/* 80 */
 	    {
 		U8 arg;
 		BGET_U8(arg);
 		GvFLAGS(bytecode_sv) = arg;
 		break;
 	    }
-	  case INSN_OP_NEXT:		/* 82 */
+	  case INSN_OP_NEXT:		/* 81 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		PL_op->op_next = arg;
 		break;
 	    }
-	  case INSN_OP_SIBLING:		/* 83 */
+	  case INSN_OP_SIBLING:		/* 82 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		PL_op->op_sibling = arg;
 		break;
 	    }
-	  case INSN_OP_PPADDR:		/* 84 */
+	  case INSN_OP_PPADDR:		/* 83 */
 	    {
 		strconst arg;
 		BGET_strconst(arg);
 		BSET_op_ppaddr(PL_op->op_ppaddr, arg);
 		break;
 	    }
-	  case INSN_OP_TARG:		/* 85 */
+	  case INSN_OP_TARG:		/* 84 */
 	    {
 		PADOFFSET arg;
 		BGET_U32(arg);
 		PL_op->op_targ = arg;
 		break;
 	    }
-	  case INSN_OP_TYPE:		/* 86 */
+	  case INSN_OP_TYPE:		/* 85 */
 	    {
 		OPCODE arg;
 		BGET_U16(arg);
 		BSET_op_type(PL_op, arg);
 		break;
 	    }
-	  case INSN_OP_SEQ:		/* 87 */
+	  case INSN_OP_SEQ:		/* 86 */
 	    {
 		U16 arg;
 		BGET_U16(arg);
 		PL_op->op_seq = arg;
 		break;
 	    }
-	  case INSN_OP_FLAGS:		/* 88 */
+	  case INSN_OP_FLAGS:		/* 87 */
 	    {
 		U8 arg;
 		BGET_U8(arg);
 		PL_op->op_flags = arg;
 		break;
 	    }
-	  case INSN_OP_PRIVATE:		/* 89 */
+	  case INSN_OP_PRIVATE:		/* 88 */
 	    {
 		U8 arg;
 		BGET_U8(arg);
 		PL_op->op_private = arg;
 		break;
 	    }
-	  case INSN_OP_FIRST:		/* 90 */
+	  case INSN_OP_FIRST:		/* 89 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		cUNOP->op_first = arg;
 		break;
 	    }
-	  case INSN_OP_LAST:		/* 91 */
+	  case INSN_OP_LAST:		/* 90 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		cBINOP->op_last = arg;
 		break;
 	    }
-	  case INSN_OP_OTHER:		/* 92 */
+	  case INSN_OP_OTHER:		/* 91 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		cLOGOP->op_other = arg;
 		break;
 	    }
-	  case INSN_OP_CHILDREN:		/* 93 */
+	  case INSN_OP_CHILDREN:		/* 92 */
 	    {
 		U32 arg;
 		BGET_U32(arg);
 		cLISTOP->op_children = arg;
 		break;
 	    }
-	  case INSN_OP_PMREPLROOT:		/* 94 */
+	  case INSN_OP_PMREPLROOT:		/* 93 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		cPMOP->op_pmreplroot = arg;
 		break;
 	    }
-	  case INSN_OP_PMREPLROOTGV:		/* 95 */
+	  case INSN_OP_PMREPLROOTGV:		/* 94 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&cPMOP->op_pmreplroot = arg;
 		break;
 	    }
-	  case INSN_OP_PMREPLSTART:		/* 96 */
+	  case INSN_OP_PMREPLSTART:		/* 95 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		cPMOP->op_pmreplstart = arg;
 		break;
 	    }
-	  case INSN_OP_PMNEXT:		/* 97 */
+	  case INSN_OP_PMNEXT:		/* 96 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		*(OP**)&cPMOP->op_pmnext = arg;
 		break;
 	    }
-	  case INSN_PREGCOMP:		/* 98 */
+	  case INSN_PREGCOMP:		/* 97 */
 	    {
 		pvcontents arg;
 		BGET_pvcontents(arg);
 		BSET_pregcomp(PL_op, arg);
 		break;
 	    }
-	  case INSN_OP_PMFLAGS:		/* 99 */
+	  case INSN_OP_PMFLAGS:		/* 98 */
 	    {
 		U16 arg;
 		BGET_U16(arg);
 		cPMOP->op_pmflags = arg;
 		break;
 	    }
-	  case INSN_OP_PMPERMFLAGS:		/* 100 */
+	  case INSN_OP_PMPERMFLAGS:		/* 99 */
 	    {
 		U16 arg;
 		BGET_U16(arg);
 		cPMOP->op_pmpermflags = arg;
 		break;
 	    }
-	  case INSN_OP_SV:		/* 101 */
+	  case INSN_OP_SV:		/* 100 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		cSVOP->op_sv = arg;
 		break;
 	    }
-	  case INSN_OP_PADIX:		/* 102 */
+	  case INSN_OP_PADIX:		/* 101 */
 	    {
 		PADOFFSET arg;
 		BGET_U32(arg);
 		cPADOP->op_padix = arg;
 		break;
 	    }
-	  case INSN_OP_PV:		/* 103 */
+	  case INSN_OP_PV:		/* 102 */
 	    {
 		pvcontents arg;
 		BGET_pvcontents(arg);
 		cPVOP->op_pv = arg;
 		break;
 	    }
-	  case INSN_OP_PV_TR:		/* 104 */
+	  case INSN_OP_PV_TR:		/* 103 */
 	    {
 		op_tr_array arg;
 		BGET_op_tr_array(arg);
 		cPVOP->op_pv = arg;
 		break;
 	    }
-	  case INSN_OP_REDOOP:		/* 105 */
+	  case INSN_OP_REDOOP:		/* 104 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		cLOOP->op_redoop = arg;
 		break;
 	    }
-	  case INSN_OP_NEXTOP:		/* 106 */
+	  case INSN_OP_NEXTOP:		/* 105 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		cLOOP->op_nextop = arg;
 		break;
 	    }
-	  case INSN_OP_LASTOP:		/* 107 */
+	  case INSN_OP_LASTOP:		/* 106 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		cLOOP->op_lastop = arg;
 		break;
 	    }
-	  case INSN_COP_LABEL:		/* 108 */
+	  case INSN_COP_LABEL:		/* 107 */
 	    {
 		pvcontents arg;
 		BGET_pvcontents(arg);
 		cCOP->cop_label = arg;
 		break;
 	    }
-	  case INSN_COP_STASH:		/* 109 */
+	  case INSN_COP_STASH:		/* 108 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&cCOP->cop_stash = arg;
 		break;
 	    }
-	  case INSN_COP_FILEGV:		/* 110 */
+	  case INSN_COP_FILEGV:		/* 109 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		*(SV**)&cCOP->cop_filegv = arg;
 		break;
 	    }
-	  case INSN_COP_SEQ:		/* 111 */
+	  case INSN_COP_SEQ:		/* 110 */
 	    {
 		U32 arg;
 		BGET_U32(arg);
 		cCOP->cop_seq = arg;
 		break;
 	    }
-	  case INSN_COP_ARYBASE:		/* 112 */
+	  case INSN_COP_ARYBASE:		/* 111 */
 	    {
 		I32 arg;
 		BGET_I32(arg);
 		cCOP->cop_arybase = arg;
 		break;
 	    }
-	  case INSN_COP_LINE:		/* 113 */
+	  case INSN_COP_LINE:		/* 112 */
 	    {
 		line_t arg;
 		BGET_U16(arg);
 		cCOP->cop_line = arg;
 		break;
 	    }
-	  case INSN_COP_WARNINGS:		/* 114 */
+	  case INSN_COP_WARNINGS:		/* 113 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
 		cCOP->cop_warnings = arg;
 		break;
 	    }
-	  case INSN_MAIN_START:		/* 115 */
+	  case INSN_MAIN_START:		/* 114 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		PL_main_start = arg;
 		break;
 	    }
-	  case INSN_MAIN_ROOT:		/* 116 */
+	  case INSN_MAIN_ROOT:		/* 115 */
 	    {
 		opindex arg;
 		BGET_opindex(arg);
 		PL_main_root = arg;
 		break;
 	    }
-	  case INSN_CURPAD:		/* 117 */
+	  case INSN_CURPAD:		/* 116 */
 	    {
 		svindex arg;
 		BGET_svindex(arg);
diff --git a/ext/ByteLoader/byterun.h b/ext/ByteLoader/byterun.h
index d8f6c0e155..306df9cbd4 100644
--- a/ext/ByteLoader/byterun.h
+++ b/ext/ByteLoader/byterun.h
@@ -64,77 +64,76 @@ enum {
     INSN_XCV_START,			/* 45 */
     INSN_XCV_ROOT,			/* 46 */
     INSN_XCV_GV,			/* 47 */
-    INSN_XCV_FILEGV,			/* 48 */
-    INSN_XCV_DEPTH,			/* 49 */
-    INSN_XCV_PADLIST,			/* 50 */
-    INSN_XCV_OUTSIDE,			/* 51 */
-    INSN_XCV_FLAGS,			/* 52 */
-    INSN_AV_EXTEND,			/* 53 */
-    INSN_AV_PUSH,			/* 54 */
-    INSN_XAV_FILL,			/* 55 */
-    INSN_XAV_MAX,			/* 56 */
-    INSN_XAV_FLAGS,			/* 57 */
-    INSN_XHV_RITER,			/* 58 */
-    INSN_XHV_NAME,			/* 59 */
-    INSN_HV_STORE,			/* 60 */
-    INSN_SV_MAGIC,			/* 61 */
-    INSN_MG_OBJ,			/* 62 */
-    INSN_MG_PRIVATE,			/* 63 */
-    INSN_MG_FLAGS,			/* 64 */
-    INSN_MG_PV,			/* 65 */
-    INSN_XMG_STASH,			/* 66 */
-    INSN_GV_FETCHPV,			/* 67 */
-    INSN_GV_STASHPV,			/* 68 */
-    INSN_GP_SV,			/* 69 */
-    INSN_GP_REFCNT,			/* 70 */
-    INSN_GP_REFCNT_ADD,			/* 71 */
-    INSN_GP_AV,			/* 72 */
-    INSN_GP_HV,			/* 73 */
-    INSN_GP_CV,			/* 74 */
-    INSN_GP_FILEGV,			/* 75 */
-    INSN_GP_IO,			/* 76 */
-    INSN_GP_FORM,			/* 77 */
-    INSN_GP_CVGEN,			/* 78 */
-    INSN_GP_LINE,			/* 79 */
-    INSN_GP_SHARE,			/* 80 */
-    INSN_XGV_FLAGS,			/* 81 */
-    INSN_OP_NEXT,			/* 82 */
-    INSN_OP_SIBLING,			/* 83 */
-    INSN_OP_PPADDR,			/* 84 */
-    INSN_OP_TARG,			/* 85 */
-    INSN_OP_TYPE,			/* 86 */
-    INSN_OP_SEQ,			/* 87 */
-    INSN_OP_FLAGS,			/* 88 */
-    INSN_OP_PRIVATE,			/* 89 */
-    INSN_OP_FIRST,			/* 90 */
-    INSN_OP_LAST,			/* 91 */
-    INSN_OP_OTHER,			/* 92 */
-    INSN_OP_CHILDREN,			/* 93 */
-    INSN_OP_PMREPLROOT,			/* 94 */
-    INSN_OP_PMREPLROOTGV,			/* 95 */
-    INSN_OP_PMREPLSTART,			/* 96 */
-    INSN_OP_PMNEXT,			/* 97 */
-    INSN_PREGCOMP,			/* 98 */
-    INSN_OP_PMFLAGS,			/* 99 */
-    INSN_OP_PMPERMFLAGS,			/* 100 */
-    INSN_OP_SV,			/* 101 */
-    INSN_OP_PADIX,			/* 102 */
-    INSN_OP_PV,			/* 103 */
-    INSN_OP_PV_TR,			/* 104 */
-    INSN_OP_REDOOP,			/* 105 */
-    INSN_OP_NEXTOP,			/* 106 */
-    INSN_OP_LASTOP,			/* 107 */
-    INSN_COP_LABEL,			/* 108 */
-    INSN_COP_STASH,			/* 109 */
-    INSN_COP_FILEGV,			/* 110 */
-    INSN_COP_SEQ,			/* 111 */
-    INSN_COP_ARYBASE,			/* 112 */
-    INSN_COP_LINE,			/* 113 */
-    INSN_COP_WARNINGS,			/* 114 */
-    INSN_MAIN_START,			/* 115 */
-    INSN_MAIN_ROOT,			/* 116 */
-    INSN_CURPAD,			/* 117 */
-    MAX_INSN = 117
+    INSN_XCV_DEPTH,			/* 48 */
+    INSN_XCV_PADLIST,			/* 49 */
+    INSN_XCV_OUTSIDE,			/* 50 */
+    INSN_XCV_FLAGS,			/* 51 */
+    INSN_AV_EXTEND,			/* 52 */
+    INSN_AV_PUSH,			/* 53 */
+    INSN_XAV_FILL,			/* 54 */
+    INSN_XAV_MAX,			/* 55 */
+    INSN_XAV_FLAGS,			/* 56 */
+    INSN_XHV_RITER,			/* 57 */
+    INSN_XHV_NAME,			/* 58 */
+    INSN_HV_STORE,			/* 59 */
+    INSN_SV_MAGIC,			/* 60 */
+    INSN_MG_OBJ,			/* 61 */
+    INSN_MG_PRIVATE,			/* 62 */
+    INSN_MG_FLAGS,			/* 63 */
+    INSN_MG_PV,			/* 64 */
+    INSN_XMG_STASH,			/* 65 */
+    INSN_GV_FETCHPV,			/* 66 */
+    INSN_GV_STASHPV,			/* 67 */
+    INSN_GP_SV,			/* 68 */
+    INSN_GP_REFCNT,			/* 69 */
+    INSN_GP_REFCNT_ADD,			/* 70 */
+    INSN_GP_AV,			/* 71 */
+    INSN_GP_HV,			/* 72 */
+    INSN_GP_CV,			/* 73 */
+    INSN_GP_FILE,			/* 74 */
+    INSN_GP_IO,			/* 75 */
+    INSN_GP_FORM,			/* 76 */
+    INSN_GP_CVGEN,			/* 77 */
+    INSN_GP_LINE,			/* 78 */
+    INSN_GP_SHARE,			/* 79 */
+    INSN_XGV_FLAGS,			/* 80 */
+    INSN_OP_NEXT,			/* 81 */
+    INSN_OP_SIBLING,			/* 82 */
+    INSN_OP_PPADDR,			/* 83 */
+    INSN_OP_TARG,			/* 84 */
+    INSN_OP_TYPE,			/* 85 */
+    INSN_OP_SEQ,			/* 86 */
+    INSN_OP_FLAGS,			/* 87 */
+    INSN_OP_PRIVATE,			/* 88 */
+    INSN_OP_FIRST,			/* 89 */
+    INSN_OP_LAST,			/* 90 */
+    INSN_OP_OTHER,			/* 91 */
+    INSN_OP_CHILDREN,			/* 92 */
+    INSN_OP_PMREPLROOT,			/* 93 */
+    INSN_OP_PMREPLROOTGV,			/* 94 */
+    INSN_OP_PMREPLSTART,			/* 95 */
+    INSN_OP_PMNEXT,			/* 96 */
+    INSN_PREGCOMP,			/* 97 */
+    INSN_OP_PMFLAGS,			/* 98 */
+    INSN_OP_PMPERMFLAGS,			/* 99 */
+    INSN_OP_SV,			/* 100 */
+    INSN_OP_PADIX,			/* 101 */
+    INSN_OP_PV,			/* 102 */
+    INSN_OP_PV_TR,			/* 103 */
+    INSN_OP_REDOOP,			/* 104 */
+    INSN_OP_NEXTOP,			/* 105 */
+    INSN_OP_LASTOP,			/* 106 */
+    INSN_COP_LABEL,			/* 107 */
+    INSN_COP_STASH,			/* 108 */
+    INSN_COP_FILEGV,			/* 109 */
+    INSN_COP_SEQ,			/* 110 */
+    INSN_COP_ARYBASE,			/* 111 */
+    INSN_COP_LINE,			/* 112 */
+    INSN_COP_WARNINGS,			/* 113 */
+    INSN_MAIN_START,			/* 114 */
+    INSN_MAIN_ROOT,			/* 115 */
+    INSN_CURPAD,			/* 116 */
+    MAX_INSN = 116
 };
 
 enum {