Changeset 548 for trunk

Timestamp:

03/21/2008 02:36:17 PM (7 months ago)

Author:

moo

Message:

PHP_5_3 support: uses ZEND_COMPILE_IGNORE_INTERNAL_CLASSES and ZEND_COMPILE_DELAYED_BINDING stuffs for PHP_5_3 support finally

Location:

trunk

Files:

• coverager.c (modified) (1 diff)
• processor/processor.m4 (modified) (4 diffs)
• utils.c (modified) (4 diffs)
• utils.h (modified) (1 diff)
• xcache.c (modified) (5 diffs)
• xcache.h (modified) (2 diffs)

trunk/coverager.c

@@ -246 +246 @@
     if (XG(coverager)) {
         xc_coverager_enable(TSRMLS_C);
+#ifdef ZEND_COMPILE_EXTENDED_INFO
+        CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
+#else
         CG(extended_info) = 1;
+#endif
     }
     else {

trunk/processor/processor.m4

@@ -506 +506 @@
     dnl main op_array && have early binding
     zend_uint ii;
-    if (!processor->readonly_protection && !(src == processor->php_src->op_array && processor->php_src->have_early_binding)) {
+#ifdef ZEND_COMPILE_DELAYED_BINDING
+    zend_bool need_early_binding = 0;
+#else
+    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)) {
         /* really fast shallow copy */
         memcpy(dst, src, sizeof(src[0]));
@@ -633 +638 @@
     PROC_ZSTRING_L(, doc_comment, doc_comment_len)
 #endif
+#ifdef ZEND_COMPILE_DELAYED_BINDING
+    DISPATCH(zend_uint, early_binding);
+#endif
 
     /* reserved */
@@ -730 +738 @@
     STRUCT(zend_class_entry, cest)
 #endif
+#ifndef ZEND_COMPILE_DELAYED_BINDING
     DISPATCH(int, oplineno)
+#endif
 ')
 dnl }}}
@@ -807 +817 @@
     ')
 #endif
+#ifndef ZEND_COMPILE_DELAYED_BINDING
     DISPATCH(zend_bool, have_early_binding)
+#endif
     DISPATCH(zend_bool, have_references)
 ')

trunk/utils.c

@@ -500 +500 @@
                     ZESW(&stored_ce_ptr, NULL)
                     );
+#ifndef ZEND_COMPILE_DELAYED_BINDING
         if (oplineno != -1) {
             xc_do_early_binding(CG(active_op_array), CG(class_table), oplineno TSRMLS_CC);
         }
+#endif
     }
     else if (zend_u_hash_quick_add(CG(class_table), type, key, len, h,
@@ -673 +675 @@
 #endif
 
+#ifdef ZEND_COMPILE_IGNORE_INTERNAL_CLASSES
+    sandbox->orig_compiler_options = CG(compiler_options);
+    /* Using ZEND_COMPILE_IGNORE_INTERNAL_CLASSES for ZEND_FETCH_CLASS_RT_NS_CHECK
+     */
+    CG(compiler_options) |= ZEND_COMPILE_IGNORE_INTERNAL_CLASSES | ZEND_COMPILE_DELAYED_BINDING;
+#endif
+
     XG(sandbox) = (void *) sandbox;
     return sandbox;
@@ -728 +737 @@
 
     if (install != XC_InstallNoBinding) {
+#ifdef ZEND_COMPILE_DELAYED_BINDING
+        zend_do_delayed_early_binding(CG(active_op_array) TSRMLS_CC);
+#else
         xc_undo_pass_two(CG(active_op_array) TSRMLS_CC);
         xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC);
         xc_redo_pass_two(CG(active_op_array) TSRMLS_CC);
+#endif
     }
 
@@ -805 +818 @@
     }
 #endif
+
+#ifdef ZEND_COMPILE_IGNORE_INTERNAL_CLASSES
+    CG(compiler_options) = sandbox->orig_compiler_options;
+#endif
+
     if (sandbox->alloc) {
         efree(sandbox);

trunk/utils.h

@@ -105 +105 @@
     xc_compilererror_t *compilererrors;
 #endif
+
+#ifdef ZEND_COMPILE_IGNORE_INTERNAL_CLASSES
+    zend_uint orig_compiler_options;
+#endif
 } xc_sandbox_t;
 

trunk/xcache.c

@@ -720 +720 @@
         new_cest_ptrs[i] =
 #endif
+#ifdef ZEND_COMPILE_DELAYED_BINDING
+        xc_install_class(xce->name.str.val, &ci->cest, -1,
+                UNISW(0, ci->type), ci->key, ci->key_size, ci->h TSRMLS_CC);
+#else
         xc_install_class(xce->name.str.val, &ci->cest, ci->oplineno,
                 UNISW(0, ci->type), ci->key, ci->key_size, ci->h TSRMLS_CC);
+#endif
     }
 
@@ -1043 +1048 @@
 }
 /* }}} */
+#ifndef ZEND_COMPILE_DELAYED_BINDING
 static void xc_cache_early_binding_class_cb(zend_op *opline, int oplineno, void *data TSRMLS_DC) /* {{{ */
 {
@@ -1070 +1076 @@
 }
 /* }}} */
+#endif
 static void xc_free_php(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */
 {
@@ -1238 +1245 @@
     php->compilererror_cnt = ((xc_sandbox_t *) XG(sandbox))->compilererror_cnt;
 #endif
+#ifndef ZEND_COMPILE_DELAYED_BINDING
     /* {{{ find inherited classes that should be early-binding */
     php->have_early_binding = 0;
@@ -1248 +1256 @@
     xc_redo_pass_two(php->op_array TSRMLS_CC);
     /* }}} */
+#endif
 
     return op_array;

trunk/xcache.h

@@ -243 +243 @@
     ulong     h;
     xc_cest_t cest;
+#ifndef ZEND_COMPILE_DELAYED_BINDING
     int       oplineno;
+#endif
 } xc_classinfo_t;
 /* }}} */
@@ -316 +318 @@
     zend_uint classinfo_cnt;
     xc_classinfo_t *classinfos;
+#ifndef ZEND_COMPILE_DELAYED_BINDING
     zend_bool have_early_binding;
+#endif
 
 #ifdef ZEND_ENGINE_2_1