php-src/Zend
Julien Pauli ab3525c401 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix #68185 - Inconsistent insteadof definition

Conflicts:
	Zend/zend_compile.c
2014-11-21 15:50:27 +01:00
..
RFCs fixed typo and few grammar mistakes 2013-10-17 22:00:40 -04:00
tests Merge branch 'PHP-5.5' into PHP-5.6 2014-11-10 13:47:14 +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
OBJECTS2_HOWTO
README.ZEND_MM
README.ZEND_VM typo fixes 2013-07-15 00:23:03 -07:00
zend_alloc.c Bump year 2014-01-03 11:08:10 +08:00
zend_alloc.h Bump year 2014-01-03 11:08:10 +08:00
zend_API.c Fixed Bug #68104 (Segfault while pre-evaluating a disabled function) 2014-10-31 17:32:23 +08:00
zend_API.h DLL export several APIs needed for phpdbg 2014-10-12 19:22:03 +02:00
zend_ast.c Fixed crash on self-referencing constant expression (part of a constant AST) 2014-07-24 00:37:15 +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 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-08 15:54:32 -07: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 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-08 19:02:24 -07:00
zend_closures.h Bump year 2014-01-03 11:08:10 +08:00
zend_compile.c Merge branch 'PHP-5.5' into PHP-5.6 2014-11-21 15:50:27 +01:00
zend_compile.h Merge branch 'PHP-5.5' into PHP-5.6 2014-09-01 12:20:34 -07: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:27 +01:00
zend_constants.c Removed useless void* parameter and replaced with zend_bool on zval_update_constant* functions 2014-04-11 19:18:58 +02:00
zend_constants.h Bump year 2014-01-03 11:08:10 +08:00
zend_default_classes.c Bump year 2014-01-03 11:08:10 +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 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 branch 'PHP-5.4' into PHP-5.5 2014-05-11 15:15:27 +02:00
zend_exceptions.h Bump year 2014-01-03 11:08:10 +08:00
zend_execute_API.c fix incompatible pointer types 2014-11-17 09:33:58 +01:00
zend_execute.c Fixed possible crash because of race conditions on modifying constants in shared memory 2014-07-01 00:13:34 +04:00
zend_execute.h Removed useless void* parameter and replaced with zend_bool on zval_update_constant* functions 2014-04-11 19:18:58 +02:00
zend_extensions.c Bump year 2014-01-03 11:08:10 +08:00
zend_extensions.h DLL export several APIs needed for phpdbg 2014-10-12 19:22:03 +02: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 Bump year 2014-01-03 11:08:10 +08:00
zend_gc.h Bump year 2014-01-03 11:08:10 +08:00
zend_generators.c Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 17:36:27 +02:00
zend_generators.h Bump year 2014-01-03 11:08:10 +08:00
zend_globals_macros.h Bump year 2014-01-03 11:08:10 +08:00
zend_globals.h Making ini parser typed 2014-09-01 22:04:06 +08:00
zend_hash.c Fixed bug #67169: []= after_array_splice incorrect 2014-05-02 12:49:51 +02:00
zend_hash.h Add only_integer_keys option to zend_hash_reindex 2014-04-09 12:31:21 +02:00
zend_highlight.c Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded 2014-06-23 09:51:44 +02:00
zend_highlight.h Bump year 2014-01-03 11:08:10 +08:00
zend_indent.c Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded 2014-06-23 09:51:44 +02:00
zend_indent.h Bump year 2014-01-03 11:08:10 +08:00
zend_ini_parser.y Making ini parser typed 2014-09-01 22:04:06 +08: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 Making ini parser typed 2014-09-01 22:04:06 +08:00
zend_ini_scanner.h Making ini parser typed 2014-09-01 22:04:06 +08:00
zend_ini_scanner.l Making ini parser typed 2014-09-01 22:04:06 +08:00
zend_ini.c Bump year 2014-01-03 11:08:10 +08:00
zend_ini.h Bump year 2014-01-03 11:08:10 +08:00
zend_interfaces.c Bump year 2014-01-03 11:08:10 +08:00
zend_interfaces.h Bump year 2014-01-03 11:08:10 +08:00
zend_istdiostream.h Bump year 2014-01-03 11:08:10 +08:00
zend_iterators.c Bump year 2014-01-03 11:08:10 +08:00
zend_iterators.h Bump year 2014-01-03 11:08:10 +08:00
zend_language_parser.y Disable restrictions regarding arrays in constants at run-time. 2014-07-30 17:57:07 +02: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 branch 'PHP-5.5' into PHP-5.6 2014-03-10 12:18:57 +01:00
zend_language_scanner.h Bump year 2014-01-03 11:08:10 +08:00
zend_language_scanner.l add T_POW (**) operator 2014-02-06 14:41:21 +01:00
zend_list.c Bump year 2014-01-03 11:08:10 +08:00
zend_list.h Bump year 2014-01-03 11:08:10 +08: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 Bump year 2014-01-03 11:08:10 +08:00
zend_multibyte.c Bump year 2014-01-03 11:08:10 +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 branch 'PHP-5.5' into PHP-5.6 2014-10-03 21:27:07 +02:00
zend_object_handlers.h Bump year 2014-01-03 11:08:10 +08:00
zend_objects_API.c Bump year 2014-01-03 11:08:10 +08:00
zend_objects_API.h Bump year 2014-01-03 11:08:10 +08:00
zend_objects.c Bump year 2014-01-03 11:08:10 +08:00
zend_objects.h Bump year 2014-01-03 11:08:10 +08:00
zend_opcode.c Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 17:19:39 +08:00
zend_operators.c Added folder mark 2014-05-24 21:11:13 +08:00
zend_operators.h add T_POW (**) operator 2014-02-06 14:41:21 +01: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 Bump year 2014-01-03 11:08:10 +08:00
zend_stack.h Bump year 2014-01-03 11:08:10 +08: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 Bump year 2014-01-03 11:08:10 +08:00
zend_string.h Bump year 2014-01-03 11:08:10 +08: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 Bump year 2014-01-03 11:08:10 +08:00
zend_ts_hash.h Bump year 2014-01-03 11:08:10 +08:00
zend_types.h Bump year 2014-01-03 11:08:10 +08:00
zend_variables.c Merge branch 'PHP-5.5' into PHP-5.6 2014-11-07 09:54:05 +03:00
zend_variables.h Bump year 2014-01-03 11:08:10 +08: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 Disable restrictions regarding arrays in constants at run-time. 2014-07-30 17:57:07 +02:00
zend_vm_execute.h Disable restrictions regarding arrays in constants at run-time. 2014-07-30 17:57:07 +02:00
zend_vm_execute.skl Slight performance improvement 2012-12-05 13:23:37 +04:00
zend_vm_gen.php Merge branch 'PHP-5.4' into PHP-5.5 2014-07-06 22:15:35 -07:00
zend_vm_opcodes.c add T_POW (**) operator 2014-02-06 14:41:21 +01:00
zend_vm_opcodes.h Merge branch 'PHP-5.4' into PHP-5.5 2014-07-06 22:15:35 -07:00
zend_vm.h Bump year 2014-01-03 11:08:10 +08:00
zend.c DLL export several APIs needed for phpdbg 2014-10-12 19:22:03 +02:00
Zend.dsp fix *.dsp files related to bug #50333 2014-01-28 13:09:29 +01:00
zend.h remove the -dev suffix from the Zend version 2014-08-27 03:52:46 +02: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().