diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-10-29 09:15:37 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-10-30 07:18:44 +0300 |
| commit | 5c65fc29adce41c4a33ff8def971de96ad01d5dc (patch) | |
| tree | 676827c85878efee1c06728a9fd81bee5d43c81f /Zend/zend_vm_opcodes.h | |
| parent | d83600a2d5d40b1785a0bbe5188f626c736ec93f (diff) | |
| download | php-git-5c65fc29adce41c4a33ff8def971de96ad01d5dc.tar.gz | |
Fixed few issues:
- Added ZEND_VM_LAST_OPCODE macro
- Use better names LINE->OPLINE, REL_LINE->REL_OPLINE, FCALL->FAST_CALL, FRET->FAST_RET
- Added ISSET flag to extended value of ZEND_ISSET_ISEMPTY_VAR opcode
Diffstat (limited to 'Zend/zend_vm_opcodes.h')
| -rw-r--r-- | Zend/zend_vm_opcodes.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index 72a04699e0..2eab6e7585 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -33,17 +33,17 @@ #define ZEND_VM_OP1_TMPVAR 0x00000004 #define ZEND_VM_OP1_NUM 0x00000008 #define ZEND_VM_OP1_ADDR 0x00000010 -#define ZEND_VM_OP1_LINE 0x00000020 +#define ZEND_VM_OP1_OPLINE 0x00000020 #define ZEND_VM_OP2_SPEC 0x00000100 #define ZEND_VM_OP2_CONST 0x00000200 #define ZEND_VM_OP2_TMPVAR 0x00000400 #define ZEND_VM_OP2_NUM 0x00000800 #define ZEND_VM_OP2_ADDR 0x00001000 -#define ZEND_VM_OP2_LINE 0x00002000 +#define ZEND_VM_OP2_OPLINE 0x00002000 #define ZEND_VM_EXT_NUM 0x00010000 #define ZEND_VM_EXT_VAR 0x00020000 -#define ZEND_VM_EXT_LINE 0x00040000 -#define ZEND_VM_EXT_REL_LINE 0x00080000 +#define ZEND_VM_EXT_OPLINE 0x00040000 +#define ZEND_VM_EXT_REL_OPLINE 0x00080000 #define ZEND_VM_EXT_DIM_OBJ 0x00100000 #define ZEND_VM_EXT_CLASS_FETCH 0x00200000 #define ZEND_VM_EXT_CONST_FETCH 0x00400000 @@ -51,8 +51,8 @@ #define ZEND_VM_EXT_ARRAY_INIT 0x01000000 #define ZEND_VM_EXT_TYPE 0x02000000 #define ZEND_VM_EXT_EVAL 0x04000000 -#define ZEND_VM_EXT_FCALL 0x08000000 -#define ZEND_VM_EXT_FRET 0x10000000 +#define ZEND_VM_EXT_FAST_CALL 0x08000000 +#define ZEND_VM_EXT_FAST_RET 0x10000000 #define ZEND_VM_EXT_ISSET 0x20000000 BEGIN_EXTERN_C() @@ -240,4 +240,6 @@ END_EXTERN_C() #define ZEND_ISSET_ISEMPTY_STATIC_PROP 180 #define ZEND_FETCH_CLASS_CONSTANT 181 +#define ZEND_VM_LAST_OPCODE 181 + #endif |