php-src/Zend
Nikita Popov 6c687e0d9b Add type annotations to parser
Conflicts:

	Zend/zend_language_parser.y
2014-08-26 22:31:58 +02:00
..
RFCs
tests Merge remote-tracking branch 'php-src/master' into ast 2014-08-25 21:52:18 +02:00
acinclude.m4
bench.php
build.mk
buildconf
configure.in
header
LICENSE
Makefile.am
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 fixed bitset computing on win64 build 2014-08-26 20:43:33 +02:00
zend_alloc.h Replaced Zend Memory Manager 2014-08-26 16:21:58 +04:00
zend_API.c Add zend_string_equals and zend_string_equals_literal 2014-08-25 22:40:58 +02:00
zend_API.h master renames phase 3 2014-08-25 20:22:49 +02:00
zend_arena.h Fixed compilation warnings 2014-07-15 15:51:40 +04:00
zend_ast.c Merge remote-tracking branch 'php-src/master' into ast 2014-08-25 21:52:18 +02:00
zend_ast.h Merge remote-tracking branch 'php-src/master' into ast 2014-08-25 21:52:18 +02:00
zend_build.h
zend_builtin_functions.c Add zend_string_equals and zend_string_equals_literal 2014-08-25 22:40:58 +02:00
zend_builtin_functions.h
ZEND_CHANGES
zend_closures.c Add zend_string_equals and zend_string_equals_literal 2014-08-25 22:40:58 +02:00
zend_closures.h Refactored data structures to keep zend_object* instead of a whole zval in some places 2014-03-28 02:11:22 +04:00
zend_compile.c Don't alloc empty jmp opnum list for single-branch if 2014-08-26 22:31:57 +02:00
zend_compile.h Remove ZEND_ACC_INTERACTIVE and CG(interactive) 2014-08-25 23:46:43 +02:00
zend_config.nw.h
zend_config.w32.h
zend_constants.c master renames phase 1 2014-08-25 19:24:55 +02:00
zend_constants.h master renames phase 1 2014-08-25 19:24:55 +02:00
zend_default_classes.c
zend_dtrace.c Fixed dtrace support 2014-07-22 11:12:49 +04:00
zend_dtrace.d
zend_dtrace.h Simplify call-frame handling 2014-07-07 15:50:44 +04:00
zend_dynamic_array.c
zend_dynamic_array.h
zend_errors.h
zend_exceptions.c several signature and data type fixes 2014-08-26 13:20:21 +02:00
zend_exceptions.h several signature and data type fixes 2014-08-26 13:20:21 +02:00
zend_execute_API.c Remove ZEND_ACC_INTERACTIVE and CG(interactive) 2014-08-25 23:46:43 +02:00
zend_execute.c Remove ZEND_ACC_INTERACTIVE and CG(interactive) 2014-08-25 23:46:43 +02:00
zend_execute.h Remove ZEND_ACC_INTERACTIVE and CG(interactive) 2014-08-25 23:46:43 +02:00
zend_extensions.c
zend_extensions.h Bump version to 7.0.0-dev 2014-08-15 11:10:41 +04:00
zend_float.c
zend_float.h
zend_gc.c Fixed GC for inner-loops (ext/standard/tests/array/compact_variation1.phpt). 2014-08-07 18:50:03 +04:00
zend_gc.h master renames phase 2 2014-08-25 19:28:33 +02:00
zend_generators.c master renames phase 2 2014-08-25 19:28:33 +02:00
zend_generators.h master renames phase 1 2014-08-25 19:24:55 +02:00
zend_globals_macros.h
zend_globals.h Remove ZEND_ACC_INTERACTIVE and CG(interactive) 2014-08-25 23:46:43 +02:00
zend_hash.c master renames phase 3 2014-08-25 20:22:49 +02:00
zend_hash.h Fix compiler warnings 2014-08-25 23:08:01 +02:00
zend_highlight.c master renames phase 1 2014-08-25 19:24:55 +02:00
zend_highlight.h
zend_indent.c master renames phase 1 2014-08-25 19:24:55 +02:00
zend_indent.h
zend_ini_parser.y master renames phase 1 2014-08-25 19:24:55 +02: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 Fix compiler warnings 2014-08-25 23:08:01 +02:00
zend_ini_scanner.h
zend_ini_scanner.l Fix compiler warnings 2014-08-25 23:08:01 +02:00
zend_ini.c master renames phase 3 2014-08-25 20:22:49 +02:00
zend_ini.h master renames phase 1 2014-08-25 19:24:55 +02:00
zend_interfaces.c master renames phase 2 2014-08-25 19:28:33 +02:00
zend_interfaces.h master renames phase 2 2014-08-25 19:28:33 +02:00
zend_istdiostream.h
zend_iterators.c dtor handler must be set 2014-08-21 11:17:05 +04:00
zend_iterators.h master renames phase 1 2014-08-25 19:24:55 +02:00
zend_language_parser.y Add type annotations to parser 2014-08-26 22:31:58 +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 Remove ZEND_ACC_INTERACTIVE and CG(interactive) 2014-08-25 23:46:43 +02:00
zend_language_scanner.h
zend_language_scanner.l Remove ZEND_ACC_INTERACTIVE and CG(interactive) 2014-08-25 23:46:43 +02:00
zend_list.c Use new zend_hash API 2014-05-27 00:38:58 +04:00
zend_list.h Removed support for old-style resource destructors (only ext/soap used it) 2014-05-15 10:57:03 +04:00
zend_llist.c
zend_llist.h
zend_long.h fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
zend_modules.h Bump version to 7.0.0-dev 2014-08-15 11:10:41 +04:00
zend_multibyte.c Fixed mode 2014-08-14 23:54:32 +04:00
zend_multibyte.h
zend_multiply.h master renamings phase 5 2014-08-25 21:20:44 +02:00
zend_object_handlers.c master renames phase 1 2014-08-25 19:24:55 +02:00
zend_object_handlers.h master renames phase 1 2014-08-25 19:24:55 +02:00
zend_objects_API.c master renames phase 2 2014-08-25 19:28:33 +02:00
zend_objects_API.h master renames phase 2 2014-08-25 19:28:33 +02:00
zend_objects.c master renames phase 1 2014-08-25 19:24:55 +02:00
zend_objects.h Fixed destruction of objects and iterators on unclean request shutdown and GC (few cases are still unfixed). 2014-04-09 01:50:15 +04:00
zend_opcode.c Remove ZEND_ACC_INTERACTIVE and CG(interactive) 2014-08-25 23:46:43 +02:00
zend_operators.c Fix zend_longo_str 2014-08-25 22:47:04 +02:00
zend_operators.h Fix zend_longo_str 2014-08-25 22:47:04 +02:00
zend_ptr_stack.c
zend_ptr_stack.h
zend_qsort.c master renames phase 6 2014-08-25 21:26:42 +02:00
zend_qsort.h
zend_signal.c
zend_signal.h
zend_sprintf.c
zend_stack.c zend_stack_top() now returns pointer directly 2014-05-01 09:08:30 +02:00
zend_stack.h zend_stack_top() now returns pointer directly 2014-05-01 09:08:30 +02:00
zend_static_allocator.c master renames phase 2 2014-08-25 19:28:33 +02:00
zend_static_allocator.h master renames phase 2 2014-08-25 19:28:33 +02:00
zend_stream.c master renames phase 1 2014-08-25 19:24:55 +02:00
zend_stream.h first shot on merging the core fro the int64 branch 2014-08-16 11:16:11 +02:00
zend_string.c Fix compiler warnings 2014-08-25 23:08:01 +02:00
zend_string.h Add zend_string_equals and zend_string_equals_literal 2014-08-25 22:40:58 +02:00
zend_strtod.c further fixes to ext/standard and zend 2014-08-16 17:31:40 +02:00
zend_strtod.h
zend_ts_hash.c master renames phase 1 2014-08-25 19:24:55 +02:00
zend_ts_hash.h master renames phase 2 2014-08-25 19:28:33 +02:00
zend_types.h renamed macro 2014-08-26 09:55:17 +02:00
zend_variables.c Replaced Zend Memory Manager 2014-08-26 16:21:58 +04:00
zend_variables.h Optimized conditions order 2014-06-03 03:54:03 +04:00
zend_virtual_cwd.c master renames phase 4 2014-08-25 20:57:25 +02:00
zend_virtual_cwd.h master renames phase 1 2014-08-25 19:24:55 +02:00
zend_vm_def.h Fix compiler warnings 2014-08-25 23:08:01 +02:00
zend_vm_execute.h Fix compiler warnings 2014-08-25 23:08:01 +02:00
zend_vm_execute.skl Simplify call-frame handling 2014-07-07 15:50:44 +04:00
zend_vm_gen.php Micro optimization for the main interpreter loop 2014-07-17 11:18:44 +04:00
zend_vm_opcodes.c Implemented builtin instruction for strlen() 2014-07-14 15:43:11 +04:00
zend_vm_opcodes.h Implemented builtin instruction for strlen() 2014-07-14 15:43:11 +04:00
zend_vm.h
zend.c Remove ZEND_ACC_INTERACTIVE and CG(interactive) 2014-08-25 23:46:43 +02:00
Zend.dsp
zend.h Replaced Zend Memory Manager 2014-08-26 16:21:58 +04:00
zend.ico
Zend.m4 master renames phase 1 2014-08-25 19:24:55 +02:00
ZendCore.dep
ZendTS.dsp

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().