php-src/Zend
Stanislav Malyshev b187c35f23 Merge branch 'pull-request/54'
* pull-request/54:
  Allow arbitrary expressions for empty()

    This change is as per RFC https://wiki.php.net/rfc/empty_isset_exprs.

    The change allows passing the result of function calls and other
    expressions to the empty() language construct. This is accomplished by
    simply rewriting empty(expr) to !expr.

    The change does not affect the suppression of errors when using empty()
    on variables. empty($undefinedVar) will continue not to throw errors.
    When an expression is used inside empty() on the other hand, errors will
    not be suppressed. Thus empty($undefinedVar + $somethingElse) *will*
    throw a notice.

    The change also does not make empty() into a real function, so using
    'empty' as a callback is still not possible.

    In addition to the empty() changes the commit adds nicer error messages
    when isset() is used on function call results or other expressions.
2012-05-24 14:18:12 -05:00
..
RFCs Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
tests Merge branch 'pull-request/54' 2012-05-24 14:18:12 -05:00
acinclude.m4 - Added Bison 2.5 to bison_version_list 2011-06-12 17:26:45 +00:00
bench.php Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties 2010-05-24 14:11:39 +00:00
build.mk Get rid of autoconf warnings 2011-05-16 00:14:47 +00:00
buildconf
ChangeLog
configure.in Get rid of autoconf warnings 2011-05-16 00:14:47 +00:00
header Year++ 2010-01-11 03:01:19 +00:00
LICENSE
Makefile.am Zend Signal Handling 2011-06-22 14:23:21 +00:00
Makefile.frag
micro_bench.php Improved ternary operator performance when returning arrays 2011-10-18 19:42:42 +00:00
OBJECTS2_HOWTO
README.ZEND_MM Fixed version numbers. 2012-03-06 18:34:10 +00:00
README.ZEND_VM
zend_alloc.c add support for the alloc_size __attribute__ (through ZEND_ATTRIBUTE_ALLOC_SIZE and ZEND_ATTRIBUTE_ALLOC_SIZE2 2012-05-23 22:18:01 -04:00
zend_alloc.h add support for the alloc_size __attribute__ (through ZEND_ATTRIBUTE_ALLOC_SIZE and ZEND_ATTRIBUTE_ALLOC_SIZE2 2012-05-23 22:18:01 -04:00
zend_API.c Copy default properties of internal classes for different threads 2012-04-11 19:21:41 -07:00
zend_API.h - Year++ 2012-01-01 13:15:04 +00:00
zend_build.h - Year++ 2012-01-01 13:15:04 +00:00
zend_builtin_functions.c Implemented FR #60738 (Allow 'set_error_handler' to handle NULL) 2012-03-24 19:41:11 +08:00
zend_builtin_functions.h - Year++ 2012-01-01 13:15:04 +00:00
ZEND_CHANGES
zend_closures.c - Year++ 2012-01-01 13:15:04 +00:00
zend_closures.h - Year++ 2012-01-01 13:15:04 +00:00
zend_compile.c Merge branch 'pull-request/54' 2012-05-24 14:18:12 -05:00
zend_compile.h Cleanup useless function declaration for traits 2012-05-11 16:52:12 +08:00
zend_config.nw.h - Year++ 2012-01-01 13:15:04 +00:00
zend_config.w32.h - Year++ 2012-01-01 13:15:04 +00:00
zend_constants.c Improved traits implementation. Now to support __CLASS__ constant in traits php doesn't have to copy the complete compiled method, but can reuse the same code. The resolution of __CLASS__ constants in methods defined in traits are delayed till run-time. This approach also made possible to use __CLASS__ constant as default value for traits properties and method arguments. 2012-01-17 08:09:13 +00:00
zend_constants.h - Year++ 2012-01-01 13:15:04 +00:00
zend_default_classes.c - Year++ 2012-01-01 13:15:04 +00:00
zend_dtrace.c Add DTrace probes 2010-04-24 13:32:30 +00:00
zend_dtrace.d Add DTrace probes 2010-04-24 13:32:30 +00:00
zend_dtrace.h Add DTrace probes 2010-04-24 13:32:30 +00:00
zend_dynamic_array.c - Year++ 2012-01-01 13:15:04 +00:00
zend_dynamic_array.h - Year++ 2012-01-01 13:15:04 +00:00
zend_errors.h - Year++ 2012-01-01 13:15:04 +00:00
zend_exceptions.c Fixed bug #60569 (Nullbyte truncates Exception $message). 2012-03-11 18:15:13 +00:00
zend_exceptions.h - Year++ 2012-01-01 13:15:04 +00:00
zend_execute_API.c Typo when merging from trunk 2012-03-11 15:31:19 +00:00
zend_execute.c Merge branch 'PHP-5.3' into PHP-5.4 2012-05-12 13:19:55 +08:00
zend_execute.h - Year++ 2012-01-01 13:15:04 +00:00
zend_extensions.c - Year++ 2012-01-01 13:15:04 +00:00
zend_extensions.h - Year++ 2012-01-01 13:15:04 +00:00
zend_float.c - Year++ 2012-01-01 13:15:04 +00:00
zend_float.h - Year++ 2012-01-01 13:15:04 +00:00
zend_gc.c - Year++ 2012-01-01 13:15:04 +00:00
zend_gc.h - Year++ 2012-01-01 13:15:04 +00:00
zend_globals_macros.h - Year++ 2012-01-01 13:15:04 +00:00
zend_globals.h - Year++ 2012-01-01 13:15:04 +00:00
zend_hash.c - Year++ 2012-01-01 13:15:04 +00:00
zend_hash.h - Year++ 2012-01-01 13:15:04 +00:00
zend_highlight.c - Year++ 2012-01-01 13:15:04 +00:00
zend_highlight.h - Year++ 2012-01-01 13:15:04 +00:00
zend_indent.c - Year++ 2012-01-01 13:15:04 +00:00
zend_indent.h - Year++ 2012-01-01 13:15:04 +00:00
zend_ini_parser.y - Year++ 2012-01-01 13:15:04 +00:00
zend_ini_scanner_defs.h MFH: Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode) 2012-03-02 03:52:06 +00:00
zend_ini_scanner.c MFH: Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode) 2012-03-02 03:52:06 +00:00
zend_ini_scanner.h - Year++ 2012-01-01 13:15:04 +00:00
zend_ini_scanner.l MFH: Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode) 2012-03-02 03:52:06 +00:00
zend_ini.c - Year++ 2012-01-01 13:15:04 +00:00
zend_ini.h - Year++ 2012-01-01 13:15:04 +00:00
zend_interfaces.c Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 2012-05-03 18:40:57 +08:00
zend_interfaces.h - Year++ 2012-01-01 13:15:04 +00:00
zend_istdiostream.h - Year++ 2012-01-01 13:15:04 +00:00
zend_iterators.c - Year++ 2012-01-01 13:15:04 +00:00
zend_iterators.h - Year++ 2012-01-01 13:15:04 +00:00
zend_language_parser.y Allow arbitrary expressions for empty() 2012-05-13 14:56:51 +02:00
zend_language_scanner_defs.h - Regenerated files 2012-04-30 15:57:09 -03:00
zend_language_scanner.c - Regenerated files 2012-04-30 15:57:09 -03:00
zend_language_scanner.h - Year++ 2012-01-01 13:15:04 +00:00
zend_language_scanner.l Merge branch 'PHP-5.4' 2012-04-30 15:56:15 -03:00
zend_list.c - Year++ 2012-01-01 13:15:04 +00:00
zend_list.h - Year++ 2012-01-01 13:15:04 +00:00
zend_llist.c - Year++ 2012-01-01 13:15:04 +00:00
zend_llist.h - Year++ 2012-01-01 13:15:04 +00:00
zend_modules.h - Year++ 2012-01-01 13:15:04 +00:00
zend_multibyte.c Use free instead of efree 2012-05-21 19:02:45 +08:00
zend_multibyte.h - Year++ 2012-01-01 13:15:04 +00:00
zend_multiply.h - Year++ 2012-01-01 13:15:04 +00:00
zend_object_handlers.c fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-14 11:03:21 -07:00
zend_object_handlers.h fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-14 11:03:21 -07:00
zend_objects_API.c - Year++ 2012-01-01 13:15:04 +00:00
zend_objects_API.h - Year++ 2012-01-01 13:15:04 +00:00
zend_objects.c fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-14 11:03:21 -07:00
zend_objects.h - Year++ 2012-01-01 13:15:04 +00:00
zend_opcode.c Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution) 2012-05-21 13:57:41 +04:00
zend_operators.c Fixed bug #62097 2012-05-23 18:55:36 -05:00
zend_operators.h fix bug #54547 2012-05-14 11:03:20 -07:00
zend_ptr_stack.c - Year++ 2012-01-01 13:15:04 +00:00
zend_ptr_stack.h - Year++ 2012-01-01 13:15:04 +00:00
zend_qsort.c - Year++ 2012-01-01 13:15:04 +00:00
zend_qsort.h - Year++ 2012-01-01 13:15:04 +00:00
zend_signal.c Expose zend_signal_handler_unblock() to DSO extensions to allow usage of HANDLE_UNBLOCK_INTERRUPTIONS macro 2011-12-02 12:14:16 +00:00
zend_signal.h Fixed bug #60627 (httpd.worker segfault on startup with php_value) 2012-01-04 08:25:06 +00:00
zend_sprintf.c - Year++ 2012-01-01 13:15:04 +00:00
zend_stack.c - Year++ 2012-01-01 13:15:04 +00:00
zend_stack.h - Year++ 2012-01-01 13:15:04 +00:00
zend_static_allocator.c - Year++ 2012-01-01 13:15:04 +00:00
zend_static_allocator.h - Year++ 2012-01-01 13:15:04 +00:00
zend_stream.c - Year++ 2012-01-01 13:15:04 +00:00
zend_stream.h - Year++ 2012-01-01 13:15:04 +00:00
zend_string.c - Year++ 2012-01-01 13:15:04 +00:00
zend_string.h - Year++ 2012-01-01 13:15:04 +00:00
zend_strtod.c Fixed Bug #55649 (Undefined function Bug()). (Laruence) 2011-09-13 07:07:06 +00:00
zend_strtod.h - Year++ 2012-01-01 13:15:04 +00:00
zend_ts_hash.c - Year++ 2012-01-01 13:15:04 +00:00
zend_ts_hash.h - Year++ 2012-01-01 13:15:04 +00:00
zend_types.h - Year++ 2012-01-01 13:15:04 +00:00
zend_variables.c - Year++ 2012-01-01 13:15:04 +00:00
zend_variables.h - Year++ 2012-01-01 13:15:04 +00:00
zend_vm_def.h fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-14 11:03:21 -07:00
zend_vm_execute.h fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-14 11:03:21 -07:00
zend_vm_execute.skl - Improved memory usage 2010-09-15 07:38:52 +00:00
zend_vm_gen.php - Year++ 2012-01-01 13:15:04 +00:00
zend_vm_opcodes.h - Year++ 2012-01-01 13:15:04 +00:00
zend_vm.h - Year++ 2012-01-01 13:15:04 +00:00
zend.c Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config) 2012-05-03 22:39:53 +08:00
Zend.dsp - not used anymore 2010-09-15 16:58:11 +00:00
zend.h add support for the alloc_size __attribute__ (through ZEND_ATTRIBUTE_ALLOC_SIZE and ZEND_ATTRIBUTE_ALLOC_SIZE2 2012-05-23 22:18:01 -04:00
zend.ico
Zend.m4 make ZEND_SIGNALS configurable, off by default 2012-02-16 01:51:45 +00:00
ZendCore.dep
ZendTS.dsp - not used anymore 2010-09-15 16:58:11 +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 callls 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().