Changeset 322

Timestamp:

05/24/07 18:32:49 (1 year ago)

Author:

bart

Message:

Revert stupid changes left over from debugging

Files:

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

eaccelerator/trunk/optimize.c

@@ -28 +28 @@
-#include "eaccelerator.h"
-
-//
-//
+
+
-
-#include "zend.h"
@@ -46 +46 @@
-  /*
-   * HOESH: To protect merging. Primary
-pp
+bb
-   * ZEND_ENGINE_2 specific, but can take place
-   */
@@ -63 +63 @@
-} BBlink;
-
+#if 0
-static void dump_bb(BB* bb, zend_op_array *op_array) {
-  BB* p = bb;
@@ -68 +69 @@
-  zend_printf("<pre>%s:%s\n", op_array->filename, op_array->function_name);
-  while (p != NULL) {
-<strong>bb%u</strong> start=%u len=%d used=%d protect
+bb%u start=%u len=%d us
-                 (unsigned int)(p-bb),
-                 (unsigned int)(p->start-op_array->opcodes),
-                 p->len,
-
-
+
-    if (p->jmp_1) {
-      zend_printf("    jmp_1 bb%u start=%u  len=%d used=%d\n",
@@ -168 +168 @@
-   zend_printf("<br>\n");
-}
+#endif
-
-#define SET_TO_NOP(op) \
@@ -248 +249 @@
-#ifdef ZEND_ENGINE_2
-             (end->opcode == ZEND_RECV || end->opcode == ZEND_RECV_INIT ||
-
+ 
-#else
-             (end->result.u.EA.type & EXT_TYPE_UNUSED) == 0) ||
-#endif
-             (end->result.op_type == IS_TMP_VAR)) &&
- 
+
-           switch(end->opcode) {
-             case ZEND_JMPZ_EX:
@@ -548 +549 @@
-    p = bb;
-    while (p->next != NULL) {
-(p->next->pred || p->protect_merge)
+p->next->pred
-        p = p->next;
-      } else {
@@ -580 +581 @@
-    p = bb;
-    while (p != NULL) {
- && !p->protect_merge
+
-        del_bb(p->next);
-        p->next = p->next->next;
@@ -2714 +2715 @@
-                        bb[tc_element->catch_op].start = &op_array->opcodes[tc_element->catch_op];
-                        bb[tc_element->catch_op].protect_merge = 1;
-            bb[tc_element->catch_op].used = 1;
-                }
-        }
-    
-    dump_bb(bb, op_array);
-    
-#endif
-        /* Find Starts of Basic Blocks */
@@ -3178 +3175 @@
-#define FREE_REG(R) reg_pool[(R)] = 0;
-
-
+
+
-  zend_uint i;
-  zend_uint n = 0;
@@ -3300 +3298 @@
-}
-
-static 
+
-        zend_op* op = op_array->opcodes;
-        int len = op_array->last;
@@ -3324 +3322 @@
-
-  TSRMLS_FETCH();
-
+
+
+
+
+
-  if (!EAG(compiler) || op_array->type != ZEND_USER_FUNCTION) {
-    return;
@@ -3335 +3337 @@
-  /* Find All Basic Blocks and build CFG */
-  if (build_cfg(op_array, bb)) {
-    dump_bb(bb, op_array);
-    char *global = do_alloca(op_array->T * sizeof(char));
-    if (global == NULL) return;
@@ -3342 +3343 @@
-      /* Determine Used Blocks and its Predcessors */
-      mark_used_bb(bb);
-      dump_bb(bb, op_array);
-
-      /* JMP Optimization */
@@ -3355 +3355 @@
-      }
-
-c
+k
-      p = bb;
-      while (p != NULL) {
@@ -3368 +3368 @@
-    p = bb;
-    while (p->next != NULL) {
- || p->protect_merge
+
-        p = p->next;
-      } else {
@@ -3398 +3398 @@
-  free_alloca(bb);
-}
-//
-//
+
+