Changeset 162 for eaccelerator/trunk/opcodes.c

Timestamp:

02/17/06 18:35:50 (3 years ago)

Author:

zoeloelip

Message:

Merged PHP_5_1 branch with HEAD

Files:

• eaccelerator/trunk/opcodes.c (modified) (9 diffs)

eaccelerator/trunk/opcodes.c

@@ -44 +44 @@
-#endif
-
-
-
-
-
-
+
-
-static const opcode_dsc opcodes[] = {
@@ -159 +155 @@
-  OPDEF("ADD_ARRAY_ELEMENT",         EXT_BIT    | OP1_STD    | OP2_STD    | RES_TMP), /* 72 */
-  OPDEF("INCLUDE_OR_EVAL",           EXT_UNUSED | OP1_STD    | OP2_INCLUDE| RES_VAR), /* 73 */
-
+
+
-  OPDEF("UNSET_VAR",                 EXT_UNUSED | OP1_STD    | OP2_FETCH  | RES_UNUSED), /* 74 */
-
-
-
+
+
+
+
+
+
-  OPDEF("UNSET_VAR",                 EXT_UNUSED | OP1_STD    | OP2_UNUSED | RES_UNUSED), /* 74 */
-  OPDEF("UNSET_DIM_OBJ",             EXT_UNUSED | OP1_VAR    | OP2_STD    | RES_UNUSED), /* 75 */
-  OPDEF("ISSET_ISEMPTY",             EXT_UNUSED | OP1_VAR    | OP2_ISSET  | RES_TMP), /* 76 */
-#endif
-  OPDEF("FE_RESET",                  EXT_BIT    | OP1_STD    | OP2_UNUSED | RES_VAR), /* 77 */
+#endif
-  OPDEF("FE_FETCH",                  EXT_FE     | OP1_STD    | OP2_OPLINE | RES_TMP), /* 78 */
-  OPDEF("EXIT",                      EXT_UNUSED | OP1_STD    | OP2_UNUSED | RES_UNUSED), /* 79 */
@@ -210 +210 @@
-  OPDEF("CLONE",                     EXT_UNUSED | OP1_STD    | OP2_UNUSED | RES_VAR), /* 110 */
-  OPDEF("INIT_CTOR_CALL",            EXT_UNUSED | OP1_STD    | OP2_UNUSED | RES_UNUSED), /* 111 */
-UNUSED
+VAR
-  OPDEF("INIT_STATIC_METHOD_CALL",   EXT_UNUSED | OP1_UCLASS | OP2_STD    | RES_UNUSED), /* 113 */
-  OPDEF("ISSET_ISEMPTY_VAR",         EXT_ISSET  | OP1_STD    | OP2_FETCH  | RES_TMP), /* 114 */
@@ -235 +235 @@
-  OPDEF("POST_DEC_OBJ",              EXT_UNUSED | OP1_STD    | OP2_STD    | RES_TMP), /* 135 */
-  OPDEF("ASSIGN_OBJ",                EXT_UNUSED | OP1_STD    | OP2_STD    | RES_VAR), /* 136 */
-UNUSE
+ST
-  OPDEF("INSTANCEOF",                EXT_UNUSED | OP1_STD    | OP2_CLASS  | RES_TMP), /* 138 */
-  OPDEF("DECLARE_CLASS",             EXT_UNUSED | OP1_STD    | OP2_STD    | RES_CLASS), /* 139 */
@@ -246 +246 @@
-  OPDEF("VERIFY_ABSTRACT_CLASS",     EXT_UNUSED | OP1_CLASS  | OP2_UNUSED | RES_UNUSED), /* 146 */
-  OPDEF("ASSIGN_DIM",                EXT_UNUSED | OP1_STD    | OP2_STD    | RES_VAR),  /* 147 */
-
-  OPDEF("ISSET_ISEMPTY_PROP_OBJ",    EXT_ISSET  | OP1_STD    | OP2_STD    | RES_TMP), /* 148 */
-  OPDEF("HANDLE_EXCEPTION",          EXT_STD    | OP1_UNUSED | OP2_UNUSED | RES_STD)  /* 149 */
+# ifdef ZEND_ENGINE_2_1
+  ,
+  OPDEF("USER_OPCODE",               EXT_STD    | OP1_UNUSED | OP2_UNUSED | RES_STD)  /* 150 */
+# endif    
-#endif
-};
-
-const opcode_dsc* get_opcode_dsc(unsigned int n) {
-=
+
-    return &opcodes[n];
-  } else {
@@ -262 +265 @@
-
-#ifdef ZEND_ENGINE_2
-+1
+
-static int handlers_retrived = 0;
-
@@ -268 +271 @@
-  unsigned char i;
-  efree(op_array->opcodes);
-+1
-+1
-+1
+
+
+
-  op_array->T    = 0;
-=
+
-    op_array->opcodes[i].opcode = i;
-    op_array->opcodes[i].op1.op_type = IS_UNUSED;
@@ -299 +302 @@
-    p = compile_string(&str, empty_string TSRMLS_CC);
-    ext->op_array_handler = old;
-LAST_OPCODE+1
+(LAST_OPCODE - 1)
-      int i = 0;
-=
+
-         eaccelerator_opcode_handlers[p->opcodes[i].opcode] = p->opcodes[i].handler;
-         ++i;
@@ -319 +322 @@
-    }
-  }
-=
+
-    return eaccelerator_opcode_handlers[opcode];
-  } else {