mirror of
https://github.com/php/php-src.git
synced 2024-09-25 03:47:26 +00:00
9a20323e19
See https://wiki.php.net/rfc/expectations Squashed commit of the following: commit3f3651a787
Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Mar 2 11:56:33 2015 +0300 opcode 137 is used for ZEND_OP_DATA and con't be reused for ZEND_ASSERT_CHECK commitca8ecabf2a
Merge:24328ac
9dac923
Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Mar 2 10:49:23 2015 +0300 Merge branch 'master' into assert * master: Update NEWS Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize) windows only test Align entries format Align entries format for 5.6.7 Align entries format for 5.5.23 Bump header year Fixed bug #69144 (strtr not replacing with partly matching replace pairs) Fixed test? Revert mktime()/gmmktime()'s arginfo Update NEWS Fixed bug #69141 Missing arguments in reflection info for some builtin functions Add NEWS entry Remove useless date warning Fix ARG_INFO for levenshtein Fix ARG_INFO for levenshtein fix dir separator in tests Update NEWS Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()). commit24328ac03f
Merge:021fd94
1cdee9a
Author: Dmitry Stogov <dmitry@zend.com> Date: Fri Feb 27 15:57:13 2015 +0300 Merge branch 'master' into assert * master: Fixed C++ support Fixed bug #69115 crash in mail Reorder Update NEWs Fixed bug #69121 (Segfault in get_current_user when script owner is not in passwd with ZTS build) Update News Fixed bug #69125 (Array numeric string as key) fix bug#68942's patch Fixed ability to build unspecialized executor Fixed bug #69124 (method name could not be used when by ref) Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). commit021fd94ed1
Merge:49963eb
ace1f82
Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Feb 26 11:26:03 2015 +0300 Merge branch 'master' into assert * master: (59 commits) Improved ASSIGN_DIM handler Don't inline slow path Revert a part committted by mistake Fixed compilation warnings Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). better name Improve fix for #69038 Update NEWs Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage) Added specialized versions of DO_FCALL handler: DO_ICALL - for internal functions DO_UCALL - for user functions DO_FCALL_BY_NAME - plain, most probably user, funcstions (not methods) Use cache_slot offsets instead of indexes (simplify run-time instructions) Split INIT_FCALL_BY_NAME inti INIT_FCALL_BY_NAME(CONST+STRING) and INIT_DYNAMIC_CALL(CONST-STRING|TMPVAR|CV) Support list($a, $b) = $a Avoid unnecassary check Make zend_array_destroy() to free the corresponding zend_array Eliminate check on the fast path Make current() and key() receive argument by value. Use Firebird default home folder, replace Interbase with Firebird Updated NEWS updated NEWS ... Conflicts: Zend/zend_vm_execute.h Zend/zend_vm_opcodes.c Zend/zend_vm_opcodes.h commit49963ebf9d
Merge:07b1f92
6b77959
Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Feb 19 11:13:08 2015 +0300 Merge branch 'master' into assert * master: Implemented AST pretty-printer update NEWS to match the actual stuff in 5.6.6 update NEWS to match the actual stuff in 5.5.22 update NEWS(add missing entry for the enchant fix, and reorder the entries a bit) fix typo in bug# update NEWS fix email format update NEWS update 5.6.6 release date in NEWS Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI) BFN fix test fix test fix test Fixed bug #65593 (Segfault when calling ob_start from output buffering callback) Updated NEWS add CVE 5.4.39 next Fix associativity to match Perl Blast off to space. Conflicts: Zend/zend_ast.c commit07b1f92ed6
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 23:06:32 2015 +0300 fixed pretty-printer (support for "elseif") commit5a976c8d85
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 19:50:08 2015 +0300 Fixed vaeious ptetty-printer issues commit69491e8e8e
Merge:8473157
3ddc246
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 10:18:32 2015 +0300 Merge branch 'master' into assert * master: Set PHP_JSON_VERSION to 1.4.0 Remove unnecessary resource checks in openssl ext JSON is now maintained commit8473157fbb
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 10:17:26 2015 +0300 Fixed typo and white spaces commit96de5ffc8d
Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Feb 18 00:28:39 2015 +0300 Fixed assert() in namesapaces commit5eba069c28
Merge:4a2d9c0
d428bf2
Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Feb 17 22:45:55 2015 +0300 Merge branch 'master' into assert * master: (25 commits) improve debugability in TS debug builds More UPGRADING, in particular on foreach Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) for master Replace var is introduced abstain from using xmlCleanupParser fix TS build Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) update news Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) Port for for bug #68552 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) Update NEWS Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) - BFN Don't read the local php.ini when Generating Phar When building phar shared, you can end up loading a previous phar.so that isn't compatible with the php cli being used to generate Phar here. - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support) Delete json outdated package.xml made ZEND_TSRMLS_CACHE_* macros look like function calls - Fix merge - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de ... commit4a2d9c0953
Author: Dmitry Stogov <dmitry@zend.com> Date: Tue Feb 17 22:45:10 2015 +0300 Implemented AST pretty-printer to capture expression passed to assert() commit7a059b66d5
Merge:9973df7
3892eba
Author: Dmitry Stogov <dmitry@zend.com> Date: Mon Feb 16 18:42:28 2015 +0300 Merge branch 'expect' of github.com:krakjoe/php-src into assert * 'expect' of github.com:krakjoe/php-src: import expect Conflicts: Zend/zend_compile.c Zend/zend_execute_API.c Zend/zend_globals.h Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_opcodes.c Zend/zend_vm_opcodes.h ext/opcache/Optimizer/block_pass.c ext/opcache/Optimizer/pass1_5.c ext/standard/assert.c ext/standard/tests/assert/assert_error3.phpt commit3892eba2bf
Author: krakjoe <joe.watkins@live.co.uk> Date: Sun Feb 2 12:49:35 2014 +0000 import expect
196 lines
9.3 KiB
C
196 lines
9.3 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| Zend Engine |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 2.00 of the Zend license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.zend.com/license/2_00.txt. |
|
|
| If you did not receive a copy of the Zend license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@zend.com so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Andi Gutmans <andi@zend.com> |
|
|
| Zeev Suraski <zeev@zend.com> |
|
|
| Dmitry Stogov <dmitry@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifndef ZEND_VM_OPCODES_H
|
|
#define ZEND_VM_OPCODES_H
|
|
|
|
BEGIN_EXTERN_C()
|
|
|
|
ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);
|
|
|
|
END_EXTERN_C()
|
|
|
|
#define ZEND_NOP 0
|
|
#define ZEND_ADD 1
|
|
#define ZEND_SUB 2
|
|
#define ZEND_MUL 3
|
|
#define ZEND_DIV 4
|
|
#define ZEND_MOD 5
|
|
#define ZEND_SL 6
|
|
#define ZEND_SR 7
|
|
#define ZEND_CONCAT 8
|
|
#define ZEND_BW_OR 9
|
|
#define ZEND_BW_AND 10
|
|
#define ZEND_BW_XOR 11
|
|
#define ZEND_BW_NOT 12
|
|
#define ZEND_BOOL_NOT 13
|
|
#define ZEND_BOOL_XOR 14
|
|
#define ZEND_IS_IDENTICAL 15
|
|
#define ZEND_IS_NOT_IDENTICAL 16
|
|
#define ZEND_IS_EQUAL 17
|
|
#define ZEND_IS_NOT_EQUAL 18
|
|
#define ZEND_IS_SMALLER 19
|
|
#define ZEND_IS_SMALLER_OR_EQUAL 20
|
|
#define ZEND_CAST 21
|
|
#define ZEND_QM_ASSIGN 22
|
|
#define ZEND_ASSIGN_ADD 23
|
|
#define ZEND_ASSIGN_SUB 24
|
|
#define ZEND_ASSIGN_MUL 25
|
|
#define ZEND_ASSIGN_DIV 26
|
|
#define ZEND_ASSIGN_MOD 27
|
|
#define ZEND_ASSIGN_SL 28
|
|
#define ZEND_ASSIGN_SR 29
|
|
#define ZEND_ASSIGN_CONCAT 30
|
|
#define ZEND_ASSIGN_BW_OR 31
|
|
#define ZEND_ASSIGN_BW_AND 32
|
|
#define ZEND_ASSIGN_BW_XOR 33
|
|
#define ZEND_PRE_INC 34
|
|
#define ZEND_PRE_DEC 35
|
|
#define ZEND_POST_INC 36
|
|
#define ZEND_POST_DEC 37
|
|
#define ZEND_ASSIGN 38
|
|
#define ZEND_ASSIGN_REF 39
|
|
#define ZEND_ECHO 40
|
|
#define ZEND_JMP 42
|
|
#define ZEND_JMPZ 43
|
|
#define ZEND_JMPNZ 44
|
|
#define ZEND_JMPZNZ 45
|
|
#define ZEND_JMPZ_EX 46
|
|
#define ZEND_JMPNZ_EX 47
|
|
#define ZEND_CASE 48
|
|
#define ZEND_BRK 50
|
|
#define ZEND_CONT 51
|
|
#define ZEND_BOOL 52
|
|
#define ZEND_ADD_CHAR 54
|
|
#define ZEND_ADD_STRING 55
|
|
#define ZEND_ADD_VAR 56
|
|
#define ZEND_BEGIN_SILENCE 57
|
|
#define ZEND_END_SILENCE 58
|
|
#define ZEND_INIT_FCALL_BY_NAME 59
|
|
#define ZEND_DO_FCALL 60
|
|
#define ZEND_INIT_FCALL 61
|
|
#define ZEND_RETURN 62
|
|
#define ZEND_RECV 63
|
|
#define ZEND_RECV_INIT 64
|
|
#define ZEND_SEND_VAL 65
|
|
#define ZEND_SEND_VAR_EX 66
|
|
#define ZEND_SEND_REF 67
|
|
#define ZEND_NEW 68
|
|
#define ZEND_INIT_NS_FCALL_BY_NAME 69
|
|
#define ZEND_FREE 70
|
|
#define ZEND_INIT_ARRAY 71
|
|
#define ZEND_ADD_ARRAY_ELEMENT 72
|
|
#define ZEND_INCLUDE_OR_EVAL 73
|
|
#define ZEND_UNSET_VAR 74
|
|
#define ZEND_UNSET_DIM 75
|
|
#define ZEND_UNSET_OBJ 76
|
|
#define ZEND_FE_RESET_R 77
|
|
#define ZEND_FE_FETCH_R 78
|
|
#define ZEND_EXIT 79
|
|
#define ZEND_FETCH_R 80
|
|
#define ZEND_FETCH_DIM_R 81
|
|
#define ZEND_FETCH_OBJ_R 82
|
|
#define ZEND_FETCH_W 83
|
|
#define ZEND_FETCH_DIM_W 84
|
|
#define ZEND_FETCH_OBJ_W 85
|
|
#define ZEND_FETCH_RW 86
|
|
#define ZEND_FETCH_DIM_RW 87
|
|
#define ZEND_FETCH_OBJ_RW 88
|
|
#define ZEND_FETCH_IS 89
|
|
#define ZEND_FETCH_DIM_IS 90
|
|
#define ZEND_FETCH_OBJ_IS 91
|
|
#define ZEND_FETCH_FUNC_ARG 92
|
|
#define ZEND_FETCH_DIM_FUNC_ARG 93
|
|
#define ZEND_FETCH_OBJ_FUNC_ARG 94
|
|
#define ZEND_FETCH_UNSET 95
|
|
#define ZEND_FETCH_DIM_UNSET 96
|
|
#define ZEND_FETCH_OBJ_UNSET 97
|
|
#define ZEND_FETCH_LIST 98
|
|
#define ZEND_FETCH_CONSTANT 99
|
|
#define ZEND_GOTO 100
|
|
#define ZEND_EXT_STMT 101
|
|
#define ZEND_EXT_FCALL_BEGIN 102
|
|
#define ZEND_EXT_FCALL_END 103
|
|
#define ZEND_EXT_NOP 104
|
|
#define ZEND_TICKS 105
|
|
#define ZEND_SEND_VAR_NO_REF 106
|
|
#define ZEND_CATCH 107
|
|
#define ZEND_THROW 108
|
|
#define ZEND_FETCH_CLASS 109
|
|
#define ZEND_CLONE 110
|
|
#define ZEND_RETURN_BY_REF 111
|
|
#define ZEND_INIT_METHOD_CALL 112
|
|
#define ZEND_INIT_STATIC_METHOD_CALL 113
|
|
#define ZEND_ISSET_ISEMPTY_VAR 114
|
|
#define ZEND_ISSET_ISEMPTY_DIM_OBJ 115
|
|
#define ZEND_SEND_VAL_EX 116
|
|
#define ZEND_SEND_VAR 117
|
|
#define ZEND_INIT_USER_CALL 118
|
|
#define ZEND_SEND_ARRAY 119
|
|
#define ZEND_SEND_USER 120
|
|
#define ZEND_STRLEN 121
|
|
#define ZEND_DEFINED 122
|
|
#define ZEND_TYPE_CHECK 123
|
|
#define ZEND_VERIFY_RETURN_TYPE 124
|
|
#define ZEND_FE_RESET_RW 125
|
|
#define ZEND_FE_FETCH_RW 126
|
|
#define ZEND_FE_FREE 127
|
|
#define ZEND_INIT_DYNAMIC_CALL 128
|
|
#define ZEND_DO_ICALL 129
|
|
#define ZEND_DO_UCALL 130
|
|
#define ZEND_DO_FCALL_BY_NAME 131
|
|
#define ZEND_PRE_INC_OBJ 132
|
|
#define ZEND_PRE_DEC_OBJ 133
|
|
#define ZEND_POST_INC_OBJ 134
|
|
#define ZEND_POST_DEC_OBJ 135
|
|
#define ZEND_ASSIGN_OBJ 136
|
|
#define ZEND_INSTANCEOF 138
|
|
#define ZEND_DECLARE_CLASS 139
|
|
#define ZEND_DECLARE_INHERITED_CLASS 140
|
|
#define ZEND_DECLARE_FUNCTION 141
|
|
#define ZEND_DECLARE_CONST 143
|
|
#define ZEND_ADD_INTERFACE 144
|
|
#define ZEND_DECLARE_INHERITED_CLASS_DELAYED 145
|
|
#define ZEND_VERIFY_ABSTRACT_CLASS 146
|
|
#define ZEND_ASSIGN_DIM 147
|
|
#define ZEND_ISSET_ISEMPTY_PROP_OBJ 148
|
|
#define ZEND_HANDLE_EXCEPTION 149
|
|
#define ZEND_USER_OPCODE 150
|
|
#define ZEND_ASSERT_CHECK 151
|
|
#define ZEND_JMP_SET 152
|
|
#define ZEND_DECLARE_LAMBDA_FUNCTION 153
|
|
#define ZEND_ADD_TRAIT 154
|
|
#define ZEND_BIND_TRAITS 155
|
|
#define ZEND_SEPARATE 156
|
|
#define ZEND_DISCARD_EXCEPTION 159
|
|
#define ZEND_YIELD 160
|
|
#define ZEND_GENERATOR_RETURN 161
|
|
#define ZEND_FAST_CALL 162
|
|
#define ZEND_FAST_RET 163
|
|
#define ZEND_RECV_VARIADIC 164
|
|
#define ZEND_SEND_UNPACK 165
|
|
#define ZEND_POW 166
|
|
#define ZEND_ASSIGN_POW 167
|
|
#define ZEND_BIND_GLOBAL 168
|
|
#define ZEND_COALESCE 169
|
|
#define ZEND_SPACESHIP 170
|
|
|
|
#endif
|