php-src/Zend
Nikita Popov c6b986b4e7 Merge branch 'PHP-5.6'
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2015-05-12 15:09:25 +02:00
..
RFCs
tests Merge branch 'PHP-5.6' 2015-05-12 15:09:25 +02:00
acinclude.m4 remove 3.0 from excluded versions because limitation lifted by native-tls 2014-12-22 21:32:14 +00:00
bench.php
build.mk
buildconf
configure.in
header
LICENSE
Makefile.am Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc(). 2015-04-16 14:45:08 +03:00
Makefile.frag
micro_bench.php
OBJECTS2_HOWTO
README.ZEND_MM
README.ZEND_VM
zend_alloc_sizes.h Replaced Zend Memory Manager 2014-08-26 16:21:58 +04:00
zend_alloc.c Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc(). 2015-04-16 14:45:08 +03:00
zend_alloc.h Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc(). 2015-04-16 14:45:08 +03:00
zend_API.c Use zend_string to represent pdo_column_data.name and avoid duplication. 2015-05-05 16:19:51 +03:00
zend_API.h Use zend_string to represent pdo_column_data.name and avoid duplication. 2015-05-05 16:19:51 +03:00
zend_arena.h bump year 2015-01-15 23:27:30 +08:00
zend_ast.c Rebase Joe's anon classes implementation 2015-04-26 15:04:22 +02:00
zend_ast.h Merge branch 'coroutineDelegation' of https://github.com/bwoebi/php-src 2015-04-14 17:58:58 +02:00
zend_build.h bump year 2015-01-15 23:27:30 +08:00
zend_builtin_functions.c Revert unrelated changes / rebase fixup 2015-04-26 15:13:49 +02:00
zend_builtin_functions.h bump year 2015-01-15 23:27:30 +08:00
ZEND_CHANGES typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-19 20:23:00 +00:00
zend_closures.c Ban rebinding closures to different internal classes 2015-05-12 10:54:59 +02:00
zend_closures.h Fix LSB handling for closures 2015-05-05 21:14:03 +02:00
zend_compile.c Allow self etc in eval / file scope 2015-05-07 15:38:16 +02:00
zend_compile.h Mark first call frames of stack segment with ZEND_CALL_ALLOCATED flag to simplify checks on stack deallocation. 2015-05-12 15:56:42 +03:00
zend_config.nw.h bump year 2015-01-15 23:27:30 +08:00
zend_config.w32.h Drop old VC support in Zend Engine, this also kills the remaining MessageBox fix for Windows 9x that Anatol changed a while back 2015-03-29 07:10:39 +02:00
zend_constants.c Don't propogate "fake" EX(called_scope) and EX(This) into each internal function. 2015-04-23 12:16:37 +03:00
zend_constants.h bump year 2015-01-15 23:27:30 +08:00
zend_default_classes.c bump year 2015-01-15 23:27:30 +08:00
zend_dtrace.c first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
zend_dtrace.d
zend_dtrace.h first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
zend_errors.h Implement engine exceptions 2015-03-09 14:01:32 +01:00
zend_exceptions.c Minor Typo in Comment 2015-04-27 20:06:55 +02:00
zend_exceptions.h Refactor error implementation significantly to centralize error mode behavior. Add zend_internal_type_error() function 2015-03-18 12:23:09 -04:00
zend_execute_API.c Avoid unnecessary reference counter incrementation on $this when call methods 2015-05-07 16:28:23 +03:00
zend_execute.c Mark first call frames of stack segment with ZEND_CALL_ALLOCATED flag to simplify checks on stack deallocation. 2015-05-12 15:56:42 +03:00
zend_execute.h Mark first call frames of stack segment with ZEND_CALL_ALLOCATED flag to simplify checks on stack deallocation. 2015-05-12 15:56:42 +03:00
zend_extensions.c bump year 2015-01-15 23:27:30 +08:00
zend_extensions.h bump year 2015-01-15 23:27:30 +08:00
zend_float.c bump year 2015-01-15 23:27:30 +08:00
zend_float.h Drop old VC support in Zend Engine, this also kills the remaining MessageBox fix for Windows 9x that Anatol changed a while back 2015-03-29 07:10:39 +02:00
zend_gc.c Fixed return without value 2015-05-06 22:53:48 +03:00
zend_gc.h Add support for more debug output during CC 2015-04-11 18:29:36 +02:00
zend_generators.c Fixed $this release 2015-05-07 17:26:01 +03:00
zend_generators.h Add NEWS/UPGRADING and some implementation notes 2015-04-14 18:35:47 +02:00
zend_globals_macros.h Add missing ZEND_API tag to declaration of int zendparse(); 2015-01-22 14:04:49 -08:00
zend_globals.h Move more stuff to file_context 2015-04-21 17:39:07 +02:00
zend_hash.c Eliminate useless checks 2015-04-27 15:54:41 +03:00
zend_hash.h Use new hash iteration API. 2015-04-27 16:50:47 +03:00
zend_highlight.c bump year 2015-01-15 23:27:30 +08:00
zend_highlight.h bump year 2015-01-15 23:27:30 +08:00
zend_inheritance.c Fixed #69566 in master 2015-05-04 10:35:55 +08:00
zend_inheritance.h Deprecate PHP 4 constructors 2015-03-31 17:55:27 +02:00
zend_ini_parser.y Use string primitive 2015-04-22 14:23:22 +03:00
zend_ini_scanner_defs.h
zend_ini_scanner.c Fixed bug #68805 (Double define) 2015-01-17 23:06:37 -05:00
zend_ini_scanner.h bump year 2015-01-15 23:27:30 +08:00
zend_ini_scanner.l Fixed bug #68805 (Double define) 2015-01-17 23:06:37 -05:00
zend_ini.c bump year 2015-01-15 23:27:30 +08:00
zend_ini.h bump year 2015-01-15 23:27:30 +08:00
zend_interfaces.c Don't propogate "fake" EX(called_scope) and EX(This) into each internal function. 2015-04-23 12:16:37 +03:00
zend_interfaces.h bump year 2015-01-15 23:27:30 +08:00
zend_istdiostream.h bump year 2015-01-15 23:27:30 +08:00
zend_iterators.c bump year 2015-01-15 23:27:30 +08:00
zend_iterators.h bump year 2015-01-15 23:27:30 +08:00
zend_language_parser.y More cleanup (mainly retab) 2015-04-26 15:54:30 +02:00
zend_language_scanner_defs.h Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse. 2015-03-04 02:05:28 +03:00
zend_language_scanner.c Add line_start/end info to main op_array 2015-04-25 19:10:58 +02:00
zend_language_scanner.h Fixed compiler reenterability 2015-01-22 20:39:34 +03:00
zend_language_scanner.l Add line_start/end info to main op_array 2015-04-25 19:10:58 +02:00
zend_list.c Fixed bug #69485 (Double free on zend_list_dtor). 2015-04-20 11:48:21 +08:00
zend_list.h found type is unnecessary 2015-02-02 14:45:19 +08:00
zend_llist.c bump year 2015-01-15 23:27:30 +08:00
zend_llist.h bump year 2015-01-15 23:27:30 +08:00
zend_long.h rely on macros from stdint for int constants on 64 bit 2015-02-02 09:39:33 +01:00
zend_modules.h bump year 2015-01-15 23:27:30 +08:00
zend_multibyte.c bump year 2015-01-15 23:27:30 +08:00
zend_multibyte.h bump year 2015-01-15 23:27:30 +08:00
zend_multiply.h merge ZEND_SIGNED_MULTIPLY_LONG for i386 and x86_64 2015-02-28 01:43:53 +02:00
zend_object_handlers.c Fixed bug #69534 (Cycle leaks through declared properties on internal classes) 2015-05-06 21:33:49 +03:00
zend_object_handlers.h Squashed commit of the following: 2015-04-10 23:01:00 +03:00
zend_objects_API.c Micro optimizations 2015-04-28 19:11:45 +03:00
zend_objects_API.h Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced. 2015-02-04 15:24:13 +03:00
zend_objects.c Micro optimizations 2015-04-28 19:11:45 +03:00
zend_objects.h bump year 2015-01-15 23:27:30 +08:00
zend_opcode.c Micro optimizations 2015-04-28 19:11:45 +03:00
zend_operators.c Inline IS_LONG value calculation and avoid strtol() call. 2015-05-05 11:09:18 +03:00
zend_operators.h Improve fast_is_[not_]identical() functions to teturn value instead of takeing additional arguments. 2015-04-29 16:43:23 +03:00
zend_portability.h Drop old VC support in Zend Engine, this also kills the remaining MessageBox fix for Windows 9x that Anatol changed a while back 2015-03-29 07:10:39 +02:00
zend_ptr_stack.c bump year 2015-01-15 23:27:30 +08:00
zend_ptr_stack.h bump year 2015-01-15 23:27:30 +08:00
zend_signal.c Use zend_error_noreturn() for fatal errors 2015-04-01 13:32:23 +03:00
zend_signal.h Revive Zend Signals handler (and fixed bug #61083) 2015-03-05 18:11:22 +08:00
zend_smart_str_public.h bump year 2015-01-15 23:27:30 +08:00
zend_smart_str.c Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc(). 2015-04-16 14:45:08 +03:00
zend_smart_str.h Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc(). 2015-04-16 14:45:08 +03:00
zend_sort.c Only use explicit ">" in sorting algo 2015-01-19 03:32:28 -05:00
zend_sort.h bump year 2015-01-15 23:27:30 +08:00
zend_sprintf.c bump year 2015-01-15 23:27:30 +08:00
zend_stack.c bump year 2015-01-15 23:27:30 +08:00
zend_stack.h bump year 2015-01-15 23:27:30 +08:00
zend_stream.c Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse. 2015-03-04 02:05:28 +03:00
zend_stream.h Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse. 2015-03-04 02:05:28 +03:00
zend_string.c Fixed interned string leaks after new STATIC_KEY flag is introduced 2015-04-28 11:14:21 +08:00
zend_string.h Fixed zend_string related inconsistencies 2015-04-21 23:26:34 +03:00
zend_strtod_int.h strtod shouldn't recognize hex strings 2015-03-18 14:26:15 +01:00
zend_strtod.c Use zend_error_noreturn() for fatal errors 2015-04-01 13:32:23 +03:00
zend_strtod.h bump year 2015-01-15 23:27:30 +08:00
zend_ts_hash.c bump year 2015-01-15 23:27:30 +08:00
zend_ts_hash.h bump year 2015-01-15 23:27:30 +08:00
zend_types.h Change the GC approach to inner-loops handling. Switch to less efficient but more robust algorithm. Destructors handling is still not completely accurate. 2015-04-17 18:35:57 +03:00
zend_variables.c Added GC checks and improvements 2015-04-17 03:55:37 +03:00
zend_variables.h Improved reference counting 2015-04-03 01:32:20 +03:00
zend_virtual_cwd.c Merge branch 'PHP-5.5' into PHP-5.6 2015-04-28 15:32:22 +02:00
zend_virtual_cwd.h bump year 2015-01-15 23:27:30 +08:00
zend_vm_def.h Fix bug #69599 2015-05-12 15:08:12 +02:00
zend_vm_execute.h Fix bug #69599 2015-05-12 15:08:12 +02:00
zend_vm_execute.skl Don't propogate "fake" EX(called_scope) and EX(This) into each internal function. 2015-04-23 12:16:37 +03:00
zend_vm_gen.php Properly define ZEND_OP_DATA in zend_vm_def.h 2015-04-19 23:21:57 +02:00
zend_vm_opcodes.c Refactored using specialized opcodes 2015-04-27 12:24:39 +03:00
zend_vm_opcodes.h Refactored using specialized opcodes 2015-04-27 12:24:39 +03:00
zend_vm.h Added API function to call VM opcode handler in a portable way 2015-03-13 11:29:43 +03:00
zend.c Fixed bug #69388 2015-04-20 18:18:52 +02:00
zend.h Always throw TypeException on throwing zpp failures 2015-04-06 11:27:34 +02:00
zend.ico
Zend.m4 Improve CSPRNG implementation 2015-05-09 21:57:59 +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().