com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_v m_gen.php Zend/zend_vm_opcodes.h
| From: | Bob Weinand | Date: | Sat, 21 Dec 2013 18:31:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_v m_gen.php Zend/zend_vm_opcodes.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75376@lists.php.net to get a copy of this message | ||
Commit: 9b4b5fa737ec8a63b073af7afeec8d26aa2bccf1
Author: Bob Weinand <bobwei9@hotmail.com> Sat, 21 Dec 2013 19:31:27 +0100
Parents: 794df91c3599fccaf62359ed144c7f616f8209f2 b52c300ecad2637732551b45f0819f2d7cb3ccf1
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9b4b5fa737ec8a63b073af7afeec8d26aa2bccf1
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM Zend/zend_vm_gen.php
MM Zend/zend_vm_opcodes.h
Diff:
diff --cc Zend/zend_vm_opcodes.h
index 7624ec1,2ca7f84..663e216
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -164,4 -167,172 +167,174 @@@
#define ZEND_GENERATOR_RETURN 161
#define ZEND_FAST_CALL 162
#define ZEND_FAST_RET 163
+#define ZEND_RECV_VARIADIC 164
+
+ const char *zend_vm_opcodes_map[] = {
+ "ZEND_NOP",
+ "ZEND_ADD",
+ "ZEND_SUB",
+ "ZEND_MUL",
+ "ZEND_DIV",
+ "ZEND_MOD",
+ "ZEND_SL",
+ "ZEND_SR",
+ "ZEND_CONCAT",
+ "ZEND_BW_OR",
+ "ZEND_BW_AND",
+ "ZEND_BW_XOR",
+ "ZEND_BW_NOT",
+ "ZEND_BOOL_NOT",
+ "ZEND_BOOL_XOR",
+ "ZEND_IS_IDENTICAL",
+ "ZEND_IS_NOT_IDENTICAL",
+ "ZEND_IS_EQUAL",
+ "ZEND_IS_NOT_EQUAL",
+ "ZEND_IS_SMALLER",
+ "ZEND_IS_SMALLER_OR_EQUAL",
+ "ZEND_CAST",
+ "ZEND_QM_ASSIGN",
+ "ZEND_ASSIGN_ADD",
+ "ZEND_ASSIGN_SUB",
+ "ZEND_ASSIGN_MUL",
+ "ZEND_ASSIGN_DIV",
+ "ZEND_ASSIGN_MOD",
+ "ZEND_ASSIGN_SL",
+ "ZEND_ASSIGN_SR",
+ "ZEND_ASSIGN_CONCAT",
+ "ZEND_ASSIGN_BW_OR",
+ "ZEND_ASSIGN_BW_AND",
+ "ZEND_ASSIGN_BW_XOR",
+ "ZEND_PRE_INC",
+ "ZEND_PRE_DEC",
+ "ZEND_POST_INC",
+ "ZEND_POST_DEC",
+ "ZEND_ASSIGN",
+ "ZEND_ASSIGN_REF",
+ "ZEND_ECHO",
+ "ZEND_PRINT",
+ "ZEND_JMP",
+ "ZEND_JMPZ",
+ "ZEND_JMPNZ",
+ "ZEND_JMPZNZ",
+ "ZEND_JMPZ_EX",
+ "ZEND_JMPNZ_EX",
+ "ZEND_CASE",
+ "ZEND_SWITCH_FREE",
+ "ZEND_BRK",
+ "ZEND_CONT",
+ "ZEND_BOOL",
+ "ZEND_INIT_STRING",
+ "ZEND_ADD_CHAR",
+ "ZEND_ADD_STRING",
+ "ZEND_ADD_VAR",
+ "ZEND_BEGIN_SILENCE",
+ "ZEND_END_SILENCE",
+ "ZEND_INIT_FCALL_BY_NAME",
+ "ZEND_DO_FCALL",
+ "ZEND_DO_FCALL_BY_NAME",
+ "ZEND_RETURN",
+ "ZEND_RECV",
+ "ZEND_RECV_INIT",
+ "ZEND_SEND_VAL",
+ "ZEND_SEND_VAR",
+ "ZEND_SEND_REF",
+ "ZEND_NEW",
+ "ZEND_INIT_NS_FCALL_BY_NAME",
+ "ZEND_FREE",
+ "ZEND_INIT_ARRAY",
+ "ZEND_ADD_ARRAY_ELEMENT",
+ "ZEND_INCLUDE_OR_EVAL",
+ "ZEND_UNSET_VAR",
+ "ZEND_UNSET_DIM",
+ "ZEND_UNSET_OBJ",
+ "ZEND_FE_RESET",
+ "ZEND_FE_FETCH",
+ "ZEND_EXIT",
+ "ZEND_FETCH_R",
+ "ZEND_FETCH_DIM_R",
+ "ZEND_FETCH_OBJ_R",
+ "ZEND_FETCH_W",
+ "ZEND_FETCH_DIM_W",
+ "ZEND_FETCH_OBJ_W",
+ "ZEND_FETCH_RW",
+ "ZEND_FETCH_DIM_RW",
+ "ZEND_FETCH_OBJ_RW",
+ "ZEND_FETCH_IS",
+ "ZEND_FETCH_DIM_IS",
+ "ZEND_FETCH_OBJ_IS",
+ "ZEND_FETCH_FUNC_ARG",
+ "ZEND_FETCH_DIM_FUNC_ARG",
+ "ZEND_FETCH_OBJ_FUNC_ARG",
+ "ZEND_FETCH_UNSET",
+ "ZEND_FETCH_DIM_UNSET",
+ "ZEND_FETCH_OBJ_UNSET",
+ "ZEND_FETCH_DIM_TMP_VAR",
+ "ZEND_FETCH_CONSTANT",
+ "ZEND_GOTO",
+ "ZEND_EXT_STMT",
+ "ZEND_EXT_FCALL_BEGIN",
+ "ZEND_EXT_FCALL_END",
+ "ZEND_EXT_NOP",
+ "ZEND_TICKS",
+ "ZEND_SEND_VAR_NO_REF",
+ "ZEND_CATCH",
+ "ZEND_THROW",
+ "ZEND_FETCH_CLASS",
+ "ZEND_CLONE",
+ "ZEND_RETURN_BY_REF",
+ "ZEND_INIT_METHOD_CALL",
+ "ZEND_INIT_STATIC_METHOD_CALL",
+ "ZEND_ISSET_ISEMPTY_VAR",
+ "ZEND_ISSET_ISEMPTY_DIM_OBJ",
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ "ZEND_PRE_INC_OBJ",
+ "ZEND_PRE_DEC_OBJ",
+ "ZEND_POST_INC_OBJ",
+ "ZEND_POST_DEC_OBJ",
+ "ZEND_ASSIGN_OBJ",
+ NULL,
+ "ZEND_INSTANCEOF",
+ "ZEND_DECLARE_CLASS",
+ "ZEND_DECLARE_INHERITED_CLASS",
+ "ZEND_DECLARE_FUNCTION",
+ "ZEND_RAISE_ABSTRACT_ERROR",
+ "ZEND_DECLARE_CONST",
+ "ZEND_ADD_INTERFACE",
+ "ZEND_DECLARE_INHERITED_CLASS_DELAYED",
+ "ZEND_VERIFY_ABSTRACT_CLASS",
+ "ZEND_ASSIGN_DIM",
+ "ZEND_ISSET_ISEMPTY_PROP_OBJ",
+ "ZEND_HANDLE_EXCEPTION",
+ "ZEND_USER_OPCODE",
+ NULL,
+ "ZEND_JMP_SET",
+ "ZEND_DECLARE_LAMBDA_FUNCTION",
+ "ZEND_ADD_TRAIT",
+ "ZEND_BIND_TRAITS",
+ "ZEND_SEPARATE",
+ "ZEND_QM_ASSIGN_VAR",
+ "ZEND_JMP_SET_VAR",
+ "ZEND_DISCARD_EXCEPTION",
+ "ZEND_YIELD",
+ "ZEND_GENERATOR_RETURN",
+ "ZEND_FAST_CALL",
+ "ZEND_FAST_RET",
++ "ZEND_RECV_VARIADIC",
+ };
+
+ #endif