php-src/Zend
Nikita Popov 1823b16fa1 Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
Merging master to fix Windows build

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_vm_def.h
2012-08-20 13:37:53 +02:00
..
RFCs Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
tests Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
acinclude.m4 Added Bison 2.5.1 to bison_version_list 2012-08-05 20:48:42 -07:00
bench.php Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties 2010-05-24 14:11:39 +00:00
build.mk Get rid of autoconf warnings 2011-05-16 00:14:47 +00:00
buildconf
configure.in Get rid of autoconf warnings 2011-05-16 00:14:47 +00:00
header Year++ 2010-01-11 03:01:19 +00:00
LICENSE - More -> 2006 changes 2006-01-05 02:34:02 +00:00
Makefile.am Add empty Generator class 2012-05-20 00:03:27 +02:00
Makefile.frag - Fix dependency 2005-01-25 10:39:49 +00:00
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 Nuked DOS EOLs 2005-08-03 13:29:00 +00:00
zend_alloc.c add support for the alloc_size __attribute__ (through ZEND_ATTRIBUTE_ALLOC_SIZE and ZEND_ATTRIBUTE_ALLOC_SIZE2 2012-05-23 22:18:01 -04:00
zend_alloc.h add support for the alloc_size __attribute__ (through ZEND_ATTRIBUTE_ALLOC_SIZE and ZEND_ATTRIBUTE_ALLOC_SIZE2 2012-05-23 22:18:01 -04:00
zend_API.c Merge branch 'PHP-5.3' into PHP-5.4 2012-08-19 12:44:49 -03:00
zend_API.h Merge branch 'PHP-5.3' into PHP-5.4 2012-08-04 11:14:03 +08:00
zend_build.h - Year++ 2012-01-01 13:15:04 +00:00
zend_builtin_functions.c Implemented FR #60738 (Allow 'set_error_handler' to handle NULL) 2012-03-24 19:41:11 +08:00
zend_builtin_functions.h - Year++ 2012-01-01 13:15:04 +00:00
ZEND_CHANGES Add some information about array overloading 2004-08-30 18:48:52 +00:00
zend_closures.c - Year++ 2012-01-01 13:15:04 +00:00
zend_closures.h - Year++ 2012-01-01 13:15:04 +00:00
zend_compile.c Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
zend_compile.h Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
zend_config.nw.h - Year++ 2012-01-01 13:15:04 +00:00
zend_config.w32.h - Year++ 2012-01-01 13:15:04 +00:00
zend_constants.c Improved traits implementation. Now to support __CLASS__ constant in traits php doesn't have to copy the complete compiled method, but can reuse the same code. The resolution of __CLASS__ constants in methods defined in traits are delayed till run-time. This approach also made possible to use __CLASS__ constant as default value for traits properties and method arguments. 2012-01-17 08:09:13 +00:00
zend_constants.h - Year++ 2012-01-01 13:15:04 +00:00
zend_default_classes.c Add empty Generator class 2012-05-20 00:03:27 +02:00
zend_dtrace.c Add DTrace probes 2010-04-24 13:32:30 +00:00
zend_dtrace.d Add DTrace probes 2010-04-24 13:32:30 +00:00
zend_dtrace.h Add DTrace probes 2010-04-24 13:32:30 +00:00
zend_dynamic_array.c - Year++ 2012-01-01 13:15:04 +00:00
zend_dynamic_array.h - Year++ 2012-01-01 13:15:04 +00:00
zend_errors.h - Year++ 2012-01-01 13:15:04 +00:00
zend_exceptions.c make default_exception_ce and error_exception_ce static 2012-08-02 06:53:09 -04:00
zend_exceptions.h - Year++ 2012-01-01 13:15:04 +00:00
zend_execute_API.c Remove asterix modifier (*) for generators 2012-07-20 16:09:06 +02:00
zend_execute.c Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-13 16:54:53 +02:00
zend_execute.h Remove asterix modifier (*) for generators 2012-07-20 16:09:06 +02:00
zend_extensions.c - Year++ 2012-01-01 13:15:04 +00:00
zend_extensions.h - Year++ 2012-01-01 13:15:04 +00:00
zend_float.c - Year++ 2012-01-01 13:15:04 +00:00
zend_float.h - Year++ 2012-01-01 13:15:04 +00:00
zend_gc.c - Year++ 2012-01-01 13:15:04 +00:00
zend_gc.h - Year++ 2012-01-01 13:15:04 +00:00
zend_generators.c Drop Generator::close() method 2012-08-20 12:53:18 +02:00
zend_generators.h Fix zts build (typo) 2012-08-20 13:28:36 +02:00
zend_globals_macros.h - Year++ 2012-01-01 13:15:04 +00:00
zend_globals.h Fix lexing of nested heredoc strings in token_get_all() 2012-03-31 21:53:30 +02:00
zend_hash.c - Year++ 2012-01-01 13:15:04 +00:00
zend_hash.h appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:28:29 -04:00
zend_highlight.c Fix lexing of nested heredoc strings in token_get_all() 2012-03-31 21:53:30 +02:00
zend_highlight.h - Year++ 2012-01-01 13:15:04 +00:00
zend_indent.c - Year++ 2012-01-01 13:15:04 +00:00
zend_indent.h - Year++ 2012-01-01 13:15:04 +00:00
zend_ini_parser.y - Year++ 2012-01-01 13:15:04 +00:00
zend_ini_scanner_defs.h Regenerated files 2012-06-07 18:05:25 +02:00
zend_ini_scanner.c Regenerated files 2012-06-07 18:05:25 +02:00
zend_ini_scanner.h - Year++ 2012-01-01 13:15:04 +00:00
zend_ini_scanner.l Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon) 2012-06-07 17:44:20 +02:00
zend_ini.c - Year++ 2012-01-01 13:15:04 +00:00
zend_ini.h - Year++ 2012-01-01 13:15:04 +00:00
zend_interfaces.c Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 2012-05-03 18:40:57 +08:00
zend_interfaces.h - Year++ 2012-01-01 13:15:04 +00:00
zend_istdiostream.h - Year++ 2012-01-01 13:15:04 +00:00
zend_iterators.c - Year++ 2012-01-01 13:15:04 +00:00
zend_iterators.h - Year++ 2012-01-01 13:15:04 +00:00
zend_language_parser.y Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
zend_language_scanner_defs.h Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
zend_language_scanner.c Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
zend_language_scanner.h Fix lexing of nested heredoc strings in token_get_all() 2012-03-31 21:53:30 +02:00
zend_language_scanner.l Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
zend_list.c - Year++ 2012-01-01 13:15:04 +00:00
zend_list.h - Year++ 2012-01-01 13:15:04 +00:00
zend_llist.c - Year++ 2012-01-01 13:15:04 +00:00
zend_llist.h - Year++ 2012-01-01 13:15:04 +00:00
zend_modules.h - Year++ 2012-01-01 13:15:04 +00:00
zend_multibyte.c Use free instead of efree 2012-05-21 19:02:45 +08:00
zend_multibyte.h - Year++ 2012-01-01 13:15:04 +00:00
zend_multiply.h - Year++ 2012-01-01 13:15:04 +00:00
zend_object_handlers.c fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-14 11:03:21 -07:00
zend_object_handlers.h fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-14 11:03:21 -07:00
zend_objects_API.c - Year++ 2012-01-01 13:15:04 +00:00
zend_objects_API.h - Year++ 2012-01-01 13:15:04 +00:00
zend_objects.c fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-14 11:03:21 -07:00
zend_objects.h - Year++ 2012-01-01 13:15:04 +00:00
zend_opcode.c Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
zend_operators.c improve code in zend_operators 2012-07-14 21:06:40 -07:00
zend_operators.h fix bug #54547 2012-05-14 11:03:20 -07:00
zend_ptr_stack.c - Year++ 2012-01-01 13:15:04 +00:00
zend_ptr_stack.h Fix lexing of nested heredoc strings in token_get_all() 2012-03-31 21:53:30 +02:00
zend_qsort.c - Year++ 2012-01-01 13:15:04 +00:00
zend_qsort.h - Year++ 2012-01-01 13:15:04 +00: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 - Year++ 2012-01-01 13:15:04 +00:00
zend_stack.c - Year++ 2012-01-01 13:15:04 +00:00
zend_stack.h - Year++ 2012-01-01 13:15:04 +00:00
zend_static_allocator.c - Year++ 2012-01-01 13:15:04 +00:00
zend_static_allocator.h - Year++ 2012-01-01 13:15:04 +00:00
zend_stream.c Merge branch 'PHP-5.3' into PHP-5.4 2012-08-02 12:32:44 +08:00
zend_stream.h - Year++ 2012-01-01 13:15:04 +00:00
zend_string.c - Year++ 2012-01-01 13:15:04 +00:00
zend_string.h Fix bug #62651: source level BC break 2012-07-27 01:39:06 +02:00
zend_strtod.c Fixed Bug #55649 (Undefined function Bug()). (Laruence) 2011-09-13 07:07:06 +00:00
zend_strtod.h - Year++ 2012-01-01 13:15:04 +00:00
zend_ts_hash.c - Year++ 2012-01-01 13:15:04 +00:00
zend_ts_hash.h - Year++ 2012-01-01 13:15:04 +00:00
zend_types.h - Year++ 2012-01-01 13:15:04 +00:00
zend_variables.c - Year++ 2012-01-01 13:15:04 +00:00
zend_variables.h - Year++ 2012-01-01 13:15:04 +00:00
zend_vm_def.h Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
zend_vm_execute.h Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-20 13:37:53 +02:00
zend_vm_execute.skl Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-13 16:54:53 +02:00
zend_vm_gen.php Make the GOTO and SWITCH VMs work again 2012-05-29 02:31:56 +02:00
zend_vm_opcodes.h Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 2012-08-13 16:54:53 +02:00
zend_vm.h - Year++ 2012-01-01 13:15:04 +00:00
zend.c Revert "zend_make_printable_zval choses cast_object over __toString" 2012-08-12 12:02:06 +08:00
Zend.dsp Add empty Generator class 2012-05-20 00:03:27 +02:00
zend.h add support for the alloc_size __attribute__ (through ZEND_ATTRIBUTE_ALLOC_SIZE and ZEND_ATTRIBUTE_ALLOC_SIZE2 2012-05-23 22:18:01 -04:00
zend.ico
Zend.m4 make ZEND_SIGNALS configurable, off by default 2012-02-16 01:51:45 +00:00
ZendCore.dep
ZendTS.dsp Add empty Generator class 2012-05-20 00:03:27 +02: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 callls 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().