php-src/Zend
Stanislav Malyshev 4d0565b5ba Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix #72519, possible OOB using imagegif
  fix #72512, invalid read or write for palette image when invalid transparent index is used
  Apparently some envs miss SIZE_MAX
  Fix tests
  Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
  Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
  Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
  Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
  Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
  Fix bug #72562 - destroy var_hash properly
  Fix bug #72533 (locale_accept_from_http out-of-bounds access)
  Fix fir bug #72520
  Fix for bug #72513
  CS fix and comments with bug ID
  Fix for HTTP_PROXY issue.
  add tests for bug #72512
  Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access
  Fixed bug #72479 - same as #72434

Conflicts:
	ext/bz2/bz2.c
	main/SAPI.c
	main/php_variables.c
2016-07-19 00:53:08 -07:00
..
RFCs fixed typo and few grammar mistakes 2013-10-17 22:00:40 -04:00
tests Revert "Fixed bug #72286 (Segmentation fault During Garbage Collection)" 2016-07-16 23:02:23 +02:00
acinclude.m4 Merge branch 'PHP-5.4' into PHP-5.5 2013-10-19 13:27:36 +08:00
bench.php
build.mk
buildconf
configure.in
header
LICENSE
Makefile.am Merge branch 'PHP-5.5' into PHP-5.6 2013-12-22 13:11:20 +00:00
Makefile.frag
micro_bench.php
OBJECTS2_HOWTO
README.ZEND_MM
README.ZEND_VM typo fixes 2013-07-15 00:23:03 -07:00
zend_alloc.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_alloc.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_API.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_API.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ast.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ast.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_build.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_builtin_functions.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_builtin_functions.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
ZEND_CHANGES less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
zend_closures.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_closures.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_compile.c Don't enforce LSP if prototype method is private 2016-07-05 14:30:22 +02:00
zend_compile.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_config.nw.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_config.w32.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_constants.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_constants.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_default_classes.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_dtrace.c Merge branch 'PHP-5.4' into PHP-5.5 2013-08-23 13:28:59 +02:00
zend_dtrace.d
zend_dtrace.h
zend_dynamic_array.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_dynamic_array.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_errors.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_exceptions.c backport to 5.6 (we should not unset the default value) 2016-07-12 12:14:45 +08:00
zend_exceptions.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_execute_API.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_execute.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_execute.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_extensions.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_extensions.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_float.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_float.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_gc.c Revert "Fixed bug #72286 (Segmentation fault During Garbage Collection)" 2016-07-16 23:02:23 +02:00
zend_gc.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_generators.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_generators.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_globals_macros.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_globals.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_hash.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_hash.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_highlight.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_highlight.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_indent.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_indent.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ini_parser.y bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ini_scanner_defs.h Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l) 2015-10-20 13:20:56 +08:00
zend_ini_scanner.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ini_scanner.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ini_scanner.l bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ini.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ini.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_interfaces.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_interfaces.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_istdiostream.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_iterators.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_iterators.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_language_parser.y bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08: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 bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_language_scanner.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_language_scanner.l bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_list.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_list.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_llist.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_llist.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_modules.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_multibyte.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_multibyte.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_multiply.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_object_handlers.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_object_handlers.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_objects_API.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_objects_API.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_objects.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_objects.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_opcode.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_operators.c Merge branch 'PHP-5.5' into PHP-5.6.22 2016-05-24 16:56:36 -07:00
zend_operators.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ptr_stack.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ptr_stack.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_qsort.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_qsort.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_signal.c Revert commit to zend signal by mistake 2015-03-05 19:04:43 +08:00
zend_signal.h
zend_sprintf.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_stack.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_stack.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_static_allocator.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_static_allocator.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_stream.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_stream.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_string.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_string.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_strtod.c Fixed bug #72172 (zend_hex_strtod should not use strlen) 2016-05-06 23:52:06 -07:00
zend_strtod.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ts_hash.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_ts_hash.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_types.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_variables.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_variables.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_virtual_cwd.c Merge branch 'PHP-5.5' into PHP-5.6 2016-07-19 00:53:08 -07:00
zend_virtual_cwd.h Happy new year (Update copyright to 2016) 2016-01-01 19:23:04 +02:00
zend_vm_def.h Fixed bug #71841 (EG(error_zval) is not handled well) 2016-03-17 15:16:47 +08:00
zend_vm_execute.h Fixed bug #71841 (EG(error_zval) is not handled well) 2016-03-17 15:16:47 +08:00
zend_vm_execute.skl
zend_vm_gen.php bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_vm_opcodes.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_vm_opcodes.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend_vm.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend.c bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
Zend.dsp fix *.dsp files related to bug #50333 2014-01-28 13:09:29 +01:00
zend.h bump year which is missed in rev 49493a2 2016-01-02 17:51:24 +08:00
zend.ico
Zend.m4
ZendCore.dep
ZendTS.dsp Merge branch 'PHP-5.5' into PHP-5.6 2013-12-22 13:11:20 +00: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 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().