Changeset 1321 in svn for trunk/processor/head.m4

Timestamp:

2013-07-15T17:37:57Z (6 years ago)

Author:

Xuefer

Message:

add back PHP_4 code for disassembler

File:

• trunk/processor/head.m4 (modified) (3 diffs)

trunk/processor/head.m4

@@ -248 +248 @@
     }
     for (i = 0; i < php->classinfo_cnt; i ++) {
-        ceptr = php->classinfos[i].class_entry;
-        if (ceptr == ce) {
+        ceptr = CestToCePtr(php->classinfos[i].cest);
+        if (ZCEP_REFCOUNT_PTR(ceptr) == ZCEP_REFCOUNT_PTR(ce)) {
             processor->cache_ce = ceptr;
             processor->cache_class_index = i;
@@ -261 +261 @@
 /* }}} */
 /* {{{ xc_get_class */
+#ifdef ZEND_ENGINE_2
 static zend_class_entry *xc_get_class(xc_processor_t *processor, zend_ulong class_num) {
     /* must be parent or currrent class */
     assert(class_num <= processor->active_class_index + 1);
-    return processor->php_dst->classinfos[class_num - 1].class_entry;
-}
+    return CestToCePtr(processor->php_dst->classinfos[class_num - 1].cest);
+}
+#endif
 define(`xc_get_class', `xc_get_classNOTDEFINED')
 /* }}} */
+#ifdef ZEND_ENGINE_2
 /* fix method on store */
 static void xc_fix_method(xc_processor_t *processor, zend_op_array *dst TSRMLS_DC) /* {{{ */
@@ -342 +345 @@
 }
 /* }}} */
+#endif
 /* {{{ call op_array ctor handler */
 extern zend_bool xc_have_op_array_ctor;