Changeset 662 for trunk/processor/head.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/head.m4 (modified) (6 diffs)

trunk/processor/head.m4

@@ -69 +69 @@
     const xc_cache_t          *cache;
     const zend_class_entry *cache_ce;
-    zend_uint cache_class_num;
+    zend_uint cache_class_index;
 
     const zend_op          *active_opcodes_src;
@@ -75 +75 @@
     const zend_class_entry *active_class_entry_src;
     zend_class_entry       *active_class_entry_dst;
-    zend_uint               active_class_num;
+    zend_uint                 active_class_index;
+    zend_uint                 active_op_array_index;
+    const xc_op_array_info_t *active_op_array_infos_src;
 
     zend_bool readonly_protection; /* wheather it's present */
@@ -186 +188 @@
 
     if (processor->cache_ce == ce) {
-        return processor->cache_class_num;
+        return processor->cache_class_index + 1;
     }
     for (i = 0; i < php->classinfo_cnt; i ++) {
@@ -192 +194 @@
         if (ZCEP_REFCOUNT_PTR(ceptr) == ZCEP_REFCOUNT_PTR(ce)) {
             processor->cache_ce = ceptr;
-            processor->cache_class_num = i + 1;
+            processor->cache_class_index = i + 1;
             return i + 1;
         }
@@ -199 +201 @@
     return (zend_ulong) -1;
 }
+define(`xc_get_class_num', `xc_get_class_numNOTDEFINED')
 /* }}} */
 /* {{{ xc_get_class */
@@ -204 +207 @@
 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_num);
+    assert(class_num <= processor->active_class_index + 1);
     return CestToCePtr(processor->php_dst->classinfos[class_num - 1].cest);
 }
 #endif
+define(`xc_get_class', `xc_get_classNOTDEFINED')
 /* }}} */
 #ifdef ZEND_ENGINE_2