Ignore:
Timestamp:
2009-08-03T10:15:53+02:00 (5 years ago)
Author:
moo
Message:

back patch __FILE and __DIR on cache restore

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/head.m4

    r645 r662  
    6969    const xc_cache_t          *cache; 
    7070    const zend_class_entry *cache_ce; 
    71     zend_uint cache_class_num; 
     71    zend_uint cache_class_index; 
    7272 
    7373    const zend_op          *active_opcodes_src; 
     
    7575    const zend_class_entry *active_class_entry_src; 
    7676    zend_class_entry       *active_class_entry_dst; 
    77     zend_uint               active_class_num; 
     77    zend_uint                 active_class_index; 
     78    zend_uint                 active_op_array_index; 
     79    const xc_op_array_info_t *active_op_array_infos_src; 
    7880 
    7981    zend_bool readonly_protection; /* wheather it's present */ 
     
    186188 
    187189    if (processor->cache_ce == ce) { 
    188         return processor->cache_class_num; 
     190        return processor->cache_class_index + 1; 
    189191    } 
    190192    for (i = 0; i < php->classinfo_cnt; i ++) { 
     
    192194        if (ZCEP_REFCOUNT_PTR(ceptr) == ZCEP_REFCOUNT_PTR(ce)) { 
    193195            processor->cache_ce = ceptr; 
    194             processor->cache_class_num = i + 1; 
     196            processor->cache_class_index = i + 1; 
    195197            return i + 1; 
    196198        } 
     
    199201    return (zend_ulong) -1; 
    200202} 
     203define(`xc_get_class_num', `xc_get_class_numNOTDEFINED') 
    201204/* }}} */ 
    202205/* {{{ xc_get_class */ 
     
    204207static zend_class_entry *xc_get_class(xc_processor_t *processor, zend_ulong class_num) { 
    205208    /* must be parent or currrent class */ 
    206     assert(class_num <= processor->active_class_num); 
     209    assert(class_num <= processor->active_class_index + 1); 
    207210    return CestToCePtr(processor->php_dst->classinfos[class_num - 1].cest); 
    208211} 
    209212#endif 
     213define(`xc_get_class', `xc_get_classNOTDEFINED') 
    210214/* }}} */ 
    211215#ifdef ZEND_ENGINE_2 
Note: See TracChangeset for help on using the changeset viewer.