Changeset 1319 in svn

Timestamp:

2013-07-15T15:53:25Z (4 years ago)

Author:

Xuefer

Message:

Decompiler, disassembler: fix unset for PHP 5.0

Location:

trunk

Files:

• lib/Decompiler.class.php (modified) (3 diffs)
• xcache/xc_opcode_spec_def.h (modified) (1 diff)

trunk/lib/Decompiler.class.php

@@ -1641 +1641 @@
                     $dim->isObject = true;
                 }
+                else if ($opc == XC_UNSET_DIM_OBJ) {
+                    $dim->isObject = $ext == ZEND_UNSET_OBJ;
+                }
                 unset($dim);
                 $rvalue = $dimbox;
@@ -1651 +1654 @@
                     $resvar = str($lvalue, $EX) . ' = ' . str($rvalue);
                 }
-                else if ($opc == XC_UNSET_DIM || $opc == XC_UNSET_OBJ) {
+                else if ($opc == XC_UNSET_DIM || $opc == XC_UNSET_OBJ || $opc == XC_UNSET_DIM_OBJ) {
                     $op['php'] = "unset(" . str($rvalue, $EX) . ")";
                     $lastphpop = &$op;
@@ -2824 +2827 @@
     define('ZEND_FE_FETCH_BYREF',     1);
     define('ZEND_FE_FETCH_WITH_KEY',  2);
+}
+else {
+    define('ZEND_UNSET_DIM',          1);
+    define('ZEND_UNSET_OBJ',          2);
 }
 

trunk/xcache/xc_opcode_spec_def.h

@@ -85 +85 @@
     OPSPEC(       STD,        STD,        STD,     UNUSED) /* 75 UNSET_DIM                      */
     OPSPEC(       STD,        STD,        STD,     UNUSED) /* 76 UNSET_OBJ                      */
-    OPSPEC(       BIT,        STD,     OPLINE,        VAR) /* 77 FE_RESET                       */
 #else
   /* <= php 5.0 */
   /* though there is no ISSET_ISEMPTY in php 5.0 it's better to leave it here i guess */
     OPSPEC(    UNUSED,        VAR,        STD,     UNUSED) /* 75 UNSET_DIM_OBJ                  */
-    OPSPEC(    UNUSED,        VAR,      ISSET,        TMP)
-    OPSPEC(       BIT,        STD,     UNUSED,        VAR)
-#endif
+    OPSPEC(    UNUSED,        VAR,      ISSET,        TMP) /* 76 UNUSED                         */
+#endif
+    OPSPEC(       BIT,        STD,     UNUSED,        VAR) /* 77 FE_RESET                       */
     OPSPEC(        FE,        STD,     OPLINE,        TMP) /* 78 FE_FETCH                       */
     OPSPEC(    UNUSED,        STD,     UNUSED,     UNUSED) /* 79 EXIT                           */