php-src/Zend
Stefan Marr b501570ab0 Added traits test cases. No engine changes for now. [TRAITS]
#Getting accustomed to the infrastructure.
#Any comments are welcome, especially with regard to syntax and keywords.
2010-04-15 21:39:20 +00:00
..
RFCs this one is declined 2004-01-09 18:55:49 +00:00
tests Added traits test cases. No engine changes for now. [TRAITS] 2010-04-15 21:39:20 +00:00
acconfig.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
acinclude.m4 2.4.1 is safe 2009-02-14 21:08:02 +00:00
bench.php MFH: Fix date warning by setting the default timezone to UTC 2009-07-13 23:56:38 +00:00
build.mk
buildconf
ChangeLog ChangeLog update 2005-08-06 05:37:51 +00:00
configure.in - Rewrite scanner to be based on re2c instead of flex 2008-03-16 21:06:55 +00:00
header Year++ 2010-01-11 03:01:19 +00:00
LICENSE - More -> 2006 changes 2006-01-05 02:34:02 +00:00
Makefile.am Fixed floating point mathematic speed degradation (Christian) 2009-03-18 10:18:10 +00:00
Makefile.frag - Fix dependency 2005-01-25 10:39:49 +00:00
OBJECTS2_HOWTO - modifyable -> modifiable 2004-04-12 12:22:26 +00:00
README.ZEND_MM MFH 2007-07-19 13:57:16 +00:00
README.ZEND_VM Nuked DOS EOLs 2005-08-03 13:29:00 +00:00
zend_alloc.c - try again to get a crypto context when the key container did not exist (which is likely to be the case, on a 1st call) 2010-02-01 14:56:51 +00:00
zend_alloc.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_API.c - those are in 5.3.2 now, merge to 5.3.2 section is coming 2010-02-11 21:17:13 +00:00
zend_API.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_build.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_builtin_functions.c - Fixed bug #50383 (Exceptions thrown in __call / __callStatic do not include file and line in trace) 2010-03-07 02:17:11 +00:00
zend_builtin_functions.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
ZEND_CHANGES Add some information about array overloading 2004-08-30 18:48:52 +00:00
zend_closures.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_closures.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_compile.c change namespaced ctors - only __construct would work 2010-04-04 23:28:20 +00:00
zend_compile.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_config.nw.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_config.w32.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_constants.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_constants.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_default_classes.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_dynamic_array.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_dynamic_array.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_errors.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_exceptions.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_exceptions.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_execute_API.c fix #51394 - try harder to find script lineno when exception happens 2010-04-01 19:36:56 +00:00
zend_execute.c - Ensure that stderr output are not buffered, portability for tests 2010-01-25 14:47:19 +00:00
zend_execute.h Fixed bug #50723 (Bug in garbage collector causes crash) 2010-02-02 12:32:29 +00:00
zend_extensions.c - Ensure that stderr output are not buffered, portability for tests 2010-01-25 14:47:19 +00:00
zend_extensions.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_fast_cache.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_float.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_float.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_gc.c fix #49192 - crash in GC when get_properties handler returns null 2010-04-01 22:54:03 +00:00
zend_gc.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_globals_macros.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_globals.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_hash.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_hash.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_highlight.c - Reverted r296062 and r296065 2010-03-12 10:28:59 +00:00
zend_highlight.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_indent.c - Reverted r296062 and r296065 2010-03-12 10:28:59 +00:00
zend_indent.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_ini_parser.y sed -i "s#1998-2009#1998-2010#g" **/*.re **/*.y **/*.l 2010-01-05 20:40:23 +00:00
zend_ini_scanner_defs.h touch 2010-02-07 11:42:52 +00:00
zend_ini_scanner.c touch 2010-02-07 11:42:52 +00:00
zend_ini_scanner.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_ini_scanner.l - Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files) 2010-02-07 11:40:29 +00:00
zend_ini.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_ini.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_interfaces.c Remove trailing dots 2010-02-02 04:49:02 +00:00
zend_interfaces.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_istdiostream.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_iterators.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_iterators.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_language_parser.y sed -i "s#1998-2009#1998-2010#g" **/*.re **/*.y **/*.l 2010-01-05 20:40:23 +00:00
zend_language_scanner_defs.h - those are in 5.3.2 now, merge to 5.3.2 section is coming 2010-02-11 21:17:13 +00:00
zend_language_scanner.c - those are in 5.3.2 now, merge to 5.3.2 section is coming 2010-02-11 21:17:13 +00:00
zend_language_scanner.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_language_scanner.l sed -i "s#1998-2009#1998-2010#g" **/*.re **/*.y **/*.l 2010-01-05 20:40:23 +00:00
zend_list.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_list.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_llist.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_llist.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_modules.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_multibyte.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_multibyte.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_multiply.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_object_handlers.c - Fixed bug #51176 (Static calling in non-static method behaves like $this->) 2010-03-02 00:16:40 +00:00
zend_object_handlers.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_objects_API.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_objects_API.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_objects.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_objects.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_opcode.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_operators.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_operators.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_ptr_stack.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_ptr_stack.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_qsort.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_qsort.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_sprintf.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_stack.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_stack.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_static_allocator.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_static_allocator.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_stream.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_stream.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_strtod.c Fixed floating point mathematic speed degradation (Christian) 2009-03-18 10:18:10 +00:00
zend_strtod.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_ts_hash.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_ts_hash.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_types.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_variables.c Fixed bug #50519 (segfault in garbage collection when using set_error_handler and DomDocument) 2010-01-11 10:07:10 +00:00
zend_variables.h Fixed bug #50519 (segfault in garbage collection when using set_error_handler and DomDocument) 2010-01-11 10:07:10 +00:00
zend_vm_def.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_vm_execute.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_vm_execute.skl Fixed bug #46074 (Bus error during running PHP CLI under IRIX 6.5.30) 2009-09-03 14:33:11 +00:00
zend_vm_gen.php sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_vm_opcodes.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend_vm.h sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
zend.c sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
Zend.dsp Fixed floating point mathematic speed degradation (Christian) 2009-03-18 10:18:10 +00:00
zend.h Add some const declarations, makes C++ extension writers happy 2010-03-30 23:14:19 +00:00
zend.ico
Zend.m4 Set session.entropy_file to /dev/urandom or /dev/arandom by 2010-03-31 18:03:17 +00:00
ZendCore.dep
ZendTS.dsp Added support for lambda functions and closures 2008-07-14 09:49:03 +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().