Changeset 344 for eaccelerator/trunk/opcodes.c
- Timestamp:
- 06/19/08 18:01:31 (6 months ago)
- Files:
-
- eaccelerator/trunk/opcodes.c (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
eaccelerator/trunk/opcodes.c
r340 r344 36 36 #endif 37 37 38 #ifdef ZEND_ENGINE_2 39 # define OP1_VAR_2 OP1_STD 40 #else 41 # define OP1_VAR_2 OP1_VAR 42 #endif 38 #define OP1_VAR_2 OP1_STD 43 39 44 40 #define LAST_OPCODE (sizeof(opcodes)/sizeof(opcodes[0])) … … 68 64 OPDEF("CAST", EXT_CAST | OP1_STD | OP2_UNUSED | RES_TMP), /* 21 */ 69 65 OPDEF("QM_ASSIGN", EXT_UNUSED | OP1_STD | OP2_UNUSED | RES_TMP), /* 22 */ 70 #ifdef ZEND_ENGINE_271 66 OPDEF("ASSIGN_ADD", EXT_ASSIGN | OP1_STD | OP2_STD | RES_VAR), /* 23 */ 72 67 OPDEF("ASSIGN_SUB", EXT_ASSIGN | OP1_STD | OP2_STD | RES_VAR), /* 24 */ … … 80 75 OPDEF("ASSIGN_BW_AND", EXT_ASSIGN | OP1_STD | OP2_STD | RES_VAR), /* 32 */ 81 76 OPDEF("ASSIGN_BW_XOR", EXT_ASSIGN | OP1_STD | OP2_STD | RES_VAR), /* 33 */ 82 #else83 OPDEF("ASSIGN_ADD", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 23 */84 OPDEF("ASSIGN_SUB", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 24 */85 OPDEF("ASSIGN_MUL", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 25 */86 OPDEF("ASSIGN_DIV", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 26 */87 OPDEF("ASSIGN_MOD", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 27 */88 OPDEF("ASSIGN_SL", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 28 */89 OPDEF("ASSIGN_SR", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 29 */90 OPDEF("ASSIGN_CONCAT", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 30 */91 OPDEF("ASSIGN_BW_OR", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 31 */92 OPDEF("ASSIGN_BW_AND", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 32 */93 OPDEF("ASSIGN_BW_XOR", EXT_UNUSED | OP1_VAR | OP2_STD | RES_VAR), /* 33 */94 #endif95 77 OPDEF("PRE_INC", EXT_UNUSED | OP1_VAR | OP2_UNUSED | RES_VAR), /* 34 */ 96 78 OPDEF("PRE_DEC", EXT_UNUSED | OP1_VAR | OP2_UNUSED | RES_VAR), /* 35 */ … … 101 83 OPDEF("ECHO", EXT_UNUSED | OP1_STD | OP2_UNUSED | RES_UNUSED), /* 40 */ 102 84 OPDEF("PRINT", EXT_UNUSED | OP1_STD | OP2_UNUSED | RES_TMP), /* 41 */ 103 #ifdef ZEND_ENGINE_2104 85 OPDEF("JMP", EXT_UNUSED | OP1_JMPADDR| OP2_UNUSED | RES_UNUSED), /* 42 */ 105 86 OPDEF("JMPZ", EXT_UNUSED | OP1_STD | OP2_JMPADDR| RES_UNUSED), /* 43 */ 106 87 OPDEF("JMPNZ", EXT_UNUSED | OP1_STD | OP2_JMPADDR| RES_UNUSED), /* 44 */ 107 #else108 OPDEF("JMP", EXT_UNUSED | OP1_OPLINE | OP2_UNUSED | RES_UNUSED), /* 42 */109 OPDEF("JMPZ", EXT_UNUSED | OP1_STD | OP2_OPLINE | RES_UNUSED), /* 43 */110 OPDEF("JMPNZ", EXT_UNUSED | OP1_STD | OP2_OPLINE | RES_UNUSED), /* 44 */111 #endif112 88 OPDEF("JMPZNZ", EXT_OPLINE | OP1_STD | OP2_OPLINE | RES_UNUSED), /* 45 */ 113 #ifdef ZEND_ENGINE_2114 89 OPDEF("JMPZ_EX", EXT_UNUSED | OP1_STD | OP2_JMPADDR| RES_TMP), /* 46 */ 115 90 OPDEF("JMPNZ_EX", EXT_UNUSED | OP1_STD | OP2_JMPADDR| RES_TMP), /* 47 */ 116 #else117 OPDEF("JMPZ_EX", EXT_UNUSED | OP1_STD | OP2_OPLINE | RES_TMP), /* 46 */118 OPDEF("JMPNZ_EX", EXT_UNUSED | OP1_STD | OP2_OPLINE | RES_TMP), /* 47 */119 #endif120 91 OPDEF("CASE", EXT_UNUSED | OP1_STD | OP2_STD | RES_TMP), /* 48 */ 121 92 OPDEF("SWITCH_FREE", EXT_BIT | OP1_STD | OP2_UNUSED | RES_UNUSED), /* 49 */ … … 130 101 OPDEF("END_SILENCE", EXT_UNUSED | OP1_TMP | OP2_UNUSED | RES_UNUSED), /* 58 */ 131 102 OPDEF("INIT_FCALL_BY_NAME", EXT_INIT_FCALL | OP1_STD | OP2_STD | RES_UNUSED), /* 59 */ 132 #ifdef ZEND_ENGINE_2133 103 OPDEF("DO_FCALL", EXT_FCALL | OP1_STD | OP2_OPLINE | RES_VAR), /* 60 */ 134 104 OPDEF("DO_FCALL_BY_NAME", EXT_FCALL | OP1_STD | OP2_OPLINE | RES_VAR), /* 61 */ 135 #else136 OPDEF("DO_FCALL", EXT_FCALL | OP1_STD | OP2_UNUSED | RES_VAR), /* 60 */137 OPDEF("DO_FCALL_BY_NAME", EXT_FCALL | OP1_STD | OP2_UNUSED | RES_VAR), /* 61 */138 #endif139 105 OPDEF("RETURN", EXT_UNUSED | OP1_STD | OP2_UNUSED | RES_UNUSED), /* 62 */ 140 106 OPDEF("RECV", EXT_UNUSED | OP1_ARG | OP2_UNUSED | RES_VAR), /* 63 */ … … 143 109 OPDEF("SEND_VAR", EXT_SEND | OP1_VAR | OP2_ARG | RES_UNUSED), /* 66 */ 144 110 OPDEF("SEND_REF", EXT_SEND | OP1_VAR | OP2_ARG | RES_UNUSED), /* 67 */ 145 #ifdef ZEND_ENGINE_2146 111 OPDEF("NEW", EXT_UNUSED | OP1_CLASS | OP2_UNUSED | RES_VAR), /* 68 */ 147 #else148 OPDEF("NEW", EXT_UNUSED | OP1_STD | OP2_UNUSED | RES_VAR), /* 68 */149 #endif150 112 #ifdef ZEND_ENGINE_2_3 151 113 OPDEF("INIT_NS_FCALL_BY_NAME", EXT_STD | OP1_STD | OP1_STD | RES_STD), /* 69 */ … … 192 154 OPDEF("FETCH_OBJ_UNSET", EXT_UNUSED | OP1_VAR_2 | OP2_STD | RES_VAR), /* 97 */ 193 155 OPDEF("FETCH_DIM_TMP_VAR", EXT_UNUSED | OP1_STD | OP2_STD | RES_VAR), /* 98 */ 194 195 #ifdef ZEND_ENGINE_2196 156 OPDEF("FETCH_CONSTANT", EXT_UNUSED | OP1_UCLASS | OP2_STD | RES_TMP), /* 99 */ 197 #else198 157 OPDEF("FETCH_CONSTANT", EXT_UNUSED | OP1_STD | OP2_UNUSED | RES_TMP), /* 99 */ 199 #endif200 158 OPDEF("DECLARE_FUNCTION_OR_CLASS", EXT_DECLARE| OP1_STD | OP2_STD | RES_UNUSED), /* 100 */ 201 159 OPDEF("EXT_STMT", EXT_STD | OP1_STD | OP2_STD | RES_STD), /* 101 */ … … 204 162 OPDEF("EXT_NOP", EXT_UNUSED | OP1_UNUSED | OP2_UNUSED | RES_UNUSED), /* 104 */ 205 163 OPDEF("TICKS", EXT_UNUSED | OP1_STD | OP2_UNUSED | RES_UNUSED), /* 105 */ 206 OPDEF("SEND_VAR_NO_REF", EXT_SEND_NOREF| OP1_VAR | OP2_ARG | RES_UNUSED) /* 106 */ 207 #ifdef ZEND_ENGINE_2 208 , 164 OPDEF("SEND_VAR_NO_REF", EXT_SEND_NOREF| OP1_VAR | OP2_ARG | RES_UNUSED), /* 106 */ 209 165 OPDEF("CATCH", EXT_OPLINE | OP1_CLASS | OP2_STD | RES_UNUSED), /* 107 */ 210 166 OPDEF("THROW", EXT_UNUSED | OP1_STD | OP2_OPLINE | RES_UNUSED), /* 108 */ … … 263 219 OPDEF("JMP_SET", EXT_UNUSED | OP1_STD | OP2_JMPADDR| RES_UNUSED) /* 152 */ 264 220 # endif 265 #endif266 221 }; 267 222
