php-src/Zend
Dmitry Stogov 2ae21abdf7 Fixed bug #72213 (Finally leaks on nested exceptions).
Squashed commit of the following:

commit 8461b0407f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed May 25 00:34:42 2016 +0300

    Rmoved zend_try_catch_element.parent and walk through op_array.try_catch_array backward from the current try_cacth_offset.

commit 0c71e24964
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed May 25 00:04:53 2016 +0300

    Move SAVE_OPLINE() to its original place

commit 111432a4df
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed May 25 00:01:10 2016 +0300

    Separate the common part of ZEND_HANDLE_EXCEPTION and FAST_RET into zend_dispatch_try_catch_finally_helper.

commit 4f21c06c2e
Author: Nikita Popov <nikic@php.net>
Date:   Tue May 24 14:55:27 2016 +0200

    Improve finally fix

commit da5c727499
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue May 24 10:36:08 2016 +0300

    Fixed Zend/tests/try/bug70228_3.phpt and Zend/tests/try/bug70228_4.phpt

commit cfcedf2fb4
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue May 24 02:59:27 2016 +0300

    Added test

commit 4c6aa93d43
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue May 24 00:38:20 2016 +0300

    Added tests

commit 8a8f4704b0
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon May 23 23:27:34 2016 +0300

    Fixed bug #72213 (Finally leaks on nested exceptions)
2016-05-25 01:25:12 +03:00
..
RFCs
tests Fixed bug #72213 (Finally leaks on nested exceptions). 2016-05-25 01:25:12 +03:00
acinclude.m4
bench.php
build.mk
buildconf
configure.in Prefer isfinite to finite 2015-05-18 10:44:42 +08:00
header
LICENSE
Makefile.am Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc(). 2015-04-16 14:45:08 +03:00
Makefile.frag
micro_bench.php
OBJECTS2_HOWTO
README.ZEND_MM
README.ZEND_VM
zend.c Intern some known (and offten used) strings. 2016-05-12 13:47:22 +03:00
zend.h Remove some dead defines 2016-03-26 22:45:23 +01:00
zend.ico
Zend.m4 Support for XLC compiler 2015-08-10 19:12:11 +03:00
zend_alloc.c Move builtin_ctzl portability into zend_bitset.h 2016-05-17 22:23:43 +02:00
zend_alloc.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_alloc_sizes.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_API.c Fixed white-spaces 2016-05-24 12:37:20 +03:00
zend_API.h Forbid dynamic calls to scope introspection functions 2016-05-24 20:48:24 +02:00
zend_arena.h Fixed bug (Low probability segfault in zend_arena) 2016-02-09 12:20:11 +08:00
zend_ast.c Allow for [] = $array; (alias for list()) 2016-05-20 01:51:05 +02:00
zend_ast.h Allow for [] = $array; (alias for list()) 2016-05-20 01:51:05 +02:00
zend_bitset.h Move builtin_ctzl portability into zend_bitset.h 2016-05-17 22:23:43 +02:00
zend_build.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_builtin_functions.c Forbid dynamic calls to scope introspection functions 2016-05-24 20:48:24 +02:00
zend_builtin_functions.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
ZEND_CHANGES
zend_closures.c Intern some known (and offten used) strings. 2016-05-12 13:47:22 +03:00
zend_closures.h Merge branch 'PHP-7.0' 2016-01-02 17:56:54 +08:00
zend_compile.c Fixed bug #72213 (Finally leaks on nested exceptions). 2016-05-25 01:25:12 +03:00
zend_compile.h Fixed bug #72213 (Finally leaks on nested exceptions). 2016-05-25 01:25:12 +03:00
zend_config.nw.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_config.w32.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_constants.c Revert "Refactor zval cleanup into single function" 2016-05-06 10:47:58 +03:00
zend_constants.h Merge branch 'PHP-7.0' 2016-01-02 17:56:54 +08:00
zend_default_classes.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_dtrace.c Superfluous semicolon 2015-12-24 10:41:05 +08:00
zend_dtrace.d
zend_dtrace.h Fixed phpdbg build broken when dtrace enabled 2015-04-07 23:04:34 +08:00
zend_errors.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_exceptions.c Intern some known (and offten used) strings. 2016-05-12 13:47:22 +03:00
zend_exceptions.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_execute.c Forbid dynamic calls to scope introspection functions 2016-05-24 20:48:24 +02:00
zend_execute.h Eliminated checks for (func->op_array.fn_flags & ZEND_ACC_GENERATOR) in fast path of DO_FCALL* handlers. 2016-05-13 01:40:15 +03:00
zend_execute_API.c Forbid dynamic calls to scope introspection functions 2016-05-24 20:48:24 +02:00
zend_extensions.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_extensions.h change fcall and statement handlers to accept frame 2016-05-04 09:28:13 +01:00
zend_float.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_float.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_gc.c Reimplemented Bob's commit bac6fdb0c5 without insignificant renaming and white-space changes 2016-05-06 10:47:58 +03:00
zend_gc.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_generators.c Eliminated checks for (func->op_array.fn_flags & ZEND_ACC_GENERATOR) in fast path of DO_FCALL* handlers. 2016-05-13 01:40:15 +03:00
zend_generators.h Eliminated checks for (func->op_array.fn_flags & ZEND_ACC_GENERATOR) in fast path of DO_FCALL* handlers. 2016-05-13 01:40:15 +03:00
zend_globals.h Eliminated checks for (func->op_array.fn_flags & ZEND_ACC_GENERATOR) in fast path of DO_FCALL* handlers. 2016-05-13 01:40:15 +03:00
zend_globals_macros.h Remove some dead defines 2016-03-26 22:45:23 +01:00
zend_hash.c Don't HT_ASSERT rc=1 in zend_hash_apply functions 2016-05-10 12:14:08 +02:00
zend_hash.h Fixed typo 2016-05-18 11:29:02 +03:00
zend_highlight.c Fixed bug #71806 2016-03-11 22:45:38 +01:00
zend_highlight.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_inheritance.c Merge branch 'nullable_types' of github.com:morrisonlevi/php-src 2016-05-23 10:14:26 +03:00
zend_inheritance.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_ini.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_ini.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_ini_parser.y Revert "Refactor zval cleanup into single function" 2016-05-06 10:47:58 +03:00
zend_ini_scanner.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_ini_scanner.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_ini_scanner.l bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_ini_scanner_defs.h Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l) 2015-10-20 13:20:56 +08:00
zend_interfaces.c Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used. 2016-04-27 13:46:38 +03:00
zend_interfaces.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_istdiostream.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_iterators.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_iterators.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_language_parser.y Merge branch 'nullable_types' of github.com:morrisonlevi/php-src 2016-05-23 10:14:26 +03:00
zend_language_scanner.c Check in generated lexer 2016-05-14 04:31:39 +00:00
zend_language_scanner.h Drop dup declare with inconsistent linkage 2016-05-02 11:56:28 +02:00
zend_language_scanner.l Raise compiler warning on octal overflow 2016-05-14 00:20:32 +00:00
zend_language_scanner_defs.h Eliminated checks for (func->op_array.fn_flags & ZEND_ACC_GENERATOR) in fast path of DO_FCALL* handlers. 2016-05-13 01:40:15 +03:00
zend_list.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_list.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_llist.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_llist.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_long.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_modules.h Bump API numbers 2016-03-03 17:02:51 +01:00
zend_multibyte.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_multibyte.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_multiply.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_object_handlers.c Allow empty property names 2016-05-24 18:34:17 +02:00
zend_object_handlers.h This function needs to be exported for extensions that implement complex zend objects 2016-04-30 06:48:47 +01:00
zend_objects.c Fixed bug #72177 (Scope issue in __destruct after ReflectionProperty::setValue()) 2016-05-13 11:55:09 +03:00
zend_objects.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_objects_API.c Fixed Bug #71859 (zend_objects_store_call_destructors operates on realloced memory, crashing) 2016-03-20 04:52:57 -07:00
zend_objects_API.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_opcode.c Fixed bug #72213 (Finally leaks on nested exceptions). 2016-05-25 01:25:12 +03:00
zend_operators.c Intern some known (and offten used) strings. 2016-05-12 13:47:22 +03:00
zend_operators.h Remove IS_VAR_RET_REF flag 2016-04-15 15:32:20 +02:00
zend_portability.h add proper noinline specifier for VC 2016-01-18 18:32:12 +01:00
zend_ptr_stack.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_ptr_stack.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_range_check.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_signal.c fix for --enable-zend-signals and ZTS 2015-09-01 16:51:40 +01:00
zend_signal.h fix for --enable-zend-signals and ZTS 2015-09-01 16:51:40 +01:00
zend_smart_str.c Merge branch 'PHP-7.0' 2016-01-02 17:56:54 +08:00
zend_smart_str.h Merge branch 'PHP-7.0' 2016-01-02 17:56:54 +08:00
zend_smart_str_public.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_sort.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_sort.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_sprintf.c Save one strlen here 2016-02-16 14:00:07 +08:00
zend_stack.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_stack.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_stream.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_stream.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_string.c Intern some known (and offten used) strings. 2016-05-12 13:47:22 +03:00
zend_string.h Intern some known (and offten used) strings. 2016-05-12 13:47:22 +03:00
zend_strtod.c Remove unnecessary strlen check 2016-05-07 22:04:31 -07:00
zend_strtod.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_strtod_int.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_ts_hash.c bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_ts_hash.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_type_info.h Squashed commit of the following: 2016-03-17 22:00:27 +03:00
zend_types.h - get rid of EG(scope). zend_get_executed_scope() should be used instead. 2016-04-28 04:13:34 +03:00
zend_variables.c Reimplemented Bob's commit bac6fdb0c5 without insignificant renaming and white-space changes 2016-05-06 10:47:58 +03:00
zend_variables.h Reimplemented Bob's commit bac6fdb0c5 without insignificant renaming and white-space changes 2016-05-06 10:47:58 +03:00
zend_virtual_cwd.c Merge branch 'PHP-5.6' into PHP-7.0 2016-05-10 20:02:17 +02:00
zend_virtual_cwd.h bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
zend_vm.h Squashed commit of the following: 2016-03-17 22:00:27 +03:00
zend_vm_def.h Fixed bug #72213 (Finally leaks on nested exceptions). 2016-05-25 01:25:12 +03:00
zend_vm_execute.h Fixed bug #72213 (Finally leaks on nested exceptions). 2016-05-25 01:25:12 +03:00
zend_vm_execute.skl Don't initialize EX(call)->symbol_table on each function call. 2016-04-28 15:17:24 +03:00
zend_vm_gen.php Fixed bug #72213 (Finally leaks on nested exceptions). 2016-05-25 01:25:12 +03:00
zend_vm_opcodes.c Fixed bug #72213 (Finally leaks on nested exceptions). 2016-05-25 01:25:12 +03:00
zend_vm_opcodes.h Fixed bug #72213 (Finally leaks on nested exceptions). 2016-05-25 01:25:12 +03:00
ZendCore.dep

ZEND_VM
=======

ZEND_VM architecture allows specializing opcode handlers according to op_type
fields and using different execution methods (call threading, switch threading
and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
code execution (with specialized executor and direct threading execution
method). As in most PHP applications raw execution speed isn't the limiting
factor but system calls and database calls are, your mileage with this patch
will vary.

Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
find opcode handlers and helpers. The typical opcode handler template looks
like this:

ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
{
	<HANDLER'S CODE>
}

<OPCODE-NUMBER> is a opcode number (0, 1, ...)
<OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :)
<OP1_TYPES> & <OP2_TYPES> are masks for allowed operand op_types. Specializer
will generate code only for defined combination of types. You can use any 
combination of the following op_types UNUSED, CONST, VAR, TMP and  CV also
you can use ANY mask to disable specialization according operand's op_type.
<HANDLER'S CODE> is a handler's code itself. For most handlers it stills the
same as in old zend_execute.c, but now it uses macros to access opcode operands
and some internal executor data.

You can see the conformity of new macros to old code in the following list:

EXECUTE_DATA
	execute_data
ZEND_VM_DISPATCH_TO_HANDLER(<OP>)
	return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
ZEND_VM_DISPATCH_TO_HELPER(<NAME>) 
	return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) 
	return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)
ZEND_VM_CONTINUE()
	return 0
ZEND_VM_NEXT_OPCODE()
	NEXT_OPCODE()
ZEND_VM_SET_OPCODE(<TARGET>
	SET_OPCODE(<TARGET>
ZEND_VM_INC_OPCODE()
	INC_OPCOD()
ZEND_VM_RETURN_FROM_EXECUTE_LOOP()
	RETURN_FROM_EXECUTE_LOOP()
ZEND_VM_C_LABEL(<LABEL>):
	<LABEL>:
ZEND_VM_C_GOTO(<LABEL>)
	goto <LABEL>
OP<X>_TYPE
	opline->op<X>.op_type
GET_OP<X>_ZVAL_PTR(<TYPE>)
	get_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
GET_OP<X>_ZVAL_PTR_PTR(<TYPE>)
	get_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
GET_OP<X>_OBJ_ZVAL_PTR(<TYPE>)
	get_obj_zval_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
GET_OP<X>_OBJ_ZVAL_PTR_PTR(<TYPE>)
	get_obj_zval_ptr_ptr(&opline->op<X>, EX(Ts), &free_op<X>, <TYPE>)
IS_OP<X>_TMP_FREE()
	IS_TMP_FREE(free_op<X>)
FREE_OP<X>()
	FREE_OP(free_op<X>)
FREE_OP<X>_IF_VAR()
	FREE_VAR(free_op<X>)
FREE_OP<X>_VAR_PTR()
	FREE_VAR_PTR(free_op<X>)


Executor's helpers can be defined without parameters or with one parameter. 
This is done with the following constructs:

ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>)
{
	<HELPER'S CODE>
}

ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
{
	<HELPER'S CODE>
}

Executor's code is generated by PHP script zend_vm_gen.php it uses zend_vm_def.h
and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and 
zend_vm_execute.h. The first file is a list of opcode definitions. It is 
included from zend_compile.h. The second one is an executor code itself. It is
included from zend_execute.c.

zend_vm_gen.php can produce different kind of executors. You can select 
different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can 
disable opcode specialization using --without-specializer. You can include or
exclude old executor together with specialized one using --without-old-executor.
At last you can debug executor using original zend_vm_def.h or generated file
zend_vm_execute.h. Debugging with original file requires --with-lines
option. By default ZE2 uses the following command to generate executor:

$ php zend_vm_gen.php --with-vm-kind=CALL

Zend Engine II currently includes two executors during the build process, one
is the specialized version and the other is the old one non-specialized with
function handlers. By default Zend Engine II uses the specialized one but you
can switch to the old executor at runtime by calling zend_vm_use_old_executor().