Changeset 772 for branches/1.3

Timestamp:

2011-04-18T11:25:37+02:00 (2 years ago)

Author:

moo

Message:

merge [769] from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• utils.c (modified) (3 diffs)
• xcache.h (modified) (2 diffs)

branches/1.3/utils.c

@@ -150 +150 @@
 #endif
             case ZEND_JMP:
+                assert(Z_OP(opline->op1).jmp_addr - op_array->opcodes < op_array->last);
                 Z_OP(opline->op1).opline_num = Z_OP(opline->op1).jmp_addr - op_array->opcodes;
-                assert(Z_OP(opline->op1).opline_num < op_array->last);
                 break;
             case ZEND_JMPZ:
@@ -160 +160 @@
             case ZEND_JMP_SET:
 #endif
+                assert(Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last);
                 Z_OP(opline->op2).opline_num = Z_OP(opline->op2).jmp_addr - op_array->opcodes;
-                assert(Z_OP(opline->op2).opline_num < op_array->last);
                 break;
         }
@@ -234 +234 @@
 
 #ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
-static void xc_fix_opcode_ex_znode(int tofix, xc_op_spec_t spec, zend_uchar *op_type, znode_op *op, int type TSRMLS_DC) /* {{{ */
+static void xc_fix_opcode_ex_znode(int tofix, xc_op_spec_t spec, Z_OP_TYPEOF_TYPE *op_type, znode_op *op, int type TSRMLS_DC) /* {{{ */
 {
 #ifdef ZEND_ENGINE_2

branches/1.3/xcache.h

@@ -97 +97 @@
 #   define Z_OP_CONSTANT(op) (op).literal->constant
 #   define Z_OP_TYPE(op) op##_##type
+#   define Z_OP_TYPEOF_TYPE zend_uchar
 
 #   define Z_CLASS_INFO(className) (className).info.user
@@ -103 +104 @@
 #   define Z_OP_CONSTANT(op) (op).u.constant
 #   define Z_OP_TYPE(op) (op).op_type
+#   define Z_OP_TYPEOF_TYPE int
 typedef znode znode_op;