Changeset 371

Timestamp:

12/23/09 14:41:08 (9 months ago)

Author:

hans

Message:

PHP 5.3 ZEND_JMP_SET support

Location:

eaccelerator/trunk

Files:

• ChangeLog (modified) (1 diff)
• opcodes.c (modified) (1 diff)
• optimize.c (modified) (3 diffs)

eaccelerator/trunk/ChangeLog

@@ -4 +4 @@
                 * check_mtime can now be enabled/disabled through the web
                   interface as requested in ticket #32
-                * shortened some variable names
+                * Shortened some variable names
+                * ZEND_JMP_SET support
 
 2009-12-01      Hans Rakers <hans at react.nl>

eaccelerator/trunk/opcodes.c

@@ -215 +215 @@
   ,
   OPDEF("UNDEF-151",                EXT_UNUSED | OP1_UNUSED | OP2_UNUSED | RES_UNUSED), /* 151 */
-  OPDEF("JMP_SET",                  EXT_UNUSED | OP1_STD    | OP2_JMPADDR| RES_UNUSED), /* 152 */
+  OPDEF("JMP_SET",                  EXT_UNUSED | OP1_STD    | OP2_JMPADDR| RES_TMP),    /* 152 */
   OPDEF("DECLARE_LAMBDA_FUNCTION",  EXT_UNUSED | OP1_STD    | OP2_STD    | RES_UNUSED)  /* 153 */
 # endif

eaccelerator/trunk/optimize.c

@@ -2626 +2626 @@
                                 op->op1.op_type = IS_UNUSED;
                         }
-                        if ((dsc->ops & OP2_MASK) == OP2_CLASS &&  op->opcode != ZEND_ADD_INTERFACE)
+                        if ((dsc->ops & OP2_MASK) == OP2_CLASS && op->opcode != ZEND_ADD_INTERFACE)
                         {
                                 op->op2.op_type = IS_VAR;
@@ -2668 +2668 @@
                         case ZEND_JMPZ_EX:
                         case ZEND_JMPNZ_EX:
+#ifdef ZEND_JMP_SET
+                        case ZEND_JMP_SET:
+#endif
                         /*
-                          TODO: implement 5.3 opcodes ZEND_GOTO & ZEND_JMP_SET here
+                          TODO: implement 5.3 opcode ZEND_GOTO here
                         */
                         case ZEND_NEW:
@@ -2843 +2846 @@
                                 case ZEND_FE_RESET:
                                 case ZEND_FE_FETCH:
+#ifdef ZEND_JMP_SET
+                                case ZEND_JMP_SET:
+#endif
                                         p->jmp_2 = &bb[op->op2.u.opline_num];
                                         p->follow = &bb[line_num];
                                         break;
                                 /*
-                                  TODO: implement 5.3 opcodes ZEND_GOTO & ZEND_JMP_SET here
+                                  TODO: implement 5.3 opcode ZEND_GOTO here
                                 */
                                 case ZEND_RETURN: