Changeset 788

Timestamp:

2011-04-25T12:14:07+02:00 (2 years ago)

Author:

moo

Message:

Decompiler: adds blank line between blocks

File:

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

trunk/Decompiler.class.php

@@ -653 +653 @@
     function decompileBasicBlock(&$EX, $first, $last, $indent) // {{{
     {
+        if (isset($EX['lastBlock'])) {
+            echo PHP_EOL;
+        }
         $this->dasmBasicBlock($EX, $first, $last);
         // $this->dumpRange($EX, $first, $last);
@@ -671 +674 @@
     }
     // }}}
+    function beginComplexBlock(&$EX) // {{{
+    {
+        if (isset($EX['lastBlock'])) {
+            echo PHP_EOL;
+            $EX['lastBlock'] = null;
+        }
+    }
+    // }}}
+    function endComplexBlock(&$EX) // {{{
+    {
+        $EX['lastBlock'] = 'complex';
+    }
+    // }}}
     function decompileComplexBlock(&$EX, $first, $last, $indent) // {{{
     {
@@ -681 +697 @@
          && $lastOp['jmpouts'][0] == $first) {
             $this->removeJmpInfo($EX, $last);
+            $this->beginComplexBlock($EX);
             echo $indent, 'do {', PHP_EOL;
             $this->recognizeAndDecompileClosedBlocks($EX, $first, $last, $indent . INDENT);
             echo $indent, '} while (', str($this->getOpVal($lastOp['op1'], $EX)), ');', PHP_EOL;
+            $this->endComplexBlock($EX);
             return;
         }
@@ -704 +722 @@
             $this->removeJmpInfo($EX, $last);
 
+            $this->beginComplexBlock($EX);
             ob_start();
             $this->recognizeAndDecompileClosedBlocks($EX, $first, $last, $indent . INDENT);
@@ -710 +729 @@
             echo $code;
             echo $indent, '}', PHP_EOL;
+            $this->endComplexBlock($EX);
             return;
         }
@@ -719 +739 @@
     {
         $opcodes = &$EX['opcodes'];
-        $firstComplex = false;
 
         $i = $starti = $first;