Changeset 716 for trunk/utils.c

Timestamp:

04/09/2011 09:07:48 AM (2 years ago)

Author:

moo

Message:

PHP 6: initial catch up with php 6 literals and trait

Files:

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

trunk/utils.c

@@ -20 +20 @@
 
 #define OP_ZVAL_DTOR(op) do { \
-    Z_UNSET_ISREF((op).u.constant); \
-    zval_dtor(&(op).u.constant); \
+    Z_UNSET_ISREF(Z_OP_CONSTANT(op)); \
+    zval_dtor(&Z_OP_CONSTANT(op)); \
 } while(0)
 xc_compile_result_t *xc_compile_result_init(xc_compile_result_t *cr, /* {{{ */
@@ -135 +135 @@
     zend_op *opline, *end;
 
+#ifndef ZEND_ENGINE_2_4
     if (!op_array->done_pass_two) {
         return 0;
     }
+#endif
 
     opline = op_array->opcodes;
@@ -148 +150 @@
 #endif
             case ZEND_JMP:
-                opline->op1.u.opline_num = opline->op1.u.jmp_addr - op_array->opcodes;
-                assert(opline->op1.u.opline_num < 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:
@@ -158 +160 @@
             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);
+                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;
         }
@@ -165 +167 @@
         opline++;
     }
+#ifndef ZEND_ENGINE_2_4
     op_array->done_pass_two = 0;
+#endif
 
     return 0;
@@ -174 +178 @@
     zend_op *opline, *end;
 
+#ifndef ZEND_ENGINE_2_4
     if (op_array->done_pass_two) {
         return 0;
     }
+#endif
 
     /*
@@ -186 +192 @@
     end = opline + op_array->last;
     while (opline < end) {
-        if (opline->op1.op_type == IS_CONST) {
-            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) {
-            Z_SET_ISREF(opline->op2.u.constant);
-            Z_SET_REFCOUNT(opline->op2.u.constant, 2);
+        if (Z_OP_TYPE(opline->op1) == IS_CONST) {
+            Z_SET_ISREF(Z_OP_CONSTANT(opline->op1));
+            Z_SET_REFCOUNT(Z_OP_CONSTANT(opline->op1), 2); /* Make sure is_ref won't be reset */
+
+        }
+        if (Z_OP_TYPE(opline->op2) == IS_CONST) {
+            Z_SET_ISREF(Z_OP_CONSTANT(opline->op2));
+            Z_SET_REFCOUNT(Z_OP_CONSTANT(opline->op2), 2);
         }
 #ifdef ZEND_ENGINE_2_1
@@ -201 +207 @@
 #endif
             case ZEND_JMP:
-                assert(opline->op1.u.opline_num < op_array->last);
-                opline->op1.u.jmp_addr = op_array->opcodes + opline->op1.u.opline_num;
+                assert(Z_OP(opline->op1).opline_num < op_array->last);
+                Z_OP(opline->op1).jmp_addr = op_array->opcodes + Z_OP(opline->op1).opline_num;
                 break;
             case ZEND_JMPZ:
@@ -211 +217 @@
             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;
+                assert(Z_OP(opline->op2).opline_num < op_array->last);
+                Z_OP(opline->op2).jmp_addr = op_array->opcodes + Z_OP(opline->op2).opline_num;
                 break;
         }
@@ -220 +226 @@
     }
 
+#ifndef ZEND_ENGINE_2_4
     op_array->done_pass_two = 1;
+#endif
     return 0;
 }
@@ -226 +234 @@
 
 #ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
-static void xc_fix_opcode_ex_znode(int tofix, xc_op_spec_t spec, znode *znode, int type TSRMLS_DC) /* {{{ */
+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) /* {{{ */
 {
 #ifdef ZEND_ENGINE_2
-    if ((znode->op_type != IS_UNUSED && (spec == OPSPEC_UCLASS || spec == OPSPEC_CLASS)) ||
+    if ((*op_type != IS_UNUSED && (spec == OPSPEC_UCLASS || spec == OPSPEC_CLASS)) ||
             spec == OPSPEC_FETCH) {
         if (tofix) {
-            switch (znode->op_type) {
+            switch (*op_type) {
             case IS_VAR:
             case IS_TMP_VAR:
@@ -239 +247 @@
             default:
                 /* TODO: data lost, find a way to keep it */
-                /* assert(znode->op_type == IS_CONST); */
-                znode->op_type = IS_TMP_VAR;
+                /* assert(*op_type == IS_CONST); */
+                *op_type = IS_TMP_VAR;
             }
         }
     }
-    switch (znode->op_type) {
+    switch (*op_type) {
     case IS_TMP_VAR:
     case IS_VAR:
         if (tofix) {
-            znode->u.var /= sizeof(temp_variable);
+            Z_OP(*op).var /= sizeof(temp_variable);
         }
         else {
-            znode->u.var *= sizeof(temp_variable);
+            Z_OP(*op).var *= sizeof(temp_variable);
         }
     }
@@ -270 +278 @@
             spec = xc_get_opcode_spec(opline->opcode);
 
-            xc_fix_opcode_ex_znode(tofix, spec->op1, &opline->op1, 0 TSRMLS_CC);
-            xc_fix_opcode_ex_znode(tofix, spec->op2, &opline->op2, 1 TSRMLS_CC);
-            xc_fix_opcode_ex_znode(tofix, spec->res, &opline->result, 2 TSRMLS_CC);
+            xc_fix_opcode_ex_znode(tofix, spec->op1, &Z_OP_TYPE(opline->op1),    &opline->op1, 0 TSRMLS_CC);
+            xc_fix_opcode_ex_znode(tofix, spec->op2, &Z_OP_TYPE(opline->op2),    &opline->op2, 1 TSRMLS_CC);
+            xc_fix_opcode_ex_znode(tofix, spec->res, &Z_OP_TYPE(opline->result), &opline->result, 2 TSRMLS_CC);
         }
     }
@@ -304 +312 @@
 #endif
             case ZEND_JMP:
-                next = begin + opline->op1.u.opline_num;
+                next = begin + Z_OP(opline->op1).opline_num;
                 break;
 
             case ZEND_JMPZNZ:
-                next = begin + max(opline->op2.u.opline_num, opline->extended_value);
+                next = begin + max(Z_OP(opline->op2).opline_num, opline->extended_value);
                 break;
 
@@ -318 +326 @@
             case ZEND_JMP_SET:
 #endif
-                next = begin + opline->op2.u.opline_num;
+                next = begin + Z_OP(opline->op2).opline_num;
                 break;
 
@@ -371 +379 @@
             }
 
-            parent_name = &(opline - 1)->op2.u.constant;
+            parent_name = &(Z_OP_CONSTANT((opline - 1)->op2));
             TRACE("binding with parent %s", Z_STRVAL_P(parent_name));
             if (zend_lookup_class(Z_STRVAL_P(parent_name), Z_STRLEN_P(parent_name), &pce TSRMLS_CC) == FAILURE) {
@@ -387 +395 @@
             zend_op *fetch_class_opline = opline - 1;
 
-            TRACE("%s %p", Z_STRVAL(fetch_class_opline->op2.u.constant), Z_STRVAL(fetch_class_opline->op2.u.constant));
+            TRACE("%s %p", Z_STRVAL(Z_OP_CONSTANT(fetch_class_opline->op2)), Z_STRVAL(Z_OP_CONSTANT(fetch_class_opline->op2)));
             OP_ZVAL_DTOR(fetch_class_opline->op2);
             fetch_class_opline->opcode = ZEND_NOP;
@@ -421 +429 @@
     }
 
-    zend_hash_del(class_table, opline->op1.u.constant.value.str.val, opline->op1.u.constant.value.str.len);
+    zend_hash_del(class_table, Z_OP_CONSTANT(opline->op1).value.str.val, Z_OP_CONSTANT(opline->op1).value.str.len);
     OP_ZVAL_DTOR(opline->op1);
     OP_ZVAL_DTOR(opline->op2);
@@ -512 +520 @@
                 ZESW(&stored_ce_ptr, NULL)
                 ) == FAILURE) {
-        CG(zend_lineno) = ZESW(0, cep->line_start);
+        CG(zend_lineno) = ZESW(0, Z_CLASS_INFO(*cep).line_start);
 #ifdef IS_UNICODE
         zend_error(E_ERROR, "Cannot redeclare class %R", type, cep->name);