php-src/Zend
Dmitry Stogov ef56cfb991 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26 11:53:03 +04:00
..
RFCs fixed typo and few grammar mistakes 2013-10-17 22:00:40 -04:00
tests Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 2013-12-15 16:55:29 +08: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 Improved ternary operator performance when returning arrays 2011-10-18 19:42:42 +00:00
OBJECTS2_HOWTO
README.ZEND_MM Fixed version numbers. 2012-03-06 18:34:10 +00:00
README.ZEND_VM typo fixes 2013-07-15 00:23:03 -07:00
zend_alloc.c Merge branch 'PHP-5.6' 2013-12-26 11:53:03 +04:00
zend_alloc.h Eliminated the TSRMLS_FETCH() in zend_set_memory_limit() 2013-11-18 01:36:17 +01:00
zend_API.c Merge branch 'PHP-5.6' 2013-12-17 15:10:56 +08:00
zend_API.h Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module() 2013-12-12 20:30:45 +01:00
zend_ast.c Eliminate another TSRMLS_FETCH() in i_zend_is_true() 2013-12-18 07:25:05 +01:00
zend_ast.h Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class). 2013-12-10 14:19:17 +04:00
zend_build.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_builtin_functions.c Merge branch 'PHP-5.5' into PHP-5.6 2013-12-10 16:10:20 +01:00
zend_builtin_functions.h Happy New Year 2013-01-01 16:37:09 +08:00
ZEND_CHANGES less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
zend_closures.c Make use of direct returns in some places 2013-08-31 13:16:50 +02:00
zend_closures.h Fixed bug #61025 (__invoke() visibility not honored) 2013-03-08 10:34:17 +08:00
zend_compile.c Save one char compare 2013-12-17 15:09:52 +08:00
zend_compile.h Fixed bug #65784 (Segfault with finally). 2013-12-13 00:16:08 +08:00
zend_config.nw.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_config.w32.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_constants.c Provide more macros for handling of interned strings 2013-09-13 19:42:10 +02:00
zend_constants.h zend_register_null_constant 2013-04-15 20:47:13 +01:00
zend_default_classes.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_dtrace.c Merge branch 'PHP-5.4' into PHP-5.5 2013-08-23 13:28:59 +02: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 Happy New Year 2013-01-01 16:37:09 +08:00
zend_dynamic_array.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_errors.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_exceptions.c Make message and format arguments const char * to avoid 2013-09-23 13:21:57 +02:00
zend_exceptions.h Make message and format arguments const char * to avoid 2013-09-23 13:21:57 +02:00
zend_execute_API.c Eliminate another TSRMLS_FETCH() in i_zend_is_true() 2013-12-18 07:25:05 +01:00
zend_execute.c Fixed bug #65784 (Segfault with finally). 2013-12-13 00:16:08 +08:00
zend_execute.h Eliminate another TSRMLS_FETCH() in i_zend_is_true() 2013-12-18 07:25:05 +01:00
zend_extensions.c Kill another TSRMLS_FETCH() in the zend extension loading code 2013-12-18 07:59:47 +01:00
zend_extensions.h Fixed ZTS build. Needed to bump API version number. 2013-12-18 16:44:20 +01:00
zend_float.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_float.h Fixed float precision change under Windows x64 2013-04-25 22:44:29 +02:00
zend_gc.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_gc.h Fix spelling and correct typo. 2013-06-10 01:42:27 -07:00
zend_generators.c Merge branch 'PHP-5.5' into PHP-5.6 2013-12-01 13:45:22 +01:00
zend_generators.h Fixed bug #66041: list() fails to unpack yielded ArrayAccess object 2013-11-30 13:08:31 +01:00
zend_globals_macros.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_globals.h Remove now unused function_filenames struct. 2013-11-08 21:32:09 -05:00
zend_hash.c Avoid interned hash key duplication and hash key length recaclulation 2013-11-29 00:57:49 +04:00
zend_hash.h Removed unused "pHashFunction" argument in _zend_hash_init() and family (must be 99% source compatible) 2013-11-28 18:40:46 +04:00
zend_highlight.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_highlight.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_indent.c Kill another TSRMLS_FETCH() in zend_indent() 2013-12-12 22:09:38 +01:00
zend_indent.h Kill another TSRMLS_FETCH() in zend_indent() 2013-12-12 22:09:38 +01:00
zend_ini_parser.y Added XOR support for expressions in INI parser 2013-03-27 21:28:53 +01:00
zend_ini_scanner_defs.h conflict 2013-03-25 12:20:01 +01:00
zend_ini_scanner.c initial move on renaming files and fixing includes 2013-10-17 09:43:52 +02:00
zend_ini_scanner.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_ini_scanner.l Added XOR support for expressions in INI parser 2013-03-27 21:28:53 +01:00
zend_ini.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_ini.h Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang) 2013-02-13 12:22:50 +01:00
zend_interfaces.c Eliminate another TSRMLS_FETCH() in i_zend_is_true() 2013-12-18 07:25:05 +01:00
zend_interfaces.h Add support for non-scalar Iterator keys in foreach 2013-03-12 17:27:31 +01:00
zend_istdiostream.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_iterators.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_iterators.h Add support for non-scalar Iterator keys in foreach 2013-03-12 17:27:31 +01:00
zend_language_parser.y Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function 2013-12-06 05:39:49 +01:00
zend_language_scanner_defs.h Merge branch 'PHP-5.4' into PHP-5.5 2013-12-22 13:07:41 +00:00
zend_language_scanner.c Merge branch 'PHP-5.5' into PHP-5.6 2013-12-22 13:11:20 +00:00
zend_language_scanner.h Merge branch 'PHP-5.4' into PHP-5.5 2013-08-04 16:06:24 -07:00
zend_language_scanner.l initial move on renaming files and fixing includes 2013-10-17 09:43:52 +02:00
zend_list.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_list.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_llist.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_llist.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_modules.h Bump ZEND_MODULE_API_NO due to the TSRMLS change to zend_is_true() 2013-12-22 14:10:59 -08:00
zend_multibyte.c Fix assignment in dummy_encoding_list_parser 2013-10-19 23:25:31 +02:00
zend_multibyte.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_multiply.h Merge branch 'PHP-5.4' into PHP-5.5 2013-04-30 19:36:08 +02:00
zend_object_handlers.c Eliminate another TSRMLS_FETCH() in i_zend_is_true() 2013-12-18 07:25:05 +01:00
zend_object_handlers.h Implement internal operator overloading 2013-06-17 17:48:13 +02:00
zend_objects_API.c Fixed bug #60598 (cli/apache sapi segfault on objects manipulation) 2013-08-30 11:20:24 +08:00
zend_objects_API.h Fixed bug #63882 (zend_std_compare_objects crash on recursion) 2013-01-09 11:30:50 +04:00
zend_objects.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_objects.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_opcode.c Merge branch 'PHP-5.5' into PHP-5.6 2013-12-13 11:37:43 +08:00
zend_operators.c Constant expressions refactoring 2013-11-06 22:21:07 +04:00
zend_operators.h Merge branch 'PHP-5.4' into PHP-5.5 2013-12-11 08:50:53 +01:00
zend_ptr_stack.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_ptr_stack.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_qsort.c Add zend_qsort_r & use it in strtr 2013-01-14 17:24:16 +01:00
zend_qsort.h Add zend_qsort_r & use it in strtr 2013-01-14 17:24:16 +01:00
zend_signal.c Expose zend_signal_handler_unblock() to DSO extensions to allow usage of HANDLE_UNBLOCK_INTERRUPTIONS macro 2011-12-02 12:14:16 +00:00
zend_signal.h Fixed bug #60627 (httpd.worker segfault on startup with php_value) 2012-01-04 08:25:06 +00:00
zend_sprintf.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_stack.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_stack.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_static_allocator.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_static_allocator.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_stream.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_stream.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_string.c Happy New Year 2013-01-01 16:37:09 +08:00
zend_string.h Fix intl build 2013-09-14 01:37:09 +02:00
zend_strtod.c Replace invalid code with a proper #error 2013-12-08 15:49:22 -08:00
zend_strtod.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_ts_hash.c Removed unused "pHashFunction" argument in _zend_hash_init() and family (must be 99% source compatible) 2013-11-28 18:40:46 +04:00
zend_ts_hash.h Removed unused "pHashFunction" argument in _zend_hash_init() and family (must be 99% source compatible) 2013-11-28 18:40:46 +04:00
zend_types.h Add support for non-scalar Iterator keys in foreach 2013-03-12 17:27:31 +01:00
zend_variables.c Constant expressions refactoring 2013-11-06 22:21:07 +04:00
zend_variables.h Happy New Year 2013-01-01 16:37:09 +08:00
zend_virtual_cwd.c removed unnecessary call 2013-10-31 21:38:24 +01:00
zend_virtual_cwd.h applied and fixed the original patch 2013-10-17 10:40:43 +02:00
zend_vm_def.h Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook 2013-12-18 09:32:26 +01:00
zend_vm_execute.h missing, apparently 2013-12-22 13:19:35 +00:00
zend_vm_execute.skl Slight performance improvement 2012-12-05 13:23:37 +04:00
zend_vm_gen.php Merge branch 'PHP-5.5' into PHP-5.6 2013-12-22 13:11:20 +00:00
zend_vm_opcodes.c Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6 2013-12-22 13:17:21 +00:00
zend_vm_opcodes.h opcodes 2013-12-22 13:20:41 +00:00
zend_vm.h Happy New Year 2013-01-01 16:37:09 +08:00
zend.c Merge branch 'PHP-5.6' 2013-12-23 12:01:26 +01:00
Zend.dsp Merge branch 'PHP-5.5' into PHP-5.6 2013-12-22 13:11:20 +00:00
zend.h Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook 2013-12-18 09:32:26 +01:00
zend.ico
Zend.m4 make ZEND_SIGNALS configurable, off by default 2012-02-16 01:51:45 +00:00
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().