Changeset 1213 for trunk/processor/processor.m4

Timestamp:

12/19/2012 09:42:53 AM (5 months ago)

Author:

moo

Message:

add support for PHP_5_5

Files:

• trunk/processor/processor.m4 (modified) (5 diffs)

trunk/processor/processor.m4

@@ -49 +49 @@
     PROCESS(zend_uint, try_op)
     PROCESS(zend_uint, catch_op)
+#ifdef ZEND_ENGINE_2_5
+    PROCESS(zend_uint, finally_op)
+    PROCESS(zend_uint, finally_end)
+#endif
 ')
 dnl }}}
@@ -654 +658 @@
 #endif
             case ZEND_JMP:
+#ifdef ZEND_FAST_CALL
+            case ZEND_FAST_CALL:
+#endif
 #ifdef ZEND_ENGINE_2
                 assert(Z_OP(src->op1).jmp_addr >= processor->active_op_array_src->opcodes && Z_OP(src->op1).jmp_addr - processor->active_op_array_src->opcodes < processor->active_op_array_src->last);
@@ -762 +769 @@
 #endif
                     case ZEND_JMP:
+#ifdef ZEND_FAST_CALL
+                    case ZEND_FAST_CALL:
+#endif
 #ifdef ZEND_ENGINE_2
                         Z_OP(opline->op1).jmp_addr = &dst->opcodes[Z_OP(opline->op1).jmp_addr - src->opcodes];
@@ -874 +884 @@
     PROCESS(zend_uint, T)
 
+#ifdef ZEND_ENGINE_2_4
+    PROCESS(zend_uint, nested_calls)
+    PROCESS(zend_uint, used_stack)
+#endif
+
     STRUCT_ARRAY(last_brk_cont_t, last_brk_cont, zend_brk_cont_element, brk_cont_array)
     PROCESS(last_brk_cont_t, last_brk_cont)
@@ -886 +901 @@
     STRUCT_ARRAY(int, last_try_catch, zend_try_catch_element, try_catch_array)
     PROCESS(int, last_try_catch)
+#endif
+#ifdef ZEND_ENGINE_2_5
+    PROCESS(zend_bool, has_finally_block)
 #endif