diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-13 14:17:28 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-13 14:17:28 +0200 |
commit | 37c329d7153b65fd2430fa42e8af8e8a0cbc0a41 (patch) | |
tree | 7041c722228f74286b96c50fc834652f0c29156f /Zend | |
parent | 6c2c7dabee006fa735307d92bb223a1fa3d47414 (diff) | |
download | php-git-37c329d7153b65fd2430fa42e8af8e8a0cbc0a41.tar.gz |
Trim trailing whitespace in source code files
Diffstat (limited to 'Zend')
-rw-r--r-- | Zend/LICENSE | 24 | ||||
-rw-r--r-- | Zend/README.ZEND_VM | 16 | ||||
-rw-r--r-- | Zend/bench.php | 10 | ||||
-rw-r--r-- | Zend/build.mk | 2 | ||||
-rw-r--r-- | Zend/micro_bench.php | 6 | ||||
-rw-r--r-- | Zend/zend_ini_parser.y | 2 | ||||
-rw-r--r-- | Zend/zend_vm_trace_map.h | 1 |
7 files changed, 30 insertions, 31 deletions
diff --git a/Zend/LICENSE b/Zend/LICENSE index 8acb9af4f8..51f5cccde9 100644 --- a/Zend/LICENSE +++ b/Zend/LICENSE @@ -1,25 +1,25 @@ --------------------------------------------------------------------- +-------------------------------------------------------------------- The Zend Engine License, Version 2.00 Copyright (c) 1999-2006 Zend Technologies Ltd. All rights reserved. --------------------------------------------------------------------- +-------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + 3. The names "Zend" and "Zend Engine" must not be used to endorse or promote products derived from this software without prior permission from Zend Technologies Ltd. For written permission, - please contact license@zend.com. - + please contact license@zend.com. + 4. Zend Technologies Ltd. may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. @@ -40,9 +40,9 @@ are met: software must display the following acknowledgment: "The Zend Engine is freely available at http://www.zend.com" -THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ZEND TECHNOLOGIES LTD. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT @@ -53,4 +53,4 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- +-------------------------------------------------------------------- diff --git a/Zend/README.ZEND_VM b/Zend/README.ZEND_VM index 2cd5dfc520..b05b7ccc9a 100644 --- a/Zend/README.ZEND_VM +++ b/Zend/README.ZEND_VM @@ -21,7 +21,7 @@ ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>) <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 +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 @@ -34,9 +34,9 @@ EXECUTE_DATA execute_data ZEND_VM_DISPATCH_TO_HANDLER(<OP>) return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) -ZEND_VM_DISPATCH_TO_HELPER(<NAME>) +ZEND_VM_DISPATCH_TO_HELPER(<NAME>) return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) -ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) +ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) ZEND_VM_CONTINUE() return 0 @@ -72,7 +72,7 @@ FREE_OP<X>_VAR_PTR() FREE_VAR_PTR(free_op<X>) -Executor's helpers can be defined without parameters or with one parameter. +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>) @@ -86,13 +86,13 @@ ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>) } 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 +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 +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 diff --git a/Zend/bench.php b/Zend/bench.php index f76bb3f2bd..a6c0c6daed 100644 --- a/Zend/bench.php +++ b/Zend/bench.php @@ -5,18 +5,18 @@ if (function_exists("date_default_timezone_set")) { function simple() { $a = 0; - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) $a++; $thisisanotherlongname = 0; - for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) + for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) $thisisanotherlongname++; } /****/ function simplecall() { - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) strlen("hallo"); } @@ -26,14 +26,14 @@ function hallo($a) { } function simpleucall() { - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) hallo("hallo"); } /****/ function simpleudcall() { - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) hallo2("hallo"); } diff --git a/Zend/build.mk b/Zend/build.mk index 53e7849cf9..ef14b65e65 100644 --- a/Zend/build.mk +++ b/Zend/build.mk @@ -32,7 +32,7 @@ aclocal.m4: configure.ac acinclude.m4 aclocal $(config_h_in): configure.ac -# explicitly remove target since autoheader does not seem to work +# explicitly remove target since autoheader does not seem to work # correctly otherwise (timestamps are not updated) @rm -f $@ autoheader diff --git a/Zend/micro_bench.php b/Zend/micro_bench.php index c9ea19e263..42f1110c88 100644 --- a/Zend/micro_bench.php +++ b/Zend/micro_bench.php @@ -4,12 +4,12 @@ function hallo() { } function simpleucall($n) { - for ($i = 0; $i < $n; $i++) + for ($i = 0; $i < $n; $i++) hallo(); } function simpleudcall($n) { - for ($i = 0; $i < $n; $i++) + for ($i = 0; $i < $n; $i++) hallo2(); } @@ -17,7 +17,7 @@ function hallo2() { } function simpleicall($n) { - for ($i = 0; $i < $n; $i++) + for ($i = 0; $i < $n; $i++) func_num_args(); } diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index 10dda5f836..15fd742d4f 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -128,7 +128,7 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) } } op1_len = (int)Z_STRLEN_P(op1); - + if (Z_TYPE_P(op2) != IS_STRING) { convert_to_string(op2); } diff --git a/Zend/zend_vm_trace_map.h b/Zend/zend_vm_trace_map.h index a5da487611..70b00556f4 100644 --- a/Zend/zend_vm_trace_map.h +++ b/Zend/zend_vm_trace_map.h @@ -79,4 +79,3 @@ static void zend_vm_trace_init(void) } zend_hash_destroy(&vm_trace_ht); } -
\ No newline at end of file |