diff options
| author | Nikita Popov <nikic@php.net> | 2016-01-21 21:13:43 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-01-21 21:15:05 +0100 |
| commit | 9b57e0729865cfdec88b0ad8dd19b6b02dc6b8b5 (patch) | |
| tree | fc7b86f3c391d52866129db79b4c7c7115f1193f /Zend/zend_vm_opcodes.h | |
| parent | 64cb71cc8b7aef9c9600c1e4add4cabbdc16408b (diff) | |
| download | php-git-9b57e0729865cfdec88b0ad8dd19b6b02dc6b8b5.tar.gz | |
Consolidate op1/op2 vm flags
Diffstat (limited to 'Zend/zend_vm_opcodes.h')
| -rw-r--r-- | Zend/zend_vm_opcodes.h | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index 1b23b76516..768dbb87c8 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -28,30 +28,18 @@ #define ZEND_VM_KIND_GOTO 3 #define ZEND_VM_KIND ZEND_VM_KIND_CALL -#define ZEND_VM_OP1_SPEC 0x00000001 -#define ZEND_VM_OP1_CONST 0x00000002 -#define ZEND_VM_OP1_TMPVAR 0x00000004 -#define ZEND_VM_OP1_MASK 0x000000f0 -#define ZEND_VM_OP1_NUM 0x00000010 -#define ZEND_VM_OP1_JMP_ADDR 0x00000020 -#define ZEND_VM_OP1_TRY_CATCH 0x00000030 -#define ZEND_VM_OP1_LIVE_RANGE 0x00000040 -#define ZEND_VM_OP1_THIS 0x00000050 -#define ZEND_VM_OP1_NEXT 0x00000060 -#define ZEND_VM_OP1_CLASS_FETCH 0x00000070 -#define ZEND_VM_OP1_CONSTRUCTOR 0x00000080 -#define ZEND_VM_OP2_SPEC 0x00000100 -#define ZEND_VM_OP2_CONST 0x00000200 -#define ZEND_VM_OP2_TMPVAR 0x00000400 -#define ZEND_VM_OP2_MASK 0x0000f000 -#define ZEND_VM_OP2_NUM 0x00001000 -#define ZEND_VM_OP2_JMP_ADDR 0x00002000 -#define ZEND_VM_OP2_TRY_CATCH 0x00003000 -#define ZEND_VM_OP2_LIVE_RANGE 0x00004000 -#define ZEND_VM_OP2_THIS 0x00005000 -#define ZEND_VM_OP2_NEXT 0x00006000 -#define ZEND_VM_OP2_CLASS_FETCH 0x00007000 -#define ZEND_VM_OP2_CONSTRUCTOR 0x00008000 +#define ZEND_VM_OP_SPEC 0x00000001 +#define ZEND_VM_OP_CONST 0x00000002 +#define ZEND_VM_OP_TMPVAR 0x00000004 +#define ZEND_VM_OP_MASK 0x000000f0 +#define ZEND_VM_OP_NUM 0x00000010 +#define ZEND_VM_OP_JMP_ADDR 0x00000020 +#define ZEND_VM_OP_TRY_CATCH 0x00000030 +#define ZEND_VM_OP_LIVE_RANGE 0x00000040 +#define ZEND_VM_OP_THIS 0x00000050 +#define ZEND_VM_OP_NEXT 0x00000060 +#define ZEND_VM_OP_CLASS_FETCH 0x00000070 +#define ZEND_VM_OP_CONSTRUCTOR 0x00000080 #define ZEND_VM_EXT_VAR_FETCH 0x00010000 #define ZEND_VM_EXT_ISSET 0x00020000 #define ZEND_VM_EXT_ARG_NUM 0x00040000 @@ -69,6 +57,8 @@ #define ZEND_VM_EXT_FAST_RET 0x0a000000 #define ZEND_VM_EXT_SRC 0x0b000000 #define ZEND_VM_EXT_SEND 0x0c000000 +#define ZEND_VM_OP1_FLAGS(flags) (flags & 0xff) +#define ZEND_VM_OP2_FLAGS(flags) ((flags >> 8) & 0xff) BEGIN_EXTERN_C() |