php-src/Zend
Xinchen Hui ff6a9d1f10 Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
  Removed recursive call
  Put ZEND_FASTCALL into the proper place.
2018-01-16 14:54:05 +08:00
..
tests Merge branch 'PHP-7.2' 2018-01-15 12:16:16 +01:00
acinclude.m4 Minor fix macro value 2016-12-12 16:27:37 +01:00
bench.php Don't pass useless arguments 2017-10-03 15:24:02 +03:00
build.mk Use modern autotools name of configure.ac instead of configure.in 2017-01-27 06:07:40 +00:00
buildconf
configure.ac cleanup, MEMORY_LIMIT is not used anymore 2017-06-09 08:07:21 +02:00
header
LICENSE
Makefile.am Added ZEND_API zend_cpu_supports 2018-01-16 14:53:00 +08:00
Makefile.frag
micro_bench.php
OBJECTS2_HOWTO
README.ZEND_MM
README.ZEND_VM
zend_alloc_sizes.h year++ 2018-01-02 12:57:58 +08:00
zend_alloc.c Added missing #if to allow compilation withput ZEND_MM_CUSTOM 2018-01-15 17:37:15 +03:00
zend_alloc.h Trailing whitespaces on Zend 2018-01-04 02:41:57 -02:00
zend_API.c cleanup 2018-01-10 12:03:04 +03:00
zend_API.h year++ 2018-01-02 12:57:58 +08:00
zend_arena.h year++ 2018-01-02 12:57:58 +08:00
zend_ast.c Optimize zval_dtor_func() 2018-01-16 00:57:47 +03:00
zend_ast.h Optimize zval_dtor_func() 2018-01-16 00:57:47 +03:00
zend_bitset.h Merge branch 'PHP-7.1' into PHP-7.2 2018-01-03 16:00:34 +08:00
zend_build.h year++ 2018-01-02 12:57:58 +08:00
zend_builtin_functions.c Merge branch 'PHP-7.2' 2018-01-11 13:14:37 +01:00
zend_builtin_functions.h year++ 2018-01-02 12:57:58 +08:00
zend_closures.c Merge branch 'PHP-7.2' 2018-01-15 12:16:16 +01:00
zend_closures.h Use ZEND_CLOSURE_OBJECT() macro to resolve closure op_array to closure object through address calculation, instead of op_array->prototype reuse. (reapply 781e1573af, now it should be OK). 2018-01-11 22:15:45 +03:00
zend_compile.c Fix #75765 Exception on extend of undefined class 2018-01-12 18:41:39 +01:00
zend_compile.h Reorder zend_op_array fields for better data locality and packing 2018-01-11 19:50:27 +03:00
zend_config.nw.h year++ 2018-01-02 12:57:58 +08:00
zend_config.w32.h year++ 2018-01-02 12:57:58 +08:00
zend_constants.c year++ 2018-01-02 12:57:58 +08:00
zend_constants.h year++ 2018-01-02 12:57:58 +08:00
zend_cpuinfo.c Added ZEND_API zend_cpu_supports 2018-01-16 14:53:00 +08:00
zend_default_classes.c year++ 2018-01-02 12:57:58 +08:00
zend_dtrace.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_dtrace.d
zend_dtrace.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_errors.h year++ 2018-01-02 12:57:58 +08:00
zend_exceptions.c year++ 2018-01-02 12:57:58 +08:00
zend_exceptions.h year++ 2018-01-02 12:57:58 +08:00
zend_execute_API.c Use ZEND_CLOSURE_OBJECT() macro to resolve closure op_array to closure object through address calculation, instead of op_array->prototype reuse. (reapply 781e1573af, now it should be OK). 2018-01-11 22:15:45 +03:00
zend_execute.c Use ZEND_CLOSURE_OBJECT() macro to resolve closure op_array to closure object through address calculation, instead of op_array->prototype reuse. (reapply 781e1573af, now it should be OK). 2018-01-11 22:15:45 +03:00
zend_execute.h Manual CSE 2018-01-15 17:36:35 +03:00
zend_extensions.c year++ 2018-01-02 12:57:58 +08:00
zend_extensions.h year++ 2018-01-02 12:57:58 +08:00
zend_float.c year++ 2018-01-02 12:57:58 +08:00
zend_float.h year++ 2018-01-02 12:57:58 +08:00
zend_gc.c year++ 2018-01-02 12:57:58 +08:00
zend_gc.h year++ 2018-01-02 12:57:58 +08:00
zend_generators.c Removed recursive call 2018-01-16 09:44:49 +03:00
zend_generators.h Simplify non-linear generator yield from tree 2018-01-12 21:14:50 +01:00
zend_globals_macros.h year++ 2018-01-02 12:57:58 +08:00
zend_globals.h year++ 2018-01-02 12:57:58 +08:00
zend_hash.c year++ 2018-01-02 12:57:58 +08:00
zend_hash.h Strength reduction 2018-01-10 14:23:43 +03:00
zend_highlight.c year++ 2018-01-02 12:57:58 +08:00
zend_highlight.h year++ 2018-01-02 12:57:58 +08:00
zend_inheritance.c Trailing whitespaces 2018-01-03 14:38:00 +01:00
zend_inheritance.h year++ 2018-01-02 12:57:58 +08:00
zend_ini_parser.y year++ 2018-01-02 12:57:58 +08:00
zend_ini_scanner_defs.h Fix stack management in ini scanner 2016-12-16 20:54:46 +01:00
zend_ini_scanner.c Trailing whitespaces 2018-01-03 14:38:00 +01:00
zend_ini_scanner.h year++ 2018-01-02 12:57:58 +08:00
zend_ini_scanner.l year++ 2018-01-02 12:57:58 +08:00
zend_ini.c year++ 2018-01-02 12:57:58 +08:00
zend_ini.h year++ 2018-01-02 12:57:58 +08:00
zend_interfaces.c year++ 2018-01-02 12:57:58 +08:00
zend_interfaces.h year++ 2018-01-02 12:57:58 +08:00
zend_istdiostream.h year++ 2018-01-02 12:57:58 +08:00
zend_iterators.c year++ 2018-01-02 12:57:58 +08:00
zend_iterators.h year++ 2018-01-02 12:57:58 +08:00
zend_language_parser.y year++ 2018-01-02 12:57:58 +08:00
zend_language_scanner_defs.h
zend_language_scanner.c Trailing whitespaces 2018-01-03 14:38:00 +01:00
zend_language_scanner.h year++ 2018-01-02 12:57:58 +08:00
zend_language_scanner.l year++ 2018-01-02 12:57:58 +08:00
zend_list.c year++ 2018-01-02 12:57:58 +08:00
zend_list.h year++ 2018-01-02 12:57:58 +08:00
zend_llist.c year++ 2018-01-02 12:57:58 +08:00
zend_llist.h year++ 2018-01-02 12:57:58 +08:00
zend_long.h year++ 2018-01-02 12:57:58 +08:00
zend_modules.h year++ 2018-01-02 12:57:58 +08:00
zend_multibyte.c year++ 2018-01-02 12:57:58 +08:00
zend_multibyte.h year++ 2018-01-02 12:57:58 +08:00
zend_multiply.h year++ 2018-01-02 12:57:58 +08:00
zend_object_handlers.c Trailing whitespaces 2018-01-03 14:38:00 +01:00
zend_object_handlers.h year++ 2018-01-02 12:57:58 +08:00
zend_objects_API.c year++ 2018-01-02 12:57:58 +08:00
zend_objects_API.h year++ 2018-01-02 12:57:58 +08:00
zend_objects.c year++ 2018-01-02 12:57:58 +08:00
zend_objects.h year++ 2018-01-02 12:57:58 +08:00
zend_opcode.c Get rid of zend_op_array.early_binding 2018-01-11 19:15:52 +03:00
zend_operators.c Convert "sparse switch" statements into sequences of "if" with the most probable conditions first 2018-01-10 15:12:03 +03:00
zend_operators.h year++ 2018-01-02 12:57:58 +08:00
zend_portability.h year++ 2018-01-02 12:57:58 +08:00
zend_ptr_stack.c year++ 2018-01-02 12:57:58 +08:00
zend_ptr_stack.h year++ 2018-01-02 12:57:58 +08:00
zend_range_check.h year++ 2018-01-02 12:57:58 +08:00
zend_signal.c Trailing whitespaces 2018-01-03 14:38:00 +01:00
zend_signal.h Merge branch 'PHP-7.1' into PHP-7.2 2018-01-03 16:00:34 +08:00
zend_smart_str_public.h year++ 2018-01-02 12:57:58 +08:00
zend_smart_str.c year++ 2018-01-02 12:57:58 +08:00
zend_smart_str.h year++ 2018-01-02 12:57:58 +08:00
zend_smart_string_public.h year++ 2018-01-02 12:57:58 +08:00
zend_smart_string.h year++ 2018-01-02 12:57:58 +08:00
zend_sort.c Trailing whitespaces 2018-01-03 14:38:00 +01:00
zend_sort.h year++ 2018-01-02 12:57:58 +08:00
zend_sprintf.c year++ 2018-01-02 12:57:58 +08:00
zend_stack.c year++ 2018-01-02 12:57:58 +08:00
zend_stack.h year++ 2018-01-02 12:57:58 +08:00
zend_stream.c year++ 2018-01-02 12:57:58 +08:00
zend_stream.h year++ 2018-01-02 12:57:58 +08:00
zend_string.c year++ 2018-01-02 12:57:58 +08:00
zend_string.h year++ 2018-01-02 12:57:58 +08:00
zend_strtod_int.h Trailing whitespaces on Zend 2018-01-04 02:41:57 -02:00
zend_strtod.c Merge branch 'PHP-7.0' into PHP-7.1 2017-07-21 11:16:15 +02:00
zend_strtod.h year++ 2018-01-02 12:57:58 +08:00
zend_ts_hash.c year++ 2018-01-02 12:57:58 +08:00
zend_ts_hash.h year++ 2018-01-02 12:57:58 +08:00
zend_type_info.h year++ 2018-01-02 12:57:58 +08:00
zend_types.h Optimize zval_dtor_func() 2018-01-16 00:57:47 +03:00
zend_variables.c Put ZEND_FASTCALL into the proper place. 2018-01-16 09:44:10 +03:00
zend_variables.h year++ 2018-01-02 12:57:58 +08:00
zend_virtual_cwd.c year++ 2018-01-02 12:57:58 +08:00
zend_virtual_cwd.h year++ 2018-01-02 12:57:58 +08:00
zend_vm_def.h Use ZEND_CLOSURE_OBJECT() macro to resolve closure op_array to closure object through address calculation, instead of op_array->prototype reuse. (reapply 781e1573af, now it should be OK). 2018-01-11 22:15:45 +03:00
zend_vm_execute.h Use ZEND_CLOSURE_OBJECT() macro to resolve closure op_array to closure object through address calculation, instead of op_array->prototype reuse. (reapply 781e1573af, now it should be OK). 2018-01-11 22:15:45 +03:00
zend_vm_execute.skl Split zend_init_execute_data() into zend_init_func_execute_data() and zend_init_code_execute_data() 2017-06-29 10:10:57 +03:00
zend_vm_gen.php Added abiliy to mark object specific handlers with most often used operand types as HOT. (UNUSED+CONST and CV+CONST) 2018-01-10 19:00:38 +03:00
zend_vm_opcodes.c year++ 2018-01-02 12:57:58 +08:00
zend_vm_opcodes.h year++ 2018-01-02 12:57:58 +08:00
zend_vm.h year++ 2018-01-02 12:57:58 +08:00
zend.c Trailing whitespaces 2018-01-03 14:38:00 +01:00
zend.h year++ 2018-01-02 12:57:58 +08:00
zend.ico
Zend.m4 Merge branch 'PHP-7.1' 2017-02-08 00:54:27 +01: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().