X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=opcode.h;h=47dd777f4d35daa82f2ed34e502dbe71ec01eb50;hb=569536030df0016c037f85e8e6d3ef93f000c47a;hp=936831bada980932370ecfc0b3b1a8bbffd2d35f;hpb=a863c7d16499251f020c5d26d232aa865fa0b197;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/opcode.h b/opcode.h
index 936831b..47dd777 100644
--- a/opcode.h
+++ b/opcode.h
@@ -349,7 +349,7 @@ typedef enum {
 	OP_GETLOGIN,	/* 342 */
 	OP_SYSCALL,	/* 343 */
 	OP_LOCK,	/* 344 */
-	OP_SPECIFIC,	/* 345 */
+	OP_THREADSV,	/* 345 */
 	OP_max		
 } opcode;
 
@@ -704,7 +704,7 @@ EXT char *op_name[] = {
 	"getlogin",
 	"syscall",
 	"lock",
-	"specific",
+	"threadsv",
 };
 #endif
 
@@ -1057,10 +1057,13 @@ EXT char *op_desc[] = {
 	"getlogin",
 	"syscall",
 	"lock",
-	"thread-specific",
+	"per-thread variable",
 };
 #endif
 
+#ifndef PERL_OBJECT
+START_EXTERN_C
+
 OP *	ck_anoncode	_((OP* o));
 OP *	ck_bitop	_((OP* o));
 OP *	ck_concat	_((OP* o));
@@ -1439,12 +1442,16 @@ OP *	pp_egrent	_((ARGSproto));
 OP *	pp_getlogin	_((ARGSproto));
 OP *	pp_syscall	_((ARGSproto));
 OP *	pp_lock		_((ARGSproto));
-OP *	pp_specific	_((ARGSproto));
+OP *	pp_threadsv	_((ARGSproto));
+
+END_EXTERN_C
+#endif	/* PERL_OBJECT */
 
 #ifndef DOINIT
-EXT OP * (*ppaddr[])();
+EXT OP * (CPERLscope(*ppaddr)[])(ARGSproto);
 #else
-EXT OP * (*ppaddr[])() = {
+#ifndef PERL_OBJECT
+EXT OP * (CPERLscope(*ppaddr)[])(ARGSproto) = {
 	pp_null,
 	pp_stub,
 	pp_scalar,
@@ -1790,14 +1797,16 @@ EXT OP * (*ppaddr[])() = {
 	pp_getlogin,
 	pp_syscall,
 	pp_lock,
-	pp_specific,
+	pp_threadsv,
 };
+#endif	/* PERL_OBJECT */
 #endif
 
 #ifndef DOINIT
-EXT OP * (*check[]) _((OP *op));
+EXT OP * (CPERLscope(*check)[]) _((OP *op));
 #else
-EXT OP * (*check[]) _((OP *op)) = {
+#ifndef PERL_OBJECT
+EXT OP * (CPERLscope(*check)[]) _((OP *op)) = {
 	ck_null,	/* null */
 	ck_null,	/* stub */
 	ck_fun,		/* scalar */
@@ -2143,8 +2152,9 @@ EXT OP * (*check[]) _((OP *op)) = {
 	ck_null,	/* getlogin */
 	ck_fun,		/* syscall */
 	ck_rfun,	/* lock */
-	ck_null,	/* specific */
+	ck_null,	/* threadsv */
 };
+#endif	/* PERL_OBJECT */
 #endif
 
 #ifndef DOINIT
@@ -2171,8 +2181,8 @@ EXT U32 opargs[] = {
 	0x00000140,	/* rv2cv */
 	0x00000700,	/* anoncode */
 	0x00001c04,	/* prototype */
-	0x00002001,	/* refgen */
-	0x00001006,	/* srefgen */
+	0x00002101,	/* refgen */
+	0x00001106,	/* srefgen */
 	0x00009c8c,	/* ref */
 	0x00091504,	/* bless */
 	0x00000c08,	/* backtick */
@@ -2260,7 +2270,7 @@ EXT U32 opargs[] = {
 	0x00009c8e,	/* oct */
 	0x00009c8e,	/* abs */
 	0x00009c9c,	/* length */
-	0x0091150c,	/* substr */
+	0x0991150c,	/* substr */
 	0x0011151c,	/* vec */
 	0x0091151c,	/* index */
 	0x0091151c,	/* rindex */
@@ -2496,6 +2506,6 @@ EXT U32 opargs[] = {
 	0x0000000c,	/* getlogin */
 	0x0002151d,	/* syscall */
 	0x00001c04,	/* lock */
-	0x00000044,	/* specific */
+	0x00000044,	/* threadsv */
 };
 #endif