Changeset 233 in svn for trunk/processor/processor.m4


Ignore:
Timestamp:
2006-10-10T02:46:00+02:00 (9 years ago)
Author:
Xuefer
Message:

processor: apply reference handling on opcode caching. reverted [196] [199] [220] and refix for #36

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r231 r233  
    6767dnl }}}
    6868DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr',           `zval_ptr')
    69 DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr_static_member_check',  `zval_ptr', , `xc_hash_static_member_check(processor, BUCKET TSRMLS_CC)')
    7069#ifdef HAVE_XCACHE_CONSTANT
    7170DEF_HASH_TABLE_FUNC(`HashTable_zend_constant',      `zend_constant')
     
    168167                            dnl fprintf(stderr, "*dst is set to %p\n", dst[0]);
    169168                        ')
     169                        IFCALCSTORE(`processor->have_references = 1;')
    170170                        IFSTORE(`assert(xc_is_shm(dst[0]));')
    171171                        IFRESTORE(`assert(!xc_is_shm(dst[0]));')
     
    300300
    301301    STRUCT(HashTable, default_properties, HashTable_zval_ptr)
    302     IFSTORE(`xc_hash_reset_zval_refcount(&dst->default_properties TSRMLS_CC);')
    303302    IFCOPY(`dst->builtin_functions = src->builtin_functions;')
    304303    DONE(builtin_functions)
     
    306305    STRUCT(HashTable, properties_info, HashTable_zend_property_info)
    307306#   ifdef ZEND_ENGINE_2_1
    308     STRUCT(HashTable, default_static_members, IFCALCSTORE(HashTable_zval_ptr_static_member_check, HashTable_zval_ptr))
     307    STRUCT(HashTable, default_static_members, HashTable_zval_ptr)
    309308    IFCOPY(`dst->static_members = &dst->default_static_members;')
    310     IFRESTORE(`if (dst->parent) xc_fix_static_members(processor, dst TSRMLS_CC);')
    311309    DONE(static_members)
    312310#   else
    313     STRUCT_P(HashTable, static_members, IFCALCSTORE(HashTable_zval_ptr_static_member_check, HashTable_zval_ptr))
     311    STRUCT_P(HashTable, static_members, HashTable_zval_ptr)
    314312#   endif
    315313    STRUCT(HashTable, constants_table, HashTable_zval_ptr)
    316     IFSTORE(`xc_hash_reset_zval_refcount(&dst->constants_table TSRMLS_CC);')
    317314
    318315    dnl runtime binding: ADD_INTERFACE will deal with it
     
    815812    DONE(data)
    816813    dnl }}}
     814    DISPATCH(zend_bool, have_references)
    817815')
    818816dnl }}}
Note: See TracChangeset for help on using the changeset viewer.