Changeset 485 for trunk/utils.c

Timestamp:

2007-12-28T11:16:12+01:00 (5 years ago)

Author:

moo

Message:

5.3 support

File:

• trunk/utils.c (modified) (5 diffs)

trunk/utils.c

@@ -20 +20 @@
 
 #define OP_ZVAL_DTOR(op) do { \
-    (op).u.constant.is_ref = 0; \
+    Z_UNSET_ISREF((op).u.constant); \
     zval_dtor(&(op).u.constant); \
 } while(0)
@@ -152 +152 @@
             case ZEND_JMPZ_EX:
             case ZEND_JMPNZ_EX:
+#ifdef ZEND_JMP_SET
+            case ZEND_JMP_SET:
+#endif
                 opline->op2.u.opline_num = opline->op2.u.jmp_addr - op_array->opcodes;
                 assert(opline->op2.u.opline_num < op_array->last);
@@ -181 +184 @@
     while (opline < end) {
         if (opline->op1.op_type == IS_CONST) {
-            opline->op1.u.constant.is_ref = 1;
-            opline->op1.u.constant.refcount = 2; /* Make sure is_ref won't be reset */
+            Z_SET_ISREF(opline->op1.u.constant);
+            Z_SET_REFCOUNT(opline->op1.u.constant, 2); /* Make sure is_ref won't be reset */
+
         }
         if (opline->op2.op_type == IS_CONST) {
-            opline->op2.u.constant.is_ref = 1;
-            opline->op2.u.constant.refcount = 2;
+            Z_SET_ISREF(opline->op2.u.constant);
+            Z_SET_REFCOUNT(opline->op2.u.constant, 2);
         }
 #ifdef ZEND_ENGINE_2_1
@@ -198 +202 @@
             case ZEND_JMPZ_EX:
             case ZEND_JMPNZ_EX:
+#ifdef ZEND_JMP_SET
+            case ZEND_JMP_SET:
+#endif
                 assert(opline->op2.u.opline_num < op_array->last);
                 opline->op2.u.jmp_addr = op_array->opcodes + opline->op2.u.opline_num;
@@ -299 +306 @@
             case ZEND_JMPZ_EX:
             case ZEND_JMPNZ_EX:
+#ifdef ZEND_JMP_SET
+            case ZEND_JMP_SET:
+#endif
                 next = begin + opline->op2.u.opline_num;
                 break;