Changeset a7ad7cb in git
- Timestamp:
- 2012-03-22T18:18:05Z (8 years ago)
- Branches:
- 3.0, 3.1, 3.2, master, trunk
- Children:
- 5cafdce
- Parents:
- ade1c47
- Location:
- processor
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
processor/head.m4
r3668644 ra7ad7cb 29 29 define(`SIZEOF_zval_ptr', `sizeof(zval_ptr)') 30 30 define(`COUNTOF_zval_ptr', `1') 31 define(`SIZEOF_zval_ptr_nullable', `sizeof(zval_ptr_nullable)') 32 define(`COUNTOF_zval_ptr_nullable', `1') 31 33 define(`SIZEOF_xc_entry_name_t', `sizeof(xc_entry_name_t)') 32 34 define(`COUNTOF_xc_entry_name_t', `1') … … 49 51 50 52 typedef zval *zval_ptr; 53 typedef zval *zval_ptr_nullable; 51 54 typedef zend_uchar zval_data_type; 52 55 #ifdef IS_UNICODE -
processor/processor.m4
r5daf260 ra7ad7cb 3 3 DECL_STRUCT_P_FUNC(`zval') 4 4 DECL_STRUCT_P_FUNC(`zval_ptr') 5 DECL_STRUCT_P_FUNC(`zval_ptr_nullable') 5 6 DECL_STRUCT_P_FUNC(`zend_op_array') 6 7 DECL_STRUCT_P_FUNC(`zend_class_entry') … … 65 66 dnl }}} 66 67 DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr', `zval_ptr') 68 DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr_nullable', `zval_ptr_nullable') 67 69 DEF_HASH_TABLE_FUNC(`HashTable_zend_function', `zend_function') 68 70 #ifdef ZEND_ENGINE_2 … … 215 217 ') 216 218 dnl }}} 219 DEF_STRUCT_P_FUNC(`zval_ptr_nullable', , `dnl {{{ 220 if (src[0]) { 221 STRUCT_P_EX(zval_ptr, dst, src, `', `', ` ') 222 } 223 else { 224 IFCOPY(`COPYNULL_EX(src[0], src)') 225 } 226 DONE_SIZE(sizeof(zval_ptr_nullable)) 227 ') 228 dnl }}} 217 229 dnl {{{ zend_arg_info 218 230 #ifdef ZEND_ENGINE_2 … … 328 340 #ifdef ZEND_ENGINE_2_4 329 341 DISPATCH(int, default_properties_count) 330 STRUCT_ARRAY(default_properties_count, zval_ptr , default_properties_table)342 STRUCT_ARRAY(default_properties_count, zval_ptr_nullable, default_properties_table) 331 343 DISPATCH(int, default_static_members_count) 332 STRUCT_ARRAY(default_static_members_count, zval_ptr , default_static_members_table)344 STRUCT_ARRAY(default_static_members_count, zval_ptr_nullable, default_static_members_table) 333 345 IFCOPY(`dst->static_members_table = dst->default_static_members_table;') 334 346 DONE(static_members_table) … … 355 367 CALLOC(dst->interfaces, zend_class_entry*, src->num_interfaces) 356 368 DONE(`interfaces') 369 } 370 else { 371 COPYNULL(`interfaces') 372 } 357 373 # ifdef ZEND_ENGINE_2_4 374 if (src->num_traits) { 358 375 CALLOC(dst->traits, zend_class_entry*, src->num_traits) 359 376 DONE(`traits') 360 377 DONE(`trait_aliases') 361 378 DONE(`trait_precedences') 362 # endif363 379 } 364 380 else { 365 COPYNULL(`interfaces')366 # ifdef ZEND_ENGINE_2_4367 381 COPYNULL(`traits') 368 382 COPYNULL(`trait_aliases') 369 383 COPYNULL(`trait_precedences') 384 } 370 385 # endif 371 }372 386 ') 373 387 IFDASM(` … … 386 400 */ 387 401 DONE(`interfaces') 402 } 403 else { 404 COPYNULL(`interfaces') 405 } 388 406 # ifdef ZEND_ENGINE_2_4 407 if (src->num_traits) { 389 408 DONE(`traits') 390 409 DONE(`trait_aliases') 391 410 DONE(`trait_precedences') 392 # endif393 411 } 394 412 else { 395 COPYNULL(`interfaces')396 # ifdef ZEND_ENGINE_2_4397 413 COPYNULL(`traits') 398 414 COPYNULL(`trait_aliases') 399 415 COPYNULL(`trait_precedences') 416 } 400 417 # endif 401 }402 418 ') 403 419 IFRESTORE(`', `
Note: See TracChangeset
for help on using the changeset viewer.