php-src/Zend
Anatol Belski 864cd82ace Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  updated NEWS
  refactored the mbstring config.w32
  Update NEWS
  Fixed compilation warnings
  Fixed bug #68504 --with-libmbfl configure option not present on Windows
  Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead.
  the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
  #68446 is fixed
  Reimplemented silence operator (@) handling on exceptions. Now each silence region is stored in op_array->brk_cont_array. On exception ZEND_HANDLE_EXCEPTION handler traverse this array and restore original EG(error_reporting) if exception occured inside a "silence" region.
  remove the NEWS entries for the reverted stuff
  typo fix
  go back with phpdbg to the state of 5.6.3, reverting the controversial commits(remote debugging/xml protocol)
  5.5.21 now
  New label length test
  Fix ext/filter/tests/033.phpt
  Fix filter_list test
  FILTER_VALIDATE_DOMAIN and RFC conformance for FILTER_VALIDATE_URL

Conflicts:
	ext/mbstring/config.w32
2014-11-27 15:59:43 +01:00
..
RFCs
tests Revert NEWS and set test to XFAIL 2014-11-25 12:27:17 +01:00
acinclude.m4
bench.php
build.mk
buildconf
configure.in
header
LICENSE
Makefile.am linux compat for the static tsrm ls cache pointer 2014-10-02 08:45:53 +02:00
Makefile.frag
micro_bench.php
OBJECTS2_HOWTO
README.ZEND_MM
README.ZEND_VM
zend.c Merge remote-tracking branch 'origin/master' into native-tls 2014-10-24 22:28:32 +02:00
zend.h Merge remote-tracking branch 'origin/master' into native-tls 2014-10-24 22:28:32 +02:00
zend.ico
Zend.m4 master renames phase 1 2014-08-25 19:24:55 +02:00
zend_alloc.c Merge remote-tracking branch 'origin/master' into native-tls 2014-11-27 15:59:43 +01:00
zend_alloc.h Added API function to retrive current custom heap handlers 2014-10-14 14:20:25 +04:00
zend_alloc_sizes.h Replaced Zend Memory Manager 2014-08-26 16:21:58 +04:00
zend_API.c Improved object property access. 2014-11-06 14:50:03 +03:00
zend_API.h fix datatype mismatches 2014-10-24 20:50:06 +02:00
zend_arena.h Expose zend_safe_address() and use it in zend_arena_calloc() 2014-09-18 13:31:25 +04:00
zend_ast.c bring back all the TSRMLS_FETCH() stuff 2014-10-15 09:37:55 +02:00
zend_ast.h Merge branch 'coalesce_operator' 2014-09-28 00:07:04 +01:00
zend_build.h
zend_builtin_functions.c Improved object property access. 2014-11-06 14:50:03 +03:00
zend_builtin_functions.h
ZEND_CHANGES typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-19 20:23:00 +00:00
zend_closures.c Remove support for classes without class entries 2014-10-09 13:58:14 +02:00
zend_closures.h Don't allow unbound scoped closures; make ->call used passed object as scope 2014-08-17 23:47:47 +01:00
zend_compile.c Merge remote-tracking branch 'origin/master' into native-tls 2014-11-27 15:59:43 +01:00
zend_compile.h Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead. 2014-11-27 09:56:43 +03:00
zend_config.nw.h
zend_config.w32.h Various fixes to allow support for new VS2014 features 2014-11-05 18:00:09 -05:00
zend_constants.c fix datatype mismatches 2014-10-24 20:50:08 +02:00
zend_constants.h fix REGISTER_NS_*_CONSTANT macros 2014-11-25 08:36:30 +00:00
zend_default_classes.c
zend_dtrace.c
zend_dtrace.d
zend_dtrace.h
zend_errors.h
zend_exceptions.c fixed compilation error 2014-10-20 12:51:02 +04:00
zend_exceptions.h Expose zend_throw_exception_internal() 2014-10-01 16:37:21 +04:00
zend_execute.c Fixed compilation warnings 2014-11-27 12:52:31 +03:00
zend_execute.h Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h 2014-11-25 12:37:46 +03:00
zend_execute_API.c Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
zend_extensions.c Don't anload zend extensions if ZEND_DONT_UNLOAD_MODULES environment variable is set 2014-09-09 00:50:44 +04:00
zend_extensions.h Merge branch 'PHP-5.6' 2014-10-12 19:22:40 +02:00
zend_float.c
zend_float.h Merge branch 'PHP-5.6' 2014-11-23 16:25:10 -08:00
zend_gc.c Fixed compilation warnings 2014-11-27 12:52:31 +03:00
zend_gc.h using pointer to the tsrm ls cache instead of a function call 2014-10-01 22:04:21 +02:00
zend_generators.c Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead. 2014-11-27 09:56:43 +03:00
zend_generators.h master renames phase 1 2014-08-25 19:24:55 +02:00
zend_globals.h Optimized property access handlers. Removed EG(std_property_info). 2014-10-17 19:10:05 +04:00
zend_globals_macros.h using pointer to the tsrm ls cache instead of a function call 2014-10-01 22:04:21 +02:00
zend_hash.c Improved zend_hash_clean() and added new optimized zend_symtable_clean() 2014-11-25 14:17:21 +03:00
zend_hash.h Improved zend_hash_clean() and added new optimized zend_symtable_clean() 2014-11-25 14:17:21 +03:00
zend_highlight.c fix datatype mismatches 2014-10-23 11:45:44 +02:00
zend_highlight.h fix datatype mismatches 2014-10-23 11:45:44 +02:00
zend_indent.c Fixed compilation warnings 2014-11-27 12:52:31 +03:00
zend_indent.h
zend_inheritance.c Fix #68185 - Inconsistent insteadof definition 2014-11-21 16:05:31 +01:00
zend_inheritance.h Added missed mod str 2014-09-20 15:12:08 +08:00
zend_ini.c fix datatype mismatch warnings 2014-10-27 16:38:39 +01:00
zend_ini.h Refactored INI subsystem to use zend_string* instead of char* 2014-09-01 20:57:33 +04:00
zend_ini_parser.y Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
zend_ini_scanner.c fix datatype mismatch warnings 2014-10-29 15:29:59 +01:00
zend_ini_scanner.h Making ini parser typed 2014-09-01 22:04:06 +08:00
zend_ini_scanner.l fix datatype mismatch warnings 2014-10-29 15:29:59 +01:00
zend_ini_scanner_defs.h
zend_interfaces.c fix signature, zend_string is used for function name 2014-10-28 17:24:58 +01:00
zend_interfaces.h fix signature, zend_string is used for function name 2014-10-28 17:24:58 +01:00
zend_istdiostream.h
zend_iterators.c Remove Z_OBJ_CLASS_NAME_P 2014-10-09 20:48:27 +02:00
zend_iterators.h Optimized FE_RESET and FE_FETCH 2014-09-16 01:34:27 +04:00
zend_language_parser.y Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
zend_language_scanner.c fix datatype mismatch warnings 2014-10-29 15:29:59 +01:00
zend_language_scanner.h
zend_language_scanner.l fix datatype mismatch warnings 2014-10-29 15:29:59 +01:00
zend_language_scanner_defs.h Remove <% and <script language="php"> tags 2014-10-05 21:57:05 +02:00
zend_list.c bring back all the TSRMLS_FETCH() stuff 2014-10-15 09:37:55 +02:00
zend_list.h
zend_llist.c fix datatype mismatches 2014-10-27 16:38:40 +01:00
zend_llist.h fix datatype mismatches 2014-10-27 16:38:40 +01:00
zend_long.h Moved some definitions from zend.h into more suitable header files 2014-09-18 04:58:04 +04:00
zend_modules.h increment Zend module API number 2014-10-01 17:14:53 +02:00
zend_multibyte.c Fixed mode 2014-08-14 23:54:32 +04:00
zend_multibyte.h
zend_multiply.h Fix allocator for 64bit zend_long with 32bit long 2014-10-16 12:42:23 +02:00
zend_object_handlers.c Reuse zend_assign_to_variable() in zend_std_write_property() 2014-11-24 20:33:27 +03:00
zend_object_handlers.h Optimized property access handlers. Removed EG(std_property_info). 2014-10-17 19:10:05 +04:00
zend_objects.c Added new optimized zend_array_destroy() function 2014-11-25 12:58:29 +03:00
zend_objects.h
zend_objects_API.c Remove proxy object implementation 2014-10-09 14:01:08 +02:00
zend_objects_API.h Fix ZTS build 2014-10-02 21:58:29 +02:00
zend_opcode.c Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead. 2014-11-27 09:56:43 +03:00
zend_operators.c fix datatype mismatches 2014-10-27 16:38:41 +01:00
zend_operators.h Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators 2014-10-21 03:24:20 +04:00
zend_portability.h added comment 2014-11-14 17:39:39 +01:00
zend_ptr_stack.c
zend_ptr_stack.h Changed "inline" into "zend_always_inline" 2014-09-18 04:59:01 +04:00
zend_qsort.c master renames phase 6 2014-08-25 21:26:42 +02:00
zend_qsort.h
zend_signal.c bring back all the TSRMLS_FETCH() stuff 2014-10-15 09:37:55 +02:00
zend_signal.h using pointer to the tsrm ls cache instead of a function call 2014-10-01 22:04:21 +02:00
zend_smart_str.h Add smart_str_append for appending zend_strings 2014-09-21 20:58:31 +02:00
zend_smart_str_public.h Move smart_str implementation into Zend/ 2014-09-21 20:49:39 +02:00
zend_sprintf.c
zend_stack.c reworked the patch, less new stuff but worky 2014-09-25 18:48:27 +02:00
zend_stack.h
zend_stream.c data type fixes 2014-08-29 12:53:37 +02:00
zend_stream.h reduce size by 8 byte on 64 bit 2014-09-12 22:06:10 +02:00
zend_string.c fix the empty_strings SAPI shutdown leak in TS build 2014-10-06 15:48:55 +02:00
zend_string.h fix the empty_strings SAPI shutdown leak in TS build 2014-10-06 15:48:55 +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 convert API for size_t where zend_string is used under the hood 2014-10-28 17:24:59 +01:00
zend_ts_hash.h convert API for size_t where zend_string is used under the hood 2014-10-28 17:24:59 +01:00
zend_types.h Reorder fields for most often access pattern 2014-11-17 14:06:50 +03:00
zend_variables.c Improved zend_hash_clean() and added new optimized zend_symtable_clean() 2014-11-25 14:17:21 +03:00
zend_variables.h Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h 2014-11-25 12:37:46 +03:00
zend_virtual_cwd.c fix datatype mismatches 2014-11-18 13:19:49 +01:00
zend_virtual_cwd.h Merge remote-tracking branch 'origin/master' into native-tls 2014-10-03 20:30:49 +02:00
zend_vm.h Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them. 2014-10-31 10:08:17 -07:00
zend_vm_def.h Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead. 2014-11-27 09:56:43 +03:00
zend_vm_execute.h Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead. 2014-11-27 09:56:43 +03:00
zend_vm_execute.skl Merged EX(frame_kind) and EX(flags) into single word 2014-10-07 17:12:12 +04:00
zend_vm_gen.php Merge branch 'PHP-5.6' 2014-11-23 16:25:10 -08:00
zend_vm_opcodes.c Fixed list() behavior inconsistency (string handling is disabled for all cases, ArrayAccess objects handling is enabled for all cases, ZEND_FETCH_DIM_TMP_VAR opcode is renamed into ZEND_FETCH_LIST, ZEND_FETCH_ADD_LOCK flag is removed). 2014-10-05 13:02:58 +04:00
zend_vm_opcodes.h Merge branch 'PHP-5.6' 2014-11-23 16:25:10 -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().