Changeset 351 for eaccelerator/trunk/optimize.c

Timestamp:

06/20/08 11:20:22 (7 months ago)

Author:

bart

Message:

Port do_alloca call to PHP 5.3

Files:

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

eaccelerator/trunk/optimize.c

@@ -179 +179 @@
-{
-  BB* p = bb;
+#ifdef ZEND_ENGINE_2_3
+  ALLOCA_FLAG(use_heap)
+#endif
+
-  memset(global, 0, op_array->T * sizeof(char));
-  if (p != NULL && p->next != NULL) {
-    int bb_count = 0;
-
+
+
+
+
+
-#if 0
-    zend_printf("<hr>%s::%s<br>", op_array->filename, op_array->function_name);
@@ -225 +233 @@
-      bb_count++;
-    }
+#ifdef ZEND_ENGINE_2_3
+    free_alloca(def, use_heap);
+#else
-    free_alloca(def);
+#endif
-  }
-  {
+#ifdef ZEND_ENGINE_2_3
+    char *used = do_alloca(op_array->T * sizeof(char), use_heap);
+#else
-    char *used = do_alloca(op_array->T * sizeof(char));
+#endif
-    p = bb;
-    while (p != NULL) {
@@ -333 +349 @@
-      p = p->next;
-    }
+#ifdef ZEND_ENGINE_2_3
+    free_alloca(used, use_heap);
+#else
-    free_alloca(used);
+#endif
-  }
-/*
@@ -1461 +1481 @@
-  } c;
-  int retval;
+#ifdef ZEND_ENGINE_2_3
+  ALLOCA_FLAG(use_heap)
+  char *lookup_name = do_alloca(name_len+1, use_heap);
+#else
-  char *lookup_name = do_alloca(name_len+1);
+#endif
-  memcpy(lookup_name, name, name_len);
-  lookup_name[name_len] = '\0';
@@ -1482 +1507 @@
-    }
-  }
+#ifdef ZEND_ENGINE_2_3
+  free_alloca(lookup_name, use_heap);
+#else
-  free_alloca(lookup_name);
+#endif
-  return retval;
-}
@@ -1600 +1629 @@
-  HashTable fetch_dim;
-
+#ifdef ZEND_ENGINE_2_3
+  ALLOCA_FLAG(use_heap)
+  zend_op** Ts = do_alloca(sizeof(zend_op*)*op_array->T, use_heap);
+#else
-  zend_op** Ts = do_alloca(sizeof(zend_op*)*op_array->T);
+#endif
-  memset(Ts, 0, sizeof(zend_op*)*op_array->T);
-
@@ -2607 +2641 @@
-  zend_hash_destroy(&fetch_dim);
-  zend_hash_destroy(&assigns);
+#ifdef ZEND_ENGINE_2_3
+  free_alloca(Ts, use_heap);
+#else
-  free_alloca(Ts);
+#endif
-}
-
@@ -3060 +3098 @@
-  zend_uint i;
-  zend_uint n = 0;
-
+
+
+
+
+
+
+
+
-  char* reg_pool = do_alloca(op_array->T * sizeof(char));
-  char* used     = do_alloca(op_array->T * sizeof(char));
+#endif
-
-  for (i = 0; i < op_array->T; i++) {
@@ -3144 +3190 @@
-  }
-  op_array->T = n;
+#ifdef ZEND_ENGINE_2_3
+  free_alloca(used, use_heap);
+  free_alloca(reg_pool, use_heap);
+  free_alloca(assigned, use_heap);
+#else
-  free_alloca(used);
-  free_alloca(reg_pool);
-  free_alloca(assigned);
+#endif
-}
-
@@ -3172 +3224 @@
-  BB* bb;
-
+#ifdef ZEND_ENGINE_2_3
+  ALLOCA_FLAG(use_heap)
+#endif
+
-  TSRMLS_FETCH();
-  if (!EAG(compiler) || op_array->type != ZEND_USER_FUNCTION) {
@@ -3178 +3234 @@
-
-  /* Allocate memory for CFG */
-
+
+
+
+
+
+
+
+
-  memset(bb, 0, sizeof(BB)*(op_array->last+1));
-
-  /* Find All Basic Blocks and build CFG */
-  if (build_cfg(op_array, bb)) {
+#ifdef ZEND_ENGINE_2_3
+    char *global = do_alloca(op_array->T * sizeof(char), use_heap);
+#else
-    char *global = do_alloca(op_array->T * sizeof(char));
+#endif
-    if (global == NULL) return;
-
@@ -3227 +3294 @@
-    /* dump_bb(bb, op_array); */
-
+#ifdef ZEND_ENGINE_2_3
+    free_alloca(global, use_heap);
+#else
-    free_alloca(global);
+#endif
-  }
-  else {
@@ -3240 +3311 @@
-    restore_operand_types(op_array);
-  }
-
+
+
+
+
+
-}
-#endif