Changeset 714 for trunk/Decompiler.class.php

Timestamp:

2011-04-09T05:08:38+02:00 (2 years ago)

Author:

moo

Message:

disassembler: DECLARE_INHERITED_CLASS/DELAYED class not found

File:

• trunk/Decompiler.class.php (modified) (2 diffs)

trunk/Decompiler.class.php

@@ -1073 +1073 @@
                     // }}}
                 case XC_DECLARE_CLASS: 
-                case XC_DECLARE_INHERITED_CLASS: // {{{
+                case XC_DECLARE_INHERITED_CLASS:
+                case XC_DECLARE_INHERITED_CLASS_DELAYED: // {{{
                     $key = $op1['u.constant'];
+                    if (!isset($this->dc['class_table'][$key])) {
+                        echo 'class not found: ', $key, 'existing classes are:', "\n";
+                        var_dump(array_keys($this->dc['class_table']));
+                        exit;
+                    }
                     $class = &$this->dc['class_table'][$key];
-                    if (!isset($class)) {
-                        echo 'class not found: ' . $key;
-                        exit;
-                    }
                     $class['name'] = $this->unquoteName($this->getOpVal($op2, $EX));
-                    if ($opc == XC_DECLARE_INHERITED_CLASS) {
+                    if ($opc == XC_DECLARE_INHERITED_CLASS || $opc == XC_DECLARE_INHERITED_CLASS_DELAYED) {
                         $ext /= XC_SIZEOF_TEMP_VARIABLE;
                         $class['parent'] = $T[$ext];
@@ -1867 +1869 @@
     'XC_DECLARE_CLASS' => -1,
     'XC_DECLARE_INHERITED_CLASS' => -1,
+    'XC_DECLARE_INHERITED_CLASS_DELAYED' => -1,
     'XC_ADD_INTERFACE' => -1,
     'XC_POST_DEC_OBJ' => -1,