Changeset 806

Timestamp:

2011-04-27T07:10:28+02:00 (2 years ago)

Author:

moo

Message:

Decompiler: dump any unhandled complex block

File:

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

trunk/Decompiler.class.php

@@ -700 +700 @@
     }
     // }}}
-    function decompileBasicBlock(&$EX, $range, $indent) // {{{
+    function decompileBasicBlock(&$EX, $range, $indent, $unhandled = false) // {{{
     {
         $this->dasmBasicBlock($EX, $range);
-        // $this->dumpRange($EX, $range, $indent);
+        if ($unhandled) {
+            $this->dumpRange($EX, $range, $indent);
+        }
         $this->outputPhp($EX, $range, $indent);
     }
@@ -1005 +1007 @@
 
             $this->endComplexBlock($EX);
+            if ($opcodes[$range[1] + 1]['opcode'] == XC_SWITCH_FREE) {
+                $this->removeJmpInfo($EX, $range[1] + 1);
+            }
             return;
         }
         // }}}
 
-        $this->decompileBasicBlock($EX, $range, $indent);
+        $this->decompileBasicBlock($EX, $range, $indent, true);
     }
     // }}}