Changeset 778

Timestamp:

2011-04-20T18:14:55+02:00 (2 years ago)

Author:

moo

Message:

decompiler: refix FETCH_CONSTANT for PHP_5_3 instead of messing up with UCLASS

Location:

trunk

Files:

• opcode_spec_def.h (modified) (1 diff)
• utils.c (modified) (1 diff)

trunk/opcode_spec_def.h

@@ -147 +147 @@
     OPSPEC(    UNUSED,      VAR_2,        STD,        VAR) /* 97 FETCH_OBJ_UNSET                */
     OPSPEC(    UNUSED,        STD,        STD,        VAR) /* 98 FETCH_DIM_TMP_VAR              */
-#ifdef ZEND_ENGINE_2
+#ifdef ZEND_ENGINE_2_3
+    OPSPEC(    UNUSED,      VAR_2,        STD,        TMP) /* 99 FETCH_CONSTANT                 */
+#elif defined(ZEND_ENGINE_2)
     OPSPEC(    UNUSED,     UCLASS,        STD,        TMP) /* 99 FETCH_CONSTANT                 */
 #else

trunk/utils.c

@@ -244 +244 @@
             case IS_TMP_VAR:
                 break;
-
-            case IS_CONST:
-                if (spec == OPSPEC_UCLASS) {
-                    break;
-                }
-                /* fall */
 
             default: