Changeset 662 for trunk/processor/processor.m4

Timestamp:

2009-08-03T10:15:53+02:00 (4 years ago)

Author:

moo

Message:

back patch __FILE and __DIR on cache restore

File:

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

trunk/processor/processor.m4

@@ -339 +339 @@
         if (src->num_interfaces) {
             /*
+            int i;
             zval *arr;
             ALLOC_INIT_ZVAL(arr);
@@ -499 +500 @@
 DEF_STRUCT_P_FUNC(`zend_op_array', , `dnl {{{
     IFRESTORE(`
+    const xc_op_array_info_t *op_array_info = &processor->active_op_array_infos_src[processor->active_op_array_index];
     dnl shadow copy must NOT meet:
     dnl readonly_protection=on
     dnl main op_array && have early binding
-    zend_uint ii;
 #ifdef ZEND_COMPILE_DELAYED_BINDING
     zend_bool need_early_binding = 0;
@@ -508 +509 @@
     zend_bool need_early_binding = processor->php_src->have_early_binding;
 #endif
-    if (!processor->readonly_protection && !(src == processor->php_src->op_array && need_early_binding)) {
+    zend_bool shallow_copy = !processor->readonly_protection && !(src == processor->php_src->op_array && need_early_binding);
+    if (shallow_copy) {
+        zend_bool gc_arg_info = 0;
+        int gc_opcodes        = 0;
         /* really fast shallow copy */
         memcpy(dst, src, sizeof(src[0]));
@@ -515 +519 @@
         STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
 #ifdef ZEND_ENGINE_2
-        STRUCT_ARRAY_I(num_args, zend_arg_info, arg_info)
-        xc_gc_add_op_array(dst TSRMLS_CC);
-#endif
+        STRUCT_ARRAY(num_args, zend_arg_info, arg_info)
+        gc_arg_info = 1;
+#endif
+        if (op_array_info->oplineinfo_cnt) {
+            gc_opcodes = 1;
+            COPY_N_EX(last, zend_op, opcodes)
+        }
+        if (gc_arg_info || gc_opcodes) {
+            xc_gc_op_array_t gc_op_array;
+#ifdef ZEND_ENGINE_2
+            gc_op_array.num_args = gc_arg_info ? dst->num_args : 0;
+            gc_op_array.arg_info = gc_arg_info ? dst->arg_info : NULL;
+#endif
+            gc_op_array.last     = gc_opcodes > 1 ? dst->last : 0;
+            gc_op_array.opcodes  = gc_opcodes ? dst->opcodes : NULL;
+            xc_gc_add_op_array(&gc_op_array TSRMLS_CC);
+        }
         define(`SKIPASSERT_ONCE')
     }
@@ -524 +542 @@
     do {
     dnl RESTORE is done above!
-    zend_uint ii;
-    int i;
 
     /* Common elements */
@@ -532 +548 @@
 #ifdef ZEND_ENGINE_2
     DISPATCH(zend_uint, fn_flags)
-    STRUCT_ARRAY_I(num_args, zend_arg_info, arg_info)
+    STRUCT_ARRAY(num_args, zend_arg_info, arg_info)
     DISPATCH(zend_uint, num_args)
     DISPATCH(zend_uint, required_num_args)
@@ -541 +557 @@
         IFCOPY(`memcpy(dst->arg_types, src->arg_types, sizeof(src->arg_types[0]) * (src->arg_types[0]+1));')
         IFDASM(`do {
-            zend_uint ii;
             int i;
             zval *zv;
@@ -581 +596 @@
         processor->active_opcodes_src = src->opcodes;
     ')')
-    STRUCT_ARRAY_I(last, zend_op, opcodes)
+    STRUCT_ARRAY(last, zend_op, opcodes)
     popdef(`AFTER_ALLOC')
     DISPATCH(zend_uint, last)
@@ -599 +614 @@
     DISPATCH(zend_uint, T)
 
-    STRUCT_ARRAY_I(last_brk_cont, zend_brk_cont_element, brk_cont_array)
+    STRUCT_ARRAY(last_brk_cont, zend_brk_cont_element, brk_cont_array)
     DISPATCH(zend_uint, last_brk_cont)
     DISPATCH(zend_uint, current_brk_cont)
@@ -649 +664 @@
 #endif
     } while (0);
+    IFRESTORE(`xc_fix_op_array_info(processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);')
 
 #ifdef ZEND_ENGINE_2
@@ -713 +729 @@
 dnl }}}
 #endif
+DEF_STRUCT_P_FUNC(`xc_op_array_info_t', , `dnl {{{
+    DISPATCH(zend_uint, oplineinfo_cnt)
+    DISPATCH_ARRAY(oplineinfo_cnt, int, oplineinfos)
+')
+dnl }}}
 DEF_STRUCT_P_FUNC(`xc_funcinfo_t', , `dnl {{{
     DISPATCH(zend_uint, key_size)
@@ -722 +743 @@
     ')
     DISPATCH(ulong, h)
+    IFRESTORE(`COPY(op_array_info)', `
+        STRUCT(xc_op_array_info_t, op_array_info)
+    ')
+    IFRESTORE(`
+        processor->active_op_array_infos_src = &dst->op_array_info;
+        processor->active_op_array_index = 0;
+    ')
     STRUCT(zend_function, func)
 ')
@@ -734 +762 @@
     ')
     DISPATCH(ulong, h)
+    DISPATCH(zend_uint, methodinfo_cnt)
+    IFRESTORE(`COPY(methodinfos)', `
+        STRUCT_ARRAY(methodinfo_cnt, xc_op_array_info_t, methodinfos)
+    ')
+    IFRESTORE(`
+        processor->active_op_array_infos_src = dst->methodinfos;
+        processor->active_op_array_index = 0;
+    ')
 #ifdef ZEND_ENGINE_2
     STRUCT_P(zend_class_entry, cest)
@@ -767 +803 @@
 #endif
 DEF_STRUCT_P_FUNC(`xc_entry_data_php_t', , `dnl {{{
-    zend_uint i;
-
     IFCOPY(`
         processor->php_dst = dst;
@@ -785 +819 @@
     DISPATCH(size_t, size)
 
+    DISPATCH(int, filepath_len)
+    IFRESTORE(`COPY(filepath)', `PROC_STRING_L(filepath, filepath_len)')
+    DISPATCH(int, dirpath_len)
+    IFRESTORE(`COPY(dirpath)', `PROC_STRING_L(dirpath, dirpath_len)')
+#ifdef IS_UNICODE
+    DISPATCH(int, ufilepath_len)
+    IFRESTORE(`COPY(ufilepath)', `PROC_USTRING_L(ufilepath, ufilepath_len)')
+    DISPATCH(int, udirpath_len)
+    IFRESTORE(`COPY(udirpath)', `PROC_USTRING_L(udirpath, udirpath_len)')
+#endif
+
+    IFRESTORE(`COPY(op_array_info)', `
+        STRUCT(xc_op_array_info_t, op_array_info)
+    ')
+    IFRESTORE(`
+        processor->active_op_array_infos_src = &dst->op_array_info;
+        processor->active_op_array_index = 0;
+    ')
     STRUCT_P(zend_op_array, op_array)
 
@@ -796 +848 @@
 
     DISPATCH(zend_uint, classinfo_cnt)
-    pushdef(`BEFORE_LOOP', `
-        IFCOPY(`
-            processor->active_class_num = i + 1;
-        ')
-    ')
-    STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos)
-    popdef(`BEFORE_LOOP')
+    STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index'))
 #ifdef ZEND_ENGINE_2_1
     DISPATCH(zend_uint, autoglobal_cnt)
@@ -879 +925 @@
         switch (src->type) {
         case XC_TYPE_PHP:
-            IFCALCCOPY(`DONE(data.php)', `STRUCT_P(xc_entry_data_php_t, data.php)')
+            IFCALCCOPY(`COPY(data.php)', `STRUCT_P(xc_entry_data_php_t, data.php)')
             break;