Deleted Added
full compact
zend.c (5fd2f975) zend.c (5e8133f4)
1/*
2 +----------------------------------------------------------------------+
3 | Zend Engine |
4 +----------------------------------------------------------------------+
5 | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
6 +----------------------------------------------------------------------+
7 | This source file is subject to version 2.00 of the Zend license, |
8 | that is bundled with this package in the file LICENSE, and is |

--- 418 unchanged lines hidden (view full) ---

427 EG(exception_op)[2].opcode = ZEND_HANDLE_EXCEPTION;
428 EG(exception_op)[2].op1_type = IS_UNUSED;
429 EG(exception_op)[2].op2_type = IS_UNUSED;
430 EG(exception_op)[2].result_type = IS_UNUSED;
431 ZEND_VM_SET_OPCODE_HANDLER(EG(exception_op)+2);
432}
433/* }}} */
434
1/*
2 +----------------------------------------------------------------------+
3 | Zend Engine |
4 +----------------------------------------------------------------------+
5 | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
6 +----------------------------------------------------------------------+
7 | This source file is subject to version 2.00 of the Zend license, |
8 | that is bundled with this package in the file LICENSE, and is |

--- 418 unchanged lines hidden (view full) ---

427 EG(exception_op)[2].opcode = ZEND_HANDLE_EXCEPTION;
428 EG(exception_op)[2].op1_type = IS_UNUSED;
429 EG(exception_op)[2].op2_type = IS_UNUSED;
430 EG(exception_op)[2].result_type = IS_UNUSED;
431 ZEND_VM_SET_OPCODE_HANDLER(EG(exception_op)+2);
432}
433/* }}} */
434
435static void zend_init_call_trampoline_op(void) /* {{{ */
436{
437 memset(&EG(call_trampoline_op), 0, sizeof(EG(call_trampoline_op)));
438 EG(call_trampoline_op).opcode = ZEND_CALL_TRAMPOLINE;
439 EG(call_trampoline_op).op1_type = IS_UNUSED;
440 EG(call_trampoline_op).op2_type = IS_UNUSED;
441 EG(call_trampoline_op).result_type = IS_UNUSED;
442 ZEND_VM_SET_OPCODE_HANDLER(&EG(call_trampoline_op));
443}
444/* }}} */
445
435#ifdef ZTS
436static void function_copy_ctor(zval *zv)
437{
438 zend_function *old_func = Z_FUNC_P(zv);
439 Z_FUNC_P(zv) = pemalloc(sizeof(zend_internal_function), 1);
440 memcpy(Z_FUNC_P(zv), old_func, sizeof(zend_internal_function));
441 function_add_ref(Z_FUNC_P(zv));
442}

--- 63 unchanged lines hidden (view full) ---

506static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{{ */
507{
508 ZEND_TSRMLS_CACHE_UPDATE();
509
510 zend_startup_constants();
511 zend_copy_constants(EG(zend_constants), GLOBAL_CONSTANTS_TABLE);
512 zend_init_rsrc_plist();
513 zend_init_exception_op();
446#ifdef ZTS
447static void function_copy_ctor(zval *zv)
448{
449 zend_function *old_func = Z_FUNC_P(zv);
450 Z_FUNC_P(zv) = pemalloc(sizeof(zend_internal_function), 1);
451 memcpy(Z_FUNC_P(zv), old_func, sizeof(zend_internal_function));
452 function_add_ref(Z_FUNC_P(zv));
453}

--- 63 unchanged lines hidden (view full) ---

517static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{{ */
518{
519 ZEND_TSRMLS_CACHE_UPDATE();
520
521 zend_startup_constants();
522 zend_copy_constants(EG(zend_constants), GLOBAL_CONSTANTS_TABLE);
523 zend_init_rsrc_plist();
524 zend_init_exception_op();
525 zend_init_call_trampoline_op();
526 memset(&executor_globals->trampoline, 0, sizeof(zend_op_array));
514 executor_globals->lambda_count = 0;
515 ZVAL_UNDEF(&executor_globals->user_error_handler);
516 ZVAL_UNDEF(&executor_globals->user_exception_handler);
517 executor_globals->in_autoload = NULL;
518 executor_globals->current_execute_data = NULL;
519 executor_globals->current_module = NULL;
520 executor_globals->exit_status = 0;
521#if XPFPA_HAVE_CW

--- 195 unchanged lines hidden (view full) ---

717 zend_interned_strings_init();
718 zend_startup_builtin_functions();
719 zend_register_standard_constants();
720 zend_register_auto_global(zend_string_init("GLOBALS", sizeof("GLOBALS") - 1, 1), 1, php_auto_globals_create_globals);
721
722#ifndef ZTS
723 zend_init_rsrc_plist();
724 zend_init_exception_op();
527 executor_globals->lambda_count = 0;
528 ZVAL_UNDEF(&executor_globals->user_error_handler);
529 ZVAL_UNDEF(&executor_globals->user_exception_handler);
530 executor_globals->in_autoload = NULL;
531 executor_globals->current_execute_data = NULL;
532 executor_globals->current_module = NULL;
533 executor_globals->exit_status = 0;
534#if XPFPA_HAVE_CW

--- 195 unchanged lines hidden (view full) ---

730 zend_interned_strings_init();
731 zend_startup_builtin_functions();
732 zend_register_standard_constants();
733 zend_register_auto_global(zend_string_init("GLOBALS", sizeof("GLOBALS") - 1, 1), 1, php_auto_globals_create_globals);
734
735#ifndef ZTS
736 zend_init_rsrc_plist();
737 zend_init_exception_op();
738 zend_init_call_trampoline_op();
725#endif
726
727 zend_ini_startup();
728
729#ifdef ZTS
730 tsrm_set_new_thread_end_handler(zend_new_thread_end_handler);
731#endif
732

--- 732 unchanged lines hidden ---
739#endif
740
741 zend_ini_startup();
742
743#ifdef ZTS
744 tsrm_set_new_thread_end_handler(zend_new_thread_end_handler);
745#endif
746

--- 732 unchanged lines hidden ---