Changeset 344 for eaccelerator/trunk/optimize.c

Timestamp:

06/19/08 18:01:31 (7 months ago)

Author:

bart

Message:

Remove support for all php versions older than php 5.1

Files:

• eaccelerator/trunk/optimize.c (modified) (42 diffs)

eaccelerator/trunk/optimize.c

@@ -197 +197 @@
-        if ((op->op2.op_type == IS_VAR || op->op2.op_type == IS_TMP_VAR) &&
-            !def[VAR_NUM(op->op2.u.var)] && !global[VAR_NUM(op->op2.u.var)]) {
-#ifdef ZEND_ENGINE_2
-          if (op->opcode != ZEND_OP_DATA) {
-            global[VAR_NUM(op->op2.u.var)] = 1;
-          }
-
-
-
-
-
+
-        if (op->opcode == ZEND_DECLARE_INHERITED_CLASS &&
-            !def[VAR_NUM(op->extended_value)] &&
@@ -211 +206 @@
-          global[VAR_NUM(op->extended_value)] = 1;
-        }
-#endif
-        if ((op->result.op_type == IS_VAR &&
-#ifdef ZEND_ENGINE_2
-             (op->opcode == ZEND_RECV || op->opcode == ZEND_RECV_INIT ||
-              (op->result.u.EA.type & EXT_TYPE_UNUSED) == 0)) ||
-#else
-             (op->result.u.EA.type & EXT_TYPE_UNUSED) == 0) ||
-#endif
-            (op->result.op_type == IS_TMP_VAR)) {
-          if (!def[VAR_NUM(op->result.u.var)] && !global[VAR_NUM(op->result.u.var)]) {
@@ -247 +237 @@
-        end--;
-        if (((end->result.op_type == IS_VAR &&
-#ifdef ZEND_ENGINE_2
-             (end->opcode == ZEND_RECV || end->opcode == ZEND_RECV_INIT ||
-              (end->result.u.EA.type & EXT_TYPE_UNUSED) == 0)) ||
-#else
-             (end->result.u.EA.type & EXT_TYPE_UNUSED) == 0) ||
-#endif
-             (end->result.op_type == IS_TMP_VAR)) &&
-            !global[VAR_NUM(end->result.u.var)] && !used[VAR_NUM(end->result.u.var)]) {
@@ -288 +274 @@
-               break;
-             case ZEND_UNSET_VAR:
-#ifndef ZEND_ENGINE_2_1
-/* Pre-PHP 5.1 only */
-             case ZEND_UNSET_DIM_OBJ:
-               end->result.op_type = IS_UNUSED;
-               break;
-#else
-             case ZEND_UNSET_DIM:
-             case ZEND_UNSET_OBJ:
-               end->result.op_type = IS_UNUSED;
-               break;
-#endif
-             case ZEND_RECV:
-             case ZEND_RECV_INIT:
-             /*case ZEND_ADD_ARRAY_ELEMENT:*/
-             case ZEND_INCLUDE_OR_EVAL:
-#ifndef ZEND_ENGINE_2_1
-/* Pre-PHP 5.1 only */
-             case ZEND_JMP_NO_CTOR:
-#else
-             case ZEND_NEW:
-#endif
-             case ZEND_FE_FETCH:
-             case ZEND_PRINT:
-#ifdef ZEND_ENGINE_2
-             case ZEND_INIT_METHOD_CALL:
-             case ZEND_INIT_STATIC_METHOD_CALL:
@@ -318 +291 @@
-             case ZEND_DECLARE_CLASS:
-             case ZEND_DECLARE_INHERITED_CLASS:
-#endif
-              break;
-            default:
@@ -331 +303 @@
-        } else if (end->result.op_type == IS_VAR &&
-                   (end->result.u.EA.type & EXT_TYPE_UNUSED) != 0 &&
-#ifdef ZEND_ENGINE_2
-                   end->opcode != ZEND_RECV && end->opcode != ZEND_RECV_INIT &&
-#endif
-                   used[VAR_NUM(end->result.u.var)]) {
-          end->result.u.EA.type &= ~EXT_TYPE_UNUSED;
-        }
-        if ((end->result.op_type == IS_VAR &&
-#ifdef ZEND_ENGINE_2
-            (end->opcode == ZEND_RECV || end->opcode == ZEND_RECV_INIT ||
-             (end->result.u.EA.type & EXT_TYPE_UNUSED) == 0)) ||
-#else
-            (end->result.u.EA.type & EXT_TYPE_UNUSED) == 0) ||
-#endif
-            (end->result.op_type == IS_TMP_VAR)) {
-          switch (end->opcode) {
@@ -361 +327 @@
-          used[VAR_NUM(end->op2.u.var)] = 1;
-        }
-#ifdef ZEND_ENGINE_2
-        if (end->opcode == ZEND_DECLARE_INHERITED_CLASS) {
-          used[VAR_NUM(end->extended_value)] = 1;
-        }
-#endif
-      }
-      p = p->next;
@@ -1334 +1298 @@
-            }
-            goto jmp_2;
-#ifndef ZEND_ENGINE_2_1
-/* Pre-PHP 5.1 only */
-          case ZEND_JMP_NO_CTOR:
-#else
-          case ZEND_NEW:
-#endif
-          case ZEND_FE_FETCH:
-jmp_2:
@@ -1626 +1585 @@
-}
-
-#ifndef ZEND_ENGINE_2
-#define FETCH_TYPE(op) ((op)->op2.u.fetch_type)
-#else
-#define FETCH_TYPE(op) ((op)->op2.u.EA.type)
-#endif
-
-#define SET_UNDEFINED(op) Ts[VAR_NUM((op).u.var)] = NULL;
-#define SET_DEFINED(op)   Ts[VAR_NUM((op)->result.u.var)] = (op);
@@ -2082 +2036 @@
-    */
-    } else if (
-#ifndef ZEND_ENGINE_2
-               op_array->uses_globals &&
-#endif
-               ((op->opcode == ZEND_FETCH_DIM_R &&
-                op->op1.op_type == IS_VAR &&
@@ -2110 +2061 @@
-                IS_DEFINED(op->op1) &&
-                DEFINED_OP(op->op1)->opcode == ZEND_FETCH_UNSET)) &&
-#ifdef ZEND_ENGINE_2
-                FETCH_TYPE(DEFINED_OP(op->op1)) == ZEND_FETCH_GLOBAL &&
-#else
-                FETCH_TYPE(DEFINED_OP(op->op1)) == ZEND_FETCH_LOCAL &&
-#endif
-                DEFINED_OP(op->op1)->op1.op_type == IS_CONST &&
-                DEFINED_OP(op->op1)->op1.u.constant.type == IS_STRING &&
@@ -2129 +2076 @@
-        SET_DEFINED(x);
-        SET_TO_NOP(op);
-
-
-
-
-
-
-
-
-
+
-    /* FETCH_IS               local("GLOBALS"),$x    ISSET_ISEMPTY_VAR $y(global),res
-       ISSET_ISEMPTY_DIM_OBJ  $x,$y,$res          => NOP
@@ -2159 +2098 @@
-      SET_DEFINED(x);
-      SET_TO_NOP(op);
-#endif
-    } else if (op->opcode == ZEND_FREE &&
-               op->op1.op_type == IS_TMP_VAR &&
@@ -2500 +2438 @@
-          op->opcode == ZEND_POST_INC ||
-          op->opcode == ZEND_POST_DEC ||
-#ifndef ZEND_ENGINE_2_1
-/* Pre-PHP 5.1 only */
-          op->opcode == ZEND_UNSET_DIM_OBJ ||
-#else
-          op->opcode == ZEND_UNSET_DIM ||
-          op->opcode == ZEND_UNSET_OBJ ||
-
-
-
-
-
-
-
+
+
+
-        zend_hash_clean(&assigns);
-        zend_hash_clean(&fetch_dim);
@@ -2534 +2464 @@
-        if ((op->result.u.EA.type & EXT_TYPE_UNUSED) != 0 &&
-            op->op1.op_type == IS_VAR &&
-#ifdef  ZEND_ENGINE_2
-            op->extended_value != ZEND_ASSIGN_DIM &&
-            op->extended_value != ZEND_ASSIGN_OBJ &&
-#endif
-            IS_DEFINED(op->op1)) {
-          zend_op *x = DEFINED_OP(op->op1);
@@ -2642 +2570 @@
-    }
-    if ((op->result.op_type == IS_VAR &&
-#ifdef ZEND_ENGINE_2
-        (op->opcode == ZEND_RECV || op->opcode == ZEND_RECV_INIT ||
-         (op->result.u.EA.type & EXT_TYPE_UNUSED) == 0)) ||
-#else
-        (op->result.u.EA.type & EXT_TYPE_UNUSED) == 0) ||
-#endif
-        (op->result.op_type == IS_TMP_VAR)) {
-      if (op->opcode == ZEND_RECV ||
@@ -2696 +2620 @@
-        BB* p;
-        int remove_brk_cont_array = 1;
-
-
-
-
-
+
+
-        zend_uint innermost_ketchup;
-
@@ -2717 +2638 @@
-                }
-        }
-
-       
+
+    
-        bb[0].start = op;
-        for (line_num=0; line_num < len; op++,line_num++)
-        {
-#ifdef ZEND_ENGINE_2
-                const opcode_dsc* dsc = get_opcode_dsc(op->opcode);
-                if (dsc != NULL)
@@ -2764 +2684 @@
-                        }
-                }
-#endif
-                switch(op->opcode)
-                {
@@ -2784 +2703 @@
-                        case ZEND_JMPZ_EX:
-                        case ZEND_JMPNZ_EX:
-#ifndef ZEND_ENGINE_2_1
-/* Pre-PHP 5.1 only */
-                        case ZEND_JMP_NO_CTOR:
-#else
-                        case ZEND_NEW:
-                        case ZEND_FE_RESET:
-#endif
-                        case ZEND_FE_FETCH:
-                                bb[line_num+1].start = op+1;
@@ -2875 +2789 @@
-                                bb[line_num+1].start = op+1;
-                                break;
-#ifdef ZEND_ENGINE_2
-                        case ZEND_CATCH:
-                                bb[op->extended_value].start = &op_array->opcodes[op->extended_value];
@@ -2895 +2808 @@
-                                }
-                                break;
-#else
-                        case ZEND_INIT_FCALL_BY_NAME:
-                                if (op->op1.op_type == IS_VAR && op->result.op_type == IS_VAR)
-                                {
-                                        overload_var[op->result.u.var] = op->op1.u.var;
-                                        op->result.u.var = op->op1.u.var;
-                                }
-                                break;
-                        case ZEND_DO_FCALL_BY_NAME:
-                                if (op->op1.op_type == IS_VAR && overload_var[op->op1.u.var] >= 0)
-                                {
-                                        op->op1.u.var = overload_var[op->op1.u.var];
-                                }
-                                break;
-#endif
-                        case ZEND_UNSET_VAR:
-#ifndef ZEND_ENGINE_2_1
-/* Pre-PHP 5.1 only */
-                        case ZEND_UNSET_DIM_OBJ:
-                                op->result.op_type = IS_UNUSED;
-                                break;
-#else
-                        case ZEND_UNSET_DIM:
-                                op->result.op_type = IS_UNUSED;
@@ -2923 +2815 @@
-                                op->result.op_type = IS_UNUSED;
-                                break;
-#endif
-                        default:
-                                break;
@@ -2929 +2820 @@
-        }
-
-#ifndef ZEND_ENGINE_2
-        free_alloca(overload_var);
-#endif
-
-        /* Find Lengths of Basic Blocks and build CFG */
-        p = bb;
-        for (line_num=1; line_num < len; line_num++)
-        {
-#ifdef ZEND_ENGINE_2
-                /* Calculate innermost CATCH op */
-                innermost_ketchup = 0;
@@ -2957 +2843 @@
-                        }
-                }
-#endif
-                if (bb[line_num].start != NULL)
-                {
@@ -2967 +2852 @@
-                                case ZEND_JMP:
-                                        p->jmp_1 = &bb[op->op1.u.opline_num];
-#ifdef ZEND_ENGINE_2
-                                        if (op->extended_value == ZEND_BRK || op->extended_value == ZEND_CONT)
-                                        {
@@ -2983 +2867 @@
-                                        }
-#  endif
-#endif
-                                        break;
-                                case ZEND_JMPZNZ:
@@ -2993 +2876 @@
-                                case ZEND_JMPZ_EX:
-                                case ZEND_JMPNZ_EX:
-#ifndef ZEND_ENGINE_2_1
-/* Pre-PHP 5.1 only */
-                                case ZEND_JMP_NO_CTOR:
-#else
-                                case ZEND_NEW:
-                                case ZEND_FE_RESET:
-#endif
-                                case ZEND_FE_FETCH:
-                                        p->jmp_2 = &bb[op->op2.u.opline_num];
@@ -3008 +2886 @@
-                                case ZEND_BRK:
-                                case ZEND_CONT:
-#ifdef ZEND_ENGINE_2
-                                        /* HOESH: The control might flow to the innermost CATCH
-                                         * op if an exception thrown earlier. We can follow to CATCH
@@ -3036 +2913 @@
-                                        }
-                                        p->follow = &bb[line_num];
-#endif
-                                        break;
-                                default:
@@ -3111 +2987 @@
-  }
-
-#ifdef ZEND_ENGINE_2
-        /*
-         * HOESH: Reassign try & catch blocks
@@ -3160 +3035 @@
-                }
-        }
-#endif
-}
-
@@ -3186 +3060 @@
-  zend_uint i;
-  zend_uint n = 0;
-#ifndef ZEND_ENGINE_2
-  int uses_globals = 0;
-#endif
-  int* assigned = do_alloca(op_array->T * sizeof(int));
-  char* reg_pool = do_alloca(op_array->T * sizeof(char));
@@ -3203 +3074 @@
-      zend_op* start = p->start;
-      zend_op* op    = start + p->len;
-#ifdef ZEND_ENGINE_2
-      zend_op* op_data;
-#endif
-
-      for (i = 0; i < op_array->T; i++) {
@@ -3217 +3086 @@
-        --op;
-        /* zend_printf("op=%d\n", op-op_array->opcodes); */
-#ifdef ZEND_ENGINE_2
-        op_data = NULL;
-#else
-        if (op_array->uses_globals &&
-            (op->opcode == ZEND_FETCH_R ||
-             op->opcode == ZEND_FETCH_W ||
-             op->opcode == ZEND_FETCH_RW ||
-             op->opcode == ZEND_FETCH_IS ||
-             op->opcode == ZEND_FETCH_FUNC_ARG ||
-             op->opcode == ZEND_FETCH_UNSET) &&
-             op->op1.op_type == IS_CONST &&
-             op->op1.u.constant.type == IS_STRING &&
-             op->op1.u.constant.value.str.len == (sizeof("GLOBALS")-1) &&
-             memcmp(op->op1.u.constant.value.str.val, "GLOBALS", sizeof("GLOBALS")-1) == 0) {
-          uses_globals = 1;
-        }
-#endif
-        if (op->opcode == ZEND_DO_FCALL_BY_NAME &&
-            op->op1.op_type == IS_CONST) {
@@ -3257 +3110 @@
-          op->op2.u.var = VAR_VAL(assigned[r]);
-        }
-#ifdef ZEND_ENGINE_2
-        if (op->opcode == ZEND_DECLARE_INHERITED_CLASS) {
-          int r = VAR_NUM(op->extended_value);
@@ -3263 +3115 @@
-          op->extended_value = VAR_VAL(assigned[r]);
-        }
-#endif
-        if (op->result.op_type == IS_VAR ||
-            op->result.op_type == IS_TMP_VAR) {
@@ -3270 +3121 @@
-          op->result.u.var = VAR_VAL(assigned[r]);
-          if (op->result.op_type == IS_VAR &&
-#ifdef ZEND_ENGINE_2
-              op->opcode != ZEND_RECV && op->opcode != ZEND_RECV_INIT &&
-#endif
-              ((op->result.u.EA.type & EXT_TYPE_UNUSED) != 0)) {
-            FREE_REG(VAR_NUM(op->result.u.var))
@@ -3295 +3144 @@
-  }
-  op_array->T = n;
-#ifndef ZEND_ENGINE_2
-  if (op_array->uses_globals && !uses_globals) {
-    op_array->uses_globals = 0;
-  }
-#endif
-  free_alloca(used);
-  free_alloca(reg_pool);
@@ -3329 +3173 @@
-
-  TSRMLS_FETCH();
-/*???
-#ifdef ZEND_ENGINE_2
-  return;
-#endif
-*/
-  if (!EAG(compiler) || op_array->type != ZEND_USER_FUNCTION) {
-    return;
@@ -3390 +3229 @@
-    free_alloca(global);
-  }
-#  ifdef ZEND_ENGINE_2_1
-  else {
-    /* build_cfg encountered some nested ZEND_BRK or ZEND_CONT's
@@ -3402 +3240 @@
-    restore_operand_types(op_array);
-  }
-#  endif
-  free_alloca(bb);
-}