Changeset 657

Timestamp:

2009-07-31T14:43:19+02:00 (4 years ago)

Author:

moo

Message:

compile against PHP 4

File:

• trunk/optimizer.c (modified) (14 diffs)

trunk/optimizer.c

@@ -36 +36 @@
 
     bbid_t     fall;
+#ifdef ZEND_ENGINE_2
     bbid_t     catch;
+#endif
 
     int        opnum; /* opnum after joining basic block */
@@ -133 +135 @@
     /* break=will fall */
     switch (opline->opcode) {
+#ifdef ZEND_HANDLE_EXCEPTION
     case ZEND_HANDLE_EXCEPTION:
+#endif
     case ZEND_RETURN:
     case ZEND_EXIT:
@@ -253 +257 @@
 
     bb->fall       = BBID_INVALID;
+#ifdef ZEND_ENGINE_2
     bb->catch      = BBID_INVALID;
+#endif
 
     if (opcodes) {
@@ -284 +290 @@
     op_flowinfo_t fi;
     zend_op *last = bb->opcodes + bb->count - 1;
+    bbid_t catchbbid;
+#ifdef ZEND_ENGINE_2
+    catchbbid = BBID_INVALID;
+#else
+    catchbbid = bb->catch;
+#endif
 
     op_get_flowinfo(&fi, last);
@@ -293 +305 @@
             , bb->id, bb->count, bb->alloc ? -1 : line
             , bb->used ? 'U' : ' ', bb->alloc ? 'A' : ' '
-            , fi.jmpout_op1, fi.jmpout_op2, fi.jmpout_ext, bb->fall, bb->catch, xc_get_opcode(last->opcode)
+            , fi.jmpout_op1, fi.jmpout_op2, fi.jmpout_ext, bb->fall, catchbbid, xc_get_opcode(last->opcode)
             );
     op_print(line, bb->opcodes, last + 1);
@@ -354 +366 @@
     ALLOCA_FLAG(use_heap_markbbhead)
     bbid_t *bbids          = my_do_alloca(count * sizeof(bbid_t),    use_heap_bbids);
+#ifdef ZEND_ENGINE_2
     bbid_t *catchbbids     = my_do_alloca(count * sizeof(bbid_t),    use_heap_catchbbids);
+#endif
     zend_bool *markbbhead  = my_do_alloca(count * sizeof(zend_bool), use_heap_markbbhead);
 
@@ -377 +391 @@
         }
     }
+#ifdef ZEND_ENGINE_2
     /* mark try start */
     for (i = 0; i < op_array->last_try_catch; i ++) {
         markbbhead[op_array->try_catch_array[i].try_op] = 1;
     }
+#endif
     /* }}} */
     /* {{{ fill op lines with newly allocated id */
@@ -396 +412 @@
     }
     /* }}} */
+#ifdef ZEND_ENGINE_2
     /* {{{ fill op lines with catch id */
     for (i = 0; i < count; i ++) {
@@ -414 +431 @@
 #endif
     /* }}} */
+#endif
     /* {{{ create basic blocks */
     start = 0;
@@ -425 +443 @@
         opline = op_array->opcodes + start;
         pbb = bbs_new_bb_ex(bbs, opline, i - start);
+#ifdef ZEND_ENGINE_2
         pbb->catch = catchbbids[start];
+#endif
 
         /* last */
@@ -457 +477 @@
 
     my_free_alloca(markbbhead, use_heap_markbbhead);
+#ifdef ZEND_ENGINE_2
     my_free_alloca(catchbbids, use_heap_catchbbids);
+#endif
     my_free_alloca(bbids,      use_heap_bbids);
     return SUCCESS;
@@ -465 +487 @@
 {
     int i;
+#ifdef ZEND_ENGINE_2
     bbid_t lasttrybbid;
     bbid_t lastcatchbbid;
+#endif
 
     for (i = 0; i < bbs_count(bbs); i ++) {
@@ -489 +513 @@
     }
 
+#ifdef ZEND_ENGINE_2
     lasttrybbid   = BBID_INVALID;
     lastcatchbbid = BBID_INVALID;
@@ -508 +533 @@
     }
     /* it is impossible to have last bb catched */
+#endif
 }
 /* }}} */