Changeset 194

Timestamp:

04/06/06 16:57:25 (3 years ago)

Author:

hans

Message:

Rewrote fix for sf.net bug #1442923. This should get rid of all 'Invalid opcode: 99/4/1' errors.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/optimize.c (modified) (4 diffs)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-04-06  Hans Rakers <hans at parse dot nl>
+
+        * Reverted the change to the handling of ZEND_BRK made by me on
+          2006-03-17 since it wasn't working as it should. Since this
+          reintroduces sf.net bug #1442923 i added some code to prevent this
+          bug using a different approach, by restoring operand types changed
+          by build_cfg if build_cfg exits with exit code 0.
+
+          Since php-5.1 some opcode handlers expect a strict set of operand
+          types, anything else results in 'Invalid opcode' errors. Since
+          build_cfg changes some operand types these changes need to be
+          reverted once the optimizer finishes. For now the only opcode to
+          which this all applies is ZEND_FETCH_CONSTANT, which expects
+          either a CONST or a UNUSED in op1 and a CONST in op2 (See
+          zend_vm_def.h)
+
-2006-04-04  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/optimize.c

@@ -2821 +2821 @@
-                                                        op_array->opcodes[jmp_to->brk].opcode == ZEND_FREE))
-                                                {
-break
+goto brk_failed
-                                                }
-                                                offset = jmp_to->parent;
@@ -3227 +3227 @@
-          if (op->opcode == ZEND_DO_FCALL_BY_NAME) {
-            op->op1.op_type = IS_UNUSED;
-
+ && op->op1.op_type == IS_VAR
-            op->op1.u.var = VAR_VAL(assigned[r]);
+            /* restore op1 type from VAR to CONST (the opcode handler expects this or bombs out with invalid opcode) */
-            op->op1.op_type = IS_CONST;
-          } else {
@@ -3287 +3288 @@
-}
-
+void restore_operand_types(zend_op_array *op_array) {
+        zend_op* op = op_array->opcodes;
+        int len = op_array->last;
+        int line_num;
+
+        for (line_num=0; line_num < len; op++,line_num++)
+        {
+          if (op->opcode == ZEND_FETCH_CONSTANT && op->op1.op_type == IS_VAR) {
+            /* restore op1 type from VAR to CONST (the opcode handler expects this or bombs out with invalid opcode) */
+            op->op1.op_type = IS_CONST;
+          }
+        }
+}
+
-/*
- * Main Optimization Routine
@@ -3358 +3373 @@
-    free_alloca(global);
-  }
+#  ifdef ZEND_ENGINE_2_1
+  else {
+    /* build_cfg encountered some nested ZEND_BRK or ZEND_CONT's
+       which it could not replace with JMP's
+
+       now restore the operand type changes that build_cfg had
+       already applied, to prevent 'invalid opcode' errors
+       on opcode handlers that expect a strict set of operand
+       types since php-5.1 (like ZEND_FETCH_CONSTANT)
+    */
+    restore_operand_types(op_array);
+#  endif
+  }
-  free_alloca(bb);
-}