Sync with the latest MakeMaker snapshot.

[p5sagit/p5-mst-13.2.git] / opcode.h

diff --git a/opcode.h b/opcode.h
index 9c1537b..4d41ddf 100644 (file)
--- a/opcode.h
+++ b/opcode.h
@@ -21,10 +21,10 @@
 START_EXTERN_C
 
 
-#define OP_NAME(o) (o->op_type == OP_CUSTOM ? custom_op_name(o) : \
-                    PL_op_name[o->op_type])
-#define OP_DESC(o) (o->op_type == OP_CUSTOM ? custom_op_desc(o) : \
-                    PL_op_desc[o->op_type])
+#define OP_NAME(o) ((o)->op_type == OP_CUSTOM ? custom_op_name(o) : \
+                    PL_op_name[(o)->op_type])
+#define OP_DESC(o) ((o)->op_type == OP_CUSTOM ? custom_op_desc(o) : \
+                    PL_op_desc[(o)->op_type])
 
 #ifndef DOINIT
 EXT char *PL_op_name[];
@@ -1544,7 +1544,7 @@ EXT U32 PL_opargs[] = {
        0x0002251e,     /* i_add */
        0x0002252e,     /* subtract */
        0x0002251e,     /* i_subtract */
-       0x0002250e,     /* concat */
+       0x0002240e,     /* concat */
        0x0000290e,     /* stringify */
        0x0002250e,     /* left_shift */
        0x0002250e,     /* right_shift */
@@ -1625,8 +1625,8 @@ EXT U32 PL_opargs[] = {
        0x00004805,     /* anonhash */
        0x05326801,     /* splice */
        0x0004691d,     /* push */
-       0x00007604,     /* pop */
-       0x00007604,     /* shift */
+       0x00017604,     /* pop */
+       0x00017604,     /* shift */
        0x0004691d,     /* unshift */
        0x0005a801,     /* sort */
        0x00004809,     /* reverse */