php-src/Zend
Dmitry Stogov 4bb9b6526e Merge branch 'master' into sccp
* master: (43 commits)
  Keep information about SSA variables, that may be modified indirectly.
  Added constants for known ldap controls OID and tests for ldap_get/set_option for controls
  Added support for controls to ldap_get_option
  [ci skip] sync NEWS
  NEWS for oniguruma
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229) b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
  Patch from the upstream git https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226) b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6 f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6
  valid_symbol_table removed
  Improve fix for #74145
  Fix wddx
  Fix tests
  Fixed bug #74111
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  ...
2017-07-05 19:17:04 +03:00
..
tests Merge branch 'PHP-7.1' 2017-07-04 21:23:16 -07:00
acinclude.m4
bench.php
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
Makefile.frag
micro_bench.php
OBJECTS2_HOWTO
README.ZEND_MM
README.ZEND_VM
zend.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend.ico
Zend.m4 Merge branch 'PHP-7.1' 2017-02-08 00:54:27 +01:00
zend_alloc.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_alloc.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_alloc_sizes.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_API.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_API.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_arena.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_ast.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_ast.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_bitset.h Initial integration of Sparse Conditional Constant Propagation (SCCP), originally developed in https://github.com/nikic/php-src/tree/opt, into DFA optimization pass. 2017-07-05 00:58:12 +03:00
zend_build.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_builtin_functions.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_builtin_functions.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_closures.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_closures.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_compile.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_compile.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_config.nw.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_config.w32.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_constants.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_constants.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_default_classes.c further sync for vim mode lines 2017-07-04 18:12:45 +02: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 further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_exceptions.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_exceptions.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_execute.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_execute.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_execute_API.c Drop dead abstract method check from zend_call_function() 2017-07-04 21:11:22 +02:00
zend_extensions.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_extensions.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_float.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_float.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_gc.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_gc.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_generators.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_generators.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_globals.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_globals_macros.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_hash.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_hash.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_highlight.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_highlight.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_inheritance.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_inheritance.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_ini.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_ini.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_ini_parser.y Merge branch 'PHP-7.1' 2017-07-04 21:23:16 -07:00
zend_ini_scanner.c Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
zend_ini_scanner.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_ini_scanner.l Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
zend_ini_scanner_defs.h
zend_interfaces.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_interfaces.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_istdiostream.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_iterators.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_iterators.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_language_parser.y further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_language_scanner.c Merge branch 'PHP-7.1' 2017-03-23 22:50:21 +01:00
zend_language_scanner.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_language_scanner.l Merge branch 'PHP-7.1' 2017-03-23 22:50:21 +01:00
zend_language_scanner_defs.h
zend_list.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_list.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_llist.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_llist.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_long.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_modules.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_multibyte.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_multibyte.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_multiply.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_object_handlers.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_object_handlers.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_objects.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_objects.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_objects_API.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_objects_API.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_opcode.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_operators.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_operators.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_portability.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_ptr_stack.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_ptr_stack.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_range_check.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_signal.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_signal.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_smart_str.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_smart_str.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_smart_str_public.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_smart_string.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_smart_string_public.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_sort.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_sort.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_sprintf.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_stack.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_stack.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_stream.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_stream.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_string.c further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_string.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_strtod.c
zend_strtod.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_strtod_int.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_ts_hash.c Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
zend_ts_hash.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_type_info.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_types.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_variables.c Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
zend_variables.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_virtual_cwd.c Avoid unnecessary string copy 2017-04-27 16:03:12 +02:00
zend_virtual_cwd.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_vm.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_vm_def.h further sync for vim mode lines 2017-07-04 18:12:45 +02:00
zend_vm_execute.h Revert "Avoid run-time checks performed at compile-time." 2017-07-04 07:15:42 +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 VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable. 2017-06-16 01:42:49 +03:00
zend_vm_opcodes.c Update opcode description 2017-05-30 14:47:21 +03:00
zend_vm_opcodes.h further sync for vim mode lines 2017-07-04 18:12:45 +02: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().