diff options
Diffstat (limited to 'Zend/zend_vm_opcodes.h')
| -rw-r--r-- | Zend/zend_vm_opcodes.h | 68 |
1 files changed, 30 insertions, 38 deletions
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index a738bf8184..d06f44e889 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -59,7 +59,7 @@ #define ZEND_VM_EXT_NUM 0x01000000 #define ZEND_VM_EXT_LAST_CATCH 0x02000000 #define ZEND_VM_EXT_JMP_ADDR 0x03000000 -#define ZEND_VM_EXT_DIM_OBJ 0x04000000 +#define ZEND_VM_EXT_OP 0x04000000 #define ZEND_VM_EXT_TYPE 0x07000000 #define ZEND_VM_EXT_EVAL 0x08000000 #define ZEND_VM_EXT_TYPE_MASK 0x09000000 @@ -98,26 +98,26 @@ END_EXTERN_C() #define ZEND_IS_NOT_EQUAL 19 #define ZEND_IS_SMALLER 20 #define ZEND_IS_SMALLER_OR_EQUAL 21 -#define ZEND_ASSIGN_ADD 22 -#define ZEND_ASSIGN_SUB 23 -#define ZEND_ASSIGN_MUL 24 -#define ZEND_ASSIGN_DIV 25 -#define ZEND_ASSIGN_MOD 26 -#define ZEND_ASSIGN_SL 27 -#define ZEND_ASSIGN_SR 28 -#define ZEND_ASSIGN_CONCAT 29 -#define ZEND_ASSIGN_BW_OR 30 -#define ZEND_ASSIGN_BW_AND 31 -#define ZEND_ASSIGN_BW_XOR 32 -#define ZEND_ASSIGN_POW 33 +#define ZEND_ASSIGN 22 +#define ZEND_ASSIGN_DIM 23 +#define ZEND_ASSIGN_OBJ 24 +#define ZEND_ASSIGN_STATIC_PROP 25 +#define ZEND_ASSIGN_OP 26 +#define ZEND_ASSIGN_DIM_OP 27 +#define ZEND_ASSIGN_OBJ_OP 28 +#define ZEND_ASSIGN_STATIC_PROP_OP 29 +#define ZEND_ASSIGN_REF 30 +#define ZEND_QM_ASSIGN 31 +#define ZEND_ASSIGN_OBJ_REF 32 +#define ZEND_ASSIGN_STATIC_PROP_REF 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_QM_ASSIGN 41 +#define ZEND_PRE_INC_STATIC_PROP 38 +#define ZEND_PRE_DEC_STATIC_PROP 39 +#define ZEND_POST_INC_STATIC_PROP 40 +#define ZEND_POST_DEC_STATIC_PROP 41 #define ZEND_JMP 42 #define ZEND_JMPZ 43 #define ZEND_JMPNZ 44 @@ -212,23 +212,26 @@ END_EXTERN_C() #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_ECHO 136 #define ZEND_OP_DATA 137 #define ZEND_INSTANCEOF 138 #define ZEND_GENERATOR_CREATE 139 #define ZEND_MAKE_REF 140 #define ZEND_DECLARE_FUNCTION 141 -#define ZEND_YIELD_FROM 142 +#define ZEND_DECLARE_LAMBDA_FUNCTION 142 #define ZEND_DECLARE_CONST 143 #define ZEND_DECLARE_CLASS 144 #define ZEND_DECLARE_CLASS_DELAYED 145 -#define ZEND_ASSIGN_DIM 147 +#define ZEND_DECLARE_ANON_CLASS 146 +#define ZEND_ADD_ARRAY_UNPACK 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_UNSET_CV 153 +#define ZEND_ISSET_ISEMPTY_CV 154 +#define ZEND_FETCH_LIST_W 155 #define ZEND_SEPARATE 156 #define ZEND_FETCH_CLASS_NAME 157 #define ZEND_CALL_TRAMPOLINE 158 @@ -239,10 +242,13 @@ END_EXTERN_C() #define ZEND_FAST_RET 163 #define ZEND_RECV_VARIADIC 164 #define ZEND_SEND_UNPACK 165 +#define ZEND_YIELD_FROM 166 +#define ZEND_COPY_TMP 167 #define ZEND_BIND_GLOBAL 168 #define ZEND_COALESCE 169 #define ZEND_SPACESHIP 170 -#define ZEND_DECLARE_ANON_CLASS 171 +#define ZEND_FUNC_NUM_ARGS 171 +#define ZEND_FUNC_GET_ARGS 172 #define ZEND_FETCH_STATIC_PROP_R 173 #define ZEND_FETCH_STATIC_PROP_W 174 #define ZEND_FETCH_STATIC_PROP_RW 175 @@ -264,22 +270,8 @@ END_EXTERN_C() #define ZEND_GET_CLASS 191 #define ZEND_GET_CALLED_CLASS 192 #define ZEND_GET_TYPE 193 -#define ZEND_FUNC_NUM_ARGS 194 -#define ZEND_FUNC_GET_ARGS 195 -#define ZEND_UNSET_CV 196 -#define ZEND_ISSET_ISEMPTY_CV 197 -#define ZEND_FETCH_LIST_W 198 -#define ZEND_ARRAY_KEY_EXISTS 199 -#define ZEND_PRE_INC_STATIC_PROP 200 -#define ZEND_PRE_DEC_STATIC_PROP 201 -#define ZEND_POST_INC_STATIC_PROP 202 -#define ZEND_POST_DEC_STATIC_PROP 203 -#define ZEND_ASSIGN_OBJ_REF 204 -#define ZEND_ASSIGN_STATIC_PROP 205 -#define ZEND_ASSIGN_STATIC_PROP_REF 206 -#define ZEND_COPY_TMP 207 -#define ZEND_ADD_ARRAY_UNPACK 208 +#define ZEND_ARRAY_KEY_EXISTS 194 -#define ZEND_VM_LAST_OPCODE 208 +#define ZEND_VM_LAST_OPCODE 194 #endif |