php-src/Zend
Dmitry Stogov f9927a6c97 Merge mainstream 'master' branch into refactoring
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
..
RFCs fixed typo and few grammar mistakes 2013-10-17 22:00:40 -04:00
tests Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
acinclude.m4 Merge branch 'PHP-5.4' into PHP-5.5 2013-10-19 13:27:36 +08:00
bench.php
build.mk
buildconf
configure.in
header
LICENSE
Makefile.am Merge branch 'PHP-5.5' into PHP-5.6 2013-12-22 13:11:20 +00:00
Makefile.frag
micro_bench.php
OBJECTS2_HOWTO
README.ZEND_MM
README.ZEND_VM typo fixes 2013-07-15 00:23:03 -07:00
zend_alloc.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
zend_alloc.h Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
zend_API.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_API.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_ast.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_ast.h Fix bug #66015 by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
zend_build.h Bump year 2014-01-03 11:08:10 +08:00
zend_builtin_functions.c Optimized constant lookup 2014-04-25 00:56:15 +04:00
zend_builtin_functions.h Bump year 2014-01-03 11:08:10 +08:00
ZEND_CHANGES less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
zend_closures.c Convert zval_get_string() into "fast path" macro and "slow path" function 2014-04-21 22:36:01 +04:00
zend_closures.h Refactored data structures to keep zend_object* instead of a whole zval in some places 2014-03-28 02:11:22 +04:00
zend_compile.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_compile.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_config.nw.h Bump year 2014-01-03 11:08:10 +08:00
zend_config.w32.h Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012 2014-01-04 01:41:49 +01:00
zend_constants.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_constants.h Optimized constant lookup 2014-04-25 00:56:15 +04:00
zend_default_classes.c Bump year 2014-01-03 11:08:10 +08:00
zend_dtrace.c Refactored data structures to keep zend_object* instead of a whole zval in some places 2014-03-28 02:11:22 +04:00
zend_dtrace.d
zend_dtrace.h Pass zend_execute_data instead of zend_op_array 2012-12-05 00:45:23 +01:00
zend_dynamic_array.c Bump year 2014-01-03 11:08:10 +08:00
zend_dynamic_array.h Bump year 2014-01-03 11:08:10 +08:00
zend_errors.h Bump year 2014-01-03 11:08:10 +08:00
zend_exceptions.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_exceptions.h Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
zend_execute_API.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_execute.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_execute.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_extensions.c Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
zend_extensions.h Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
zend_float.c Bump year 2014-01-03 11:08:10 +08:00
zend_float.h Bump year 2014-01-03 11:08:10 +08:00
zend_gc.c Cleanup 2014-04-16 01:45:40 +04:00
zend_gc.h Various VM optimizations 2014-04-04 02:52:53 +04:00
zend_generators.c Redesigned zend_execute_data layout now EX(object), EX(scope) and EX(called_scope) arr properties of the current function execution co 2014-04-24 15:53:20 +04:00
zend_generators.h Fixed destruction of objects and iterators on unclean request shutdown and GC (few cases are still unfixed). 2014-04-09 01:50:15 +04:00
zend_globals_macros.h Bump year 2014-01-03 11:08:10 +08:00
zend_globals.h Fix ZTS build 2014-04-09 23:41:16 +02:00
zend_hash.c Reimplement strtr() 2014-04-24 19:14:29 +04:00
zend_hash.h Avoid useless allocations 2014-04-25 11:29:18 +04:00
zend_highlight.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_highlight.h Bump year 2014-01-03 11:08:10 +08:00
zend_indent.c Changed data layout to allow more efficient operations 2014-04-02 14:34:44 +04:00
zend_indent.h Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
zend_ini_parser.y Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_ini_scanner_defs.h Merge branch 'PHP-5.5' into PHP-5.6 2014-03-10 12:18:57 +01:00
zend_ini_scanner.c Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc) 2014-04-03 15:26:23 +04:00
zend_ini_scanner.h Bump year 2014-01-03 11:08:10 +08:00
zend_ini_scanner.l Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc) 2014-04-03 15:26:23 +04:00
zend_ini.c Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
zend_ini.h Allocate zend_strings with correct size 2014-04-23 19:34:51 +02:00
zend_interfaces.c Prevented modification of constant arguments 2014-04-16 21:31:32 +04:00
zend_interfaces.h Refactoring zend_iterator (incompleted) 2014-02-27 19:19:02 +08:00
zend_istdiostream.h Bump year 2014-01-03 11:08:10 +08:00
zend_iterators.c Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
zend_iterators.h Add zend_iterator_dtor 2014-02-28 15:03:43 +08:00
zend_language_parser.y Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_language_scanner_defs.h Merge branch 'PHP-5.5' into PHP-5.6 2014-03-10 12:18:57 +01:00
zend_language_scanner.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_language_scanner.h Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
zend_language_scanner.l Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_list.c Fixed compilation warnings 2014-04-22 17:46:34 +04:00
zend_list.h Introduced API to close all resources at once 2014-04-11 02:21:06 +04:00
zend_llist.c Bump year 2014-01-03 11:08:10 +08:00
zend_llist.h Bump year 2014-01-03 11:08:10 +08:00
zend_modules.h Use better data structures (incomplete) 2014-02-17 17:59:18 +04:00
zend_multibyte.c Refactor mbstring (incompleted) 2014-03-24 12:40:07 +08:00
zend_multibyte.h Bump year 2014-01-03 11:08:10 +08:00
zend_multiply.h Bump year 2014-01-03 11:08:10 +08:00
zend_object_handlers.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_object_handlers.h Moved zend_literal->cache_slot right into zval. 2014-04-17 15:40:45 +04:00
zend_objects_API.c Fixed compilation warnings 2014-04-22 17:46:34 +04:00
zend_objects_API.h Fixed destruction of objects and iterators on unclean request shutdown and GC (few cases are still unfixed). 2014-04-09 01:50:15 +04:00
zend_objects.c Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
zend_objects.h Fixed destruction of objects and iterators on unclean request shutdown and GC (few cases are still unfixed). 2014-04-09 01:50:15 +04:00
zend_opcode.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_operators.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_operators.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_ptr_stack.c Bump year 2014-01-03 11:08:10 +08:00
zend_ptr_stack.h Bump year 2014-01-03 11:08:10 +08:00
zend_qsort.c Bump year 2014-01-03 11:08:10 +08:00
zend_qsort.h Bump year 2014-01-03 11:08:10 +08:00
zend_signal.c
zend_signal.h
zend_sprintf.c Bump year 2014-01-03 11:08:10 +08:00
zend_stack.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
zend_stack.h Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
zend_static_allocator.c Bump year 2014-01-03 11:08:10 +08:00
zend_static_allocator.h Bump year 2014-01-03 11:08:10 +08:00
zend_stream.c Bump year 2014-01-03 11:08:10 +08:00
zend_stream.h Bump year 2014-01-03 11:08:10 +08:00
zend_string.c Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
zend_string.h Allocate zend_strings with correct size 2014-04-23 19:34:51 +02:00
zend_strtod.c Replace invalid code with a proper #error 2013-12-08 15:49:22 -08:00
zend_strtod.h Bump year 2014-01-03 11:08:10 +08:00
zend_ts_hash.c Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
zend_ts_hash.h Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
zend_types.h Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
zend_variables.c Use zval_get_string in print_zval and propagate TSRMLS 2014-04-21 17:55:58 +02:00
zend_variables.h Use zval_get_string in print_zval and propagate TSRMLS 2014-04-21 17:55:58 +02:00
zend_virtual_cwd.c Bump year 2014-01-03 11:08:10 +08:00
zend_virtual_cwd.h Bump year 2014-01-03 11:08:10 +08:00
zend_vm_def.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_vm_execute.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_vm_execute.skl Optimized zend_leave_helper() 2014-04-18 13:46:36 +04:00
zend_vm_gen.php Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend_vm_opcodes.c add T_POW (**) operator 2014-02-06 14:41:21 +01:00
zend_vm_opcodes.h add T_POW (**) operator 2014-02-06 14:41:21 +01:00
zend_vm.h Bump year 2014-01-03 11:08:10 +08:00
zend.c Use appropriate macros 2014-04-25 11:54:10 +04:00
Zend.dsp fix *.dsp files related to bug #50333 2014-01-28 13:09:29 +01:00
zend.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zend.ico
Zend.m4
ZendCore.dep
ZendTS.dsp Merge branch 'PHP-5.5' into PHP-5.6 2013-12-22 13:11:20 +00:00

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().