php-src/Zend
Nikita Popov a34f81deee Allow adding return type during inheritance
This is allowed as per the return types RFC. The test for this
behavior happened to use an internal class without arginfo, which
is why this was not properly implemented.
2015-03-22 18:56:14 +01:00
..
RFCs
tests Allow adding return type during inheritance 2015-03-22 18:56:14 +01: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 Faster sorting algo 2015-01-14 18:02:41 +08: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 Temorary fix for phpdbg segfault while use zend_mm_set_custom_handlers 2015-03-09 11:19:05 +08:00
zend_alloc.h Minimize copying of HashTable realocation 2015-03-05 17:22:10 +03:00
zend_API.c Partially revert "Fix uninitialized value condition" 2015-03-22 09:25:32 +01:00
zend_API.h Revert "Use E_ERROR | E_EXCEPTION in FAST_ZPP mode too" 2015-03-22 09:17:42 +01:00
zend_arena.h bump year 2015-01-15 23:27:30 +08:00
zend_ast.c Unused var 2015-02-21 10:58:23 +08:00
zend_ast.h fix compilation warnings, rename batch_use to group_use 2015-03-08 12:50:57 -03:00
zend_build.h bump year 2015-01-15 23:27:30 +08:00
zend_builtin_functions.c Use specialized macro for string zval creation 2015-03-12 16:53:51 +03: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 More accurate reference counting on closures 2015-03-10 23:04:41 +03:00
zend_closures.h bump year 2015-01-15 23:27:30 +08:00
zend_compile.c Fixed return type hint handling for constants 2015-03-20 18:36:43 +03:00
zend_compile.h Improved type hinting: 2015-03-20 16:04:04 +03:00
zend_config.nw.h bump year 2015-01-15 23:27:30 +08:00
zend_config.w32.h bump year 2015-01-15 23:27:30 +08:00
zend_constants.c Reimplemented special constant handling. Now __HALT_COMPILER_OFFSET__ is resolved at compile-time. __CLASS__ retrived using separate ZEND_FETCH_CLASS_NAME opcode. 2015-03-18 15:33:56 +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 Fixed error messages 2015-03-20 17:26:12 +03: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 Reimplemented special constant handling. Now __HALT_COMPILER_OFFSET__ is resolved at compile-time. __CLASS__ retrived using separate ZEND_FETCH_CLASS_NAME opcode. 2015-03-18 15:33:56 +03:00
zend_execute.c ZPP changed to lazely check for "strict/weak" only if it's really necessary. 2015-03-20 23:18:52 +03:00
zend_execute.h Fix executor issue with ignoring strict types, which cleans up a bunch of errors. Additionally fix the expected error of 2 unrelated tests that was caused by a change to the core error messages 2015-03-18 15:22:21 -04: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 bump year 2015-01-15 23:27:30 +08:00
zend_gc.c Use fastcall calling convention for most critical ZE subsystems. 2015-03-13 21:10:09 +03:00
zend_gc.h Use fastcall calling convention for most critical ZE subsystems. 2015-03-13 21:10:09 +03:00
zend_generators.c Implement Generator::getReturn() 2015-03-17 21:51:53 +01:00
zend_generators.h Implement Generator::getReturn() 2015-03-17 21:51:53 +01: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 cleanup 2015-03-20 20:43:23 +03:00
zend_hash.c Fixed mess in names 2015-03-18 00:13:39 +03:00
zend_hash.h fix datatype mismatch warnings 2015-03-19 22:33:12 +01: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_indent.c bump year 2015-01-15 23:27:30 +08:00
zend_indent.h bump year 2015-01-15 23:27:30 +08:00
zend_inheritance.c Allow adding return type during inheritance 2015-03-22 18:56:14 +01:00
zend_inheritance.h bump year 2015-01-15 23:27:30 +08:00
zend_ini_parser.y Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate() 2015-03-20 02:02:42 +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 bump year 2015-01-15 23:27:30 +08: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 Improved parser (make use_type reuseable) 2015-03-16 18:43:36 +08: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 Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate() 2015-03-20 02:02:42 +03:00
zend_language_scanner.h Fixed compiler reenterability 2015-01-22 20:39:34 +03:00
zend_language_scanner.l Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate() 2015-03-20 02:02:42 +03:00
zend_list.c found type is unnecessary 2015-02-02 14:45:19 +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 zend_hash_append result duplicated key 2015-03-08 00:21:02 +08:00
zend_object_handlers.h bump year 2015-01-15 23:27:30 +08:00
zend_objects_API.c bump year 2015-01-15 23:27:30 +08: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 Make zend_array_destroy() to free the corresponding zend_array 2015-02-24 18:34:37 +03:00
zend_objects.h bump year 2015-01-15 23:27:30 +08:00
zend_opcode.c Implement Generator::getReturn() 2015-03-17 21:51:53 +01:00
zend_operators.c Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate() 2015-03-20 02:02:42 +03:00
zend_operators.h Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations 2015-03-17 18:53:19 +03:00
zend_portability.h This should fix compilation on OSX (bug #68987 Failed to compile zend.c with gcc-4.9.2) 2015-02-06 13:42:22 +03: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 Revert commit to zend signal by mistake 2015-03-05 19:04:43 +08: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.h bump year 2015-01-15 23:27:30 +08: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 Changed HashTable layout: 2015-03-13 17:13:19 +03:00
zend_string.h Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate() 2015-03-20 02:02:42 +03:00
zend_strtod_int.h strtod shouldn't recognize hex strings 2015-03-18 14:26:15 +01:00
zend_strtod.c fix endianness check plus better visual origin compat 2015-03-18 00:39:06 +01: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 Merge in master, fix merge conflicts and update patch to support exceptions everywhere 2015-03-18 10:50:11 -04:00
zend_variables.c Use fastcall calling convention for most critical ZE subsystems. 2015-03-13 21:10:09 +03:00
zend_variables.h Use fastcall calling convention for most critical ZE subsystems. 2015-03-13 21:10:09 +03:00
zend_virtual_cwd.c bump year 2015-01-15 23:27:30 +08:00
zend_virtual_cwd.h bump year 2015-01-15 23:27:30 +08:00
zend_vm_def.h Fixed in-place modification of IS_CONST operand 2015-03-21 00:22:25 +03:00
zend_vm_execute.h Fixed in-place modification of IS_CONST operand 2015-03-21 00:22:25 +03:00
zend_vm_execute.skl improved timeout handling on windows 2015-03-16 17:49:43 +01:00
zend_vm_gen.php Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations 2015-03-17 18:53:19 +03:00
zend_vm_opcodes.c Reimplemented special constant handling. Now __HALT_COMPILER_OFFSET__ is resolved at compile-time. __CLASS__ retrived using separate ZEND_FETCH_CLASS_NAME opcode. 2015-03-18 15:33:56 +03:00
zend_vm_opcodes.h Reimplemented special constant handling. Now __HALT_COMPILER_OFFSET__ is resolved at compile-time. __CLASS__ retrived using separate ZEND_FETCH_CLASS_NAME opcode. 2015-03-18 15:33:56 +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 Refactor as to not use call info, but add the flag to the op_array. 2015-03-19 13:30:11 -04:00
zend.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.ico
Zend.m4 Fixed global register checking 2015-03-19 16:54:13 +08: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().