Changeset 822

Timestamp:

03/22/2012 05:22:37 PM (14 months ago)

Author:

moo

Message:

initial PHP_5_4 support

Location:

trunk

Files:

• optimizer.c (modified) (1 diff)
• processor/hashtable.m4 (modified) (1 diff)
• processor/processor.m4 (modified) (10 diffs)
• utils.c (modified) (8 diffs)
• xcache.h (modified) (2 diffs)

trunk/optimizer.c

@@ -19 +19 @@
 #else
 #   define XCACHE_IS_CV 16
+#endif
+
+#ifdef ZEND_ENGINE_2_4
+#   undef Z_OP_CONSTANT
+/* Z_OP_CONSTANT is used before pass_two is applied */
+#   define Z_OP_CONSTANT(op) op_array->literals[op.constant].constant
 #endif
 

trunk/processor/hashtable.m4

@@ -109 +109 @@
                 /* pnew into hash node chain */
                 pnew->pLast = NULL;
-                if (dst->arBuckets[n]) {
-                    pnew->pNext = dst->arBuckets[n];
+                pnew->pNext = dst->arBuckets[n];
+                if (pnew->pNext) {
                     pnew->pNext->pLast = pnew;
-                }
-                else {
-                    pnew->pNext = NULL;
                 }
                 dst->arBuckets[n] = pnew;

trunk/processor/processor.m4

@@ -486 +486 @@
 undefine(`UNION_znode_op')
 define(`UNION_znode_op', `dnl {{{
-    switch ((src->$1_type & ~EXT_TYPE_UNUSED)) {
+#ifndef NDEBUG
+    switch ((src->$1_type ifelse($1, `result', & ~EXT_TYPE_UNUSED))) {
     case IS_CONST:
     case IS_VAR:
@@ -497 +498 @@
         assert(0);
     }
+#endif
 
     dnl dirty dispatch
     DISABLECHECK(`
-    switch ((src->$1_type & ~EXT_TYPE_UNUSED)) {
+    switch ((src->$1_type ifelse($1, `result', & ~EXT_TYPE_UNUSED))) {
         case IS_CONST:
-            dnl TODO: fix me, use literals
-            IFDASM(`{
-                zval *zv;
-                ALLOC_INIT_ZVAL(zv);
-                *zv = ((zend_literal *) src->$1.ptr)->constant;
-                zval_copy_ctor(zv);
-                add_assoc_zval_ex(dst, ZEND_STRS("$1.constant"), zv);
+            ifelse($1, `result', `
+                DISPATCH(zend_uint, $1.constant)
+            ', `
+                IFDASM(`{
+                    zval *zv;
+                    ALLOC_INIT_ZVAL(zv);
+                    *zv = src->$1.literal->constant;
+                    zval_copy_ctor(zv);
+                    add_assoc_zval_ex(dst, ZEND_STRS("$1.constant"), zv);
                 }
-            ', `
-                DISPATCH(zend_uint, $1.constant)
+                ', `
+                    IFCOPY(`
+                        dst->$1 = src->$1;
+                    ', `
+                        DISPATCH(zend_uint, $1.constant)
+                    ')
+                ')
             ')
             break;
@@ -517 +526 @@
             IFNOTMEMCPY(`
                 default:
-                    *dst = *src;
+                    $1 = $2;
             ')
         ', `
@@ -607 +616 @@
 #endif
     IFCOPY(`
+        pushdef(`UNION_znode_op_literal', `
+            if (dst->$1_type == IS_CONST) {
+                IFSTORE(`
+                    dst->$1.constant = src->$1.literal - processor->active_op_array_src->literals;
+                    dst->$1.literal = &processor->active_op_array_dst->literals[dst->$1.constant];
+                ')
+            }
+        ')
+        UNION_znode_op_literal(op1)
+        UNION_znode_op_literal(op2)
+        popdef(`UNION_znode_op_literal')
         switch (src->opcode) {
 #ifdef ZEND_GOTO
@@ -659 +679 @@
     if (shallow_copy) {
         zend_bool gc_arg_info = 0;
-        int gc_opcodes        = 0;
+        zend_bool gc_opcodes  = 0;
         /* really fast shallow copy */
         memcpy(dst, src, sizeof(src[0]));
@@ -669 +689 @@
         gc_arg_info = 1;
 #endif
-        IFRESTORE(`dst->filename = processor->entry_src->filepath;')
-#ifndef ZEND_ENGINE_2_4
+        dst->filename = processor->entry_src->filepath;
+#ifdef ZEND_ENGINE_2_4
+        if (src->literals /* || op_array_info->literalsinfo_cnt */) {
+            gc_opcodes = 1;
+        }
+#else
         if (op_array_info->oplineinfo_cnt) {
+            gc_opcodes = 1;
+        }
+#endif
+        if (gc_opcodes) {
             zend_op *opline, *end;
-            gc_opcodes = 1;
             COPY_N_EX(last, zend_op, opcodes)
 
             for (opline = dst->opcodes, end = opline + src->last; opline < end; ++opline) {
+#ifdef ZEND_ENGINE_2_4
+                pushdef(`UNION_znode_op_literal', `
+                    if (opline->$1_type == IS_CONST) {
+                        opline->$1.constant = opline->$1.literal - src->literals;
+                        opline->$1.literal = &dst->literals[opline->$1.constant];
+                    }
+                ')
+                UNION_znode_op_literal(op1)
+                UNION_znode_op_literal(op2)
+                popdef(`UNION_znode_op_literal')
+#endif
+
                 switch (opline->opcode) {
 #ifdef ZEND_GOTO
@@ -700 +739 @@
             }
         }
-#endif
         if (gc_arg_info || gc_opcodes) {
             xc_gc_op_array_t gc_op_array;
@@ -707 +745 @@
             gc_op_array.arg_info = gc_arg_info ? dst->arg_info : NULL;
 #endif
-            gc_op_array.last     = gc_opcodes > 1 ? dst->last : 0;
             gc_op_array.opcodes  = gc_opcodes ? dst->opcodes : NULL;
             xc_gc_add_op_array(&gc_op_array TSRMLS_CC);
@@ -771 +808 @@
     IFSTORE(`dst->refcount[0] = 1;')
 
+#ifdef ZEND_ENGINE_2_4
+    dnl before copying opcodes
+    DISPATCH(int, last_literal)
+    STRUCT_ARRAY(last_literal, zend_literal, literals)
+#endif
+
     pushdef(`AFTER_ALLOC', `IFCOPY(`
 #ifndef NDEBUG
@@ -857 +900 @@
 #endif
 #ifdef ZEND_ENGINE_2_4
-    DISPATCH(int, last_literal)
-    IFRESTORE(`COPY(literals)', `STRUCT_ARRAY(last_literal, zend_literal, literals)')
-
     COPYNULL(run_time_cache)
     COPYNULL(last_cache_slot)

trunk/utils.c

@@ -19 +19 @@
 #endif
 
-#define OP_ZVAL_DTOR(op) do { \
-    Z_UNSET_ISREF(Z_OP_CONSTANT(op)); \
-    zval_dtor(&Z_OP_CONSTANT(op)); \
-} while(0)
+#ifdef ZEND_ENGINE_2_4
+#   define OP_ZVAL_DTOR(op) do { } while(0)
+#else
+#   define OP_ZVAL_DTOR(op) do { \
+        Z_UNSET_ISREF(Z_OP_CONSTANT(op)); \
+        zval_dtor(&Z_OP_CONSTANT(op)); \
+    } while(0)
+#endif
 xc_compile_result_t *xc_compile_result_init(xc_compile_result_t *cr, /* {{{ */
         zend_op_array *op_array,
@@ -130 +134 @@
 }
 /* }}} */
-
 int xc_undo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {
     zend_op *opline, *end;
 
-#ifndef ZEND_ENGINE_2_4
+#ifdef ZEND_ENGINE_2_4
+    if (!(op_array->fn_flags & ZEND_ACC_DONE_PASS_TWO)) {
+        return 0;
+    }
+#else
     if (!op_array->done_pass_two) {
         return 0;
@@ -144 +151 @@
     end = opline + op_array->last;
     while (opline < end) {
+#ifdef ZEND_ENGINE_2_4
+        if (opline->op1_type == IS_CONST) {
+            opline->op1.constant = opline->op1.literal - op_array->literals;
+        }
+        if (opline->op2_type == IS_CONST) {
+            opline->op2.constant = opline->op2.literal - op_array->literals;
+        }
+#endif
+
 #ifdef ZEND_ENGINE_2_1
         switch (opline->opcode) {
@@ -167 +183 @@
         opline++;
     }
-#ifndef ZEND_ENGINE_2_4
+#ifdef ZEND_ENGINE_2_4
+    op_array->fn_flags &= ~ZEND_ACC_DONE_PASS_TWO;
+#else
     op_array->done_pass_two = 0;
 #endif
@@ -177 +195 @@
 {
     zend_op *opline, *end;
-
-#ifndef ZEND_ENGINE_2_4
+#ifdef ZEND_ENGINE_2_4
+    zend_literal *literal = op_array->literals;
+#endif
+
+#ifdef ZEND_ENGINE_2_4
+    if ((op_array->fn_flags & ZEND_ACC_DONE_PASS_TWO)) {
+        return 0;
+    }
+#else
     if (op_array->done_pass_two) {
         return 0;
@@ -188 +213 @@
     op_array->size = op_array->last;
     */
+#ifdef ZEND_ENGINE_2_4
+    if (literal) {
+        zend_literal *end = literal + op_array->last_literal;
+        while (literal < end) {
+            Z_SET_ISREF(literal->constant);
+            Z_SET_REFCOUNT(literal->constant, 2); /* Make sure is_ref won't be reset */
+            literal++;
+        }
+    }
+#endif
 
     opline = op_array->opcodes;
     end = opline + op_array->last;
     while (opline < end) {
+#ifndef ZEND_ENGINE_2_4
         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) {
@@ -201 +236 @@
             Z_SET_REFCOUNT(Z_OP_CONSTANT(opline->op2), 2);
         }
+#endif
 #ifdef ZEND_ENGINE_2_1
         switch (opline->opcode) {
@@ -226 +262 @@
     }
 
-#ifndef ZEND_ENGINE_2_4
+#ifdef ZEND_ENGINE_2_4
+    op_array->fn_flags |= ZEND_ACC_DONE_PASS_TWO;
+#else
     op_array->done_pass_two = 1;
 #endif

trunk/xcache.h

@@ -22 +22 @@
 
 #define HAVE_INODE
-#if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION >= 99 || PHP_MAJOR_VERSION > 5)
+#if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4 || PHP_MAJOR_VERSION > 5)
 #   define ZEND_ENGINE_2_4
 #endif
@@ -450 +450 @@
     zend_arg_info *arg_info;
 #endif
-    zend_uint last;
     zend_op *opcodes;
 } xc_gc_op_array_t;