Changeset 1316 in svn for trunk

Timestamp:

2013-07-15T04:40:37Z (3 years ago)

Author:

Xuefer

Message:

Decompiler, disassembler: update PHP 5.0 support

Location:

trunk

Files:

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

trunk/lib/Decompiler.class.php

@@ -1594 +1594 @@
             case XC_ASSIGN_DIM:
             case XC_UNSET_DIM:
+            case XC_UNSET_DIM_OBJ:
             case XC_UNSET_OBJ:
                 $src = $this->getOpVal($op1, $EX);
@@ -2129 +2130 @@
                 $flags = array_flip(explode('_', $opname));
                 if (isset($flags['OBJ'])) {
-                    $resvar = $this->getOpVal($op1, $EX) . '->' . unquoteVariableName($this->getOpVal($op2, $EX), $EX);
+                    $name = isset($op2['constant']) ? $op2['constant'] : unquoteVariableName($this->getOpVal($op2, $EX), $EX);
+                    $resvar = str($this->getOpVal($op1, $EX)) . '->' . $name;
                 }
                 else {
-                    $resvar = $this->getOpVal($op1, $EX);
+                    $resvar = str($this->getOpVal($op1, $EX));
                 }
                 $opstr = isset($flags['DEC']) ? '--' : '++';
@@ -2166 +2168 @@
                 assert(isset($type2cast[$type]));
                 $cast = $type2cast[$type];
-                $resvar = $cast . ' ' . $this->getOpVal($op1, $EX);
+                $resvar = $cast . ' ' . str($this->getOpVal($op1, $EX));
                 break;
                 // }}}
@@ -2173 +2175 @@
             case XC_EXT_FCALL_END:
             case XC_EXT_NOP:
+            case XC_INIT_CTOR_CALL:
                 break;
             case XC_DECLARE_FUNCTION:
@@ -2837 +2840 @@
 define('IS_LONG',     1);
 define('IS_DOUBLE',   2);
-define('IS_BOOL',     3);
+define('IS_BOOL',     ZEND_ENGINE_2_1 ? 3 : 6);
 define('IS_ARRAY',    4);
 define('IS_OBJECT',   5);
-define('IS_STRING',   6);
+define('IS_STRING',   ZEND_ENGINE_2_1 ? 6 : 3);
 define('IS_RESOURCE', 7);
 define('IS_CONSTANT', 8);
@@ -2876 +2879 @@
     'XC_DO_FCALL_BY_FUNC' => -1,
     'XC_GOTO' => -1,
+    'XC_INIT_CTOR_CALL' => -1,
     'XC_INIT_FCALL_BY_FUNC' => -1,
     'XC_INIT_NS_FCALL_BY_NAME' => -1,
@@ -2884 +2888 @@
     'XC_QM_ASSIGN_VAR' => -1,
     'XC_UNSET_DIM' => -1,
+    'XC_UNSET_DIM_OBJ' => -1,
     'XC_UNSET_OBJ' => -1,
     'XC_USER_OPCODE' => -1,

trunk/xcache/xc_opcode_spec_def.h

@@ -71 +71 @@
 #ifdef ZEND_ENGINE_2_3
     OPSPEC(       STD,        STD,        STD,     UNUSED) /* 69 INIT_NS_FCALL_BY_NAME          */
+#elif defined(ZEND_ENGINE_2_1)
+    OPSPEC(    UNUSED,     UNUSED,     UNUSED,     UNUSED)
 #else
     OPSPEC(    UNUSED,        STD,     OPLINE,     UNUSED) /* 69 JMP_NO_CTOR                    */
@@ -78 +80 @@
     OPSPEC(       BIT,        STD,        STD,        TMP) /* 72 ADD_ARRAY_ELEMENT              */
     OPSPEC(    UNUSED,        STD,    INCLUDE,        VAR) /* 73 INCLUDE_OR_EVAL                */
+    OPSPEC(    UNUSED,        STD,      FETCH,     UNUSED) /* 74 UNSET_VAR                      */
 #ifdef ZEND_ENGINE_2_1
   /* php 5.1 and up */
-    OPSPEC(    UNUSED,        STD,      FETCH,     UNUSED) /* 74 UNSET_VAR                      */
     OPSPEC(       STD,        STD,        STD,     UNUSED) /* 75 UNSET_DIM                      */
     OPSPEC(       STD,        STD,        STD,     UNUSED) /* 76 UNSET_OBJ                      */
@@ -87 +89 @@
   /* <= php 5.0 */
   /* though there is no ISSET_ISEMPTY in php 5.0 it's better to leave it here i guess */
-    OPSPEC(    UNUSED,        STD,     UNUSED,     UNUSED)
-    OPSPEC(    UNUSED,        VAR,        STD,     UNUSED)
+    OPSPEC(    UNUSED,        VAR,        STD,     UNUSED) /* 75 UNSET_DIM_OBJ                  */
     OPSPEC(    UNUSED,        VAR,      ISSET,        TMP)
     OPSPEC(       BIT,        STD,     UNUSED,        VAR)