Changeset 789

Timestamp:

2011-04-25T12:42:11+02:00 (2 years ago)

Author:

moo

Message:

Decompile: implement foreach, improve blank line

Location:

trunk

Files:

• Decompiler.class.php (modified) (8 diffs)
• decompilesample.php (modified) (1 diff)

trunk/Decompiler.class.php

@@ -524 +524 @@
     function outputPhp(&$EX, $opline, $last, $indent) // {{{
     {
+        $needBlankline = isset($EX['lastBlock']);
         $origindent = $indent;
         $curticks = 0;
@@ -529 +530 @@
             $op = $EX['opcodes'][$i];
             if (isset($op['gofrom'])) {
+                if ($needBlankline) {
+                    $needBlankline = false;
+                    echo PHP_EOL;
+                }
                 echo 'label' . $i, ":\n";
             }
@@ -547 +552 @@
                             $indent .= INDENT;
                         }
+                        if ($needBlankline) {
+                            $needBlankline = false;
+                            echo PHP_EOL;
+                        }
                         echo $origindent, "declare (ticks=$curticks) {\n";
                     }
+                }
+                if ($needBlankline) {
+                    $needBlankline = false;
+                    echo PHP_EOL;
                 }
                 echo $indent, str($op['php'], $indent), ";\n";
@@ -653 +666 @@
     function decompileBasicBlock(&$EX, $first, $last, $indent) // {{{
     {
-        if (isset($EX['lastBlock'])) {
-            echo PHP_EOL;
-        }
         $this->dasmBasicBlock($EX, $first, $last);
         // $this->dumpRange($EX, $first, $last);
@@ -670 +680 @@
             $jmpins = array_keys($jmpins);
         }
-        $opcodes[$line]['opcode'] = XC_NOP;
+        // $opcodes[$line]['opcode'] = XC_NOP;
         unset($opcodes[$line]['jmpouts']);
     }
@@ -694 +704 @@
         $lastOp = &$opcodes[$last];
 
-        if ($lastOp['opcode'] == XC_JMPNZ
+        if ($lastOp['opcode'] == XC_JMPNZ && !empty($lastOp['jmpouts'])
          && $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;
@@ -717 +729 @@
         if (isset($firstJmpOp)
          && $firstJmpOp['opcode'] == XC_JMPZ
-         && $lastOp['opcode'] == XC_JMP
+         && $firstJmpOp['jmpouts'][0] > $last
+         && $lastOp['opcode'] == XC_JMP && !empty($lastOp['jmpouts'])
          && $lastOp['jmpouts'][0] == $first) {
             $this->removeJmpInfo($EX, $firstJmp);
             $this->removeJmpInfo($EX, $last);
-
             $this->beginComplexBlock($EX);
+
             ob_start();
             $this->recognizeAndDecompileClosedBlocks($EX, $first, $last, $indent . INDENT);
-            $code = ob_get_clean();
+            $body = ob_get_clean();
+
             echo $indent, 'while (', str($this->getOpVal($firstJmpOp['op1'], $EX)), ') {', PHP_EOL;
-            echo $code;
+            echo $body;
             echo $indent, '}', PHP_EOL;
+
+            $this->endComplexBlock($EX);
+            return;
+        }
+
+        if (isset($firstJmpOp)
+         && $firstJmpOp['opcode'] == XC_FE_FETCH
+         && $firstJmpOp['jmpouts'][0] > $last
+         && $lastOp['opcode'] == XC_JMP && !empty($lastOp['jmpouts'])
+         && $lastOp['jmpouts'][0] == $firstJmp) {
+            $this->removeJmpInfo($EX, $firstJmp);
+            $this->removeJmpInfo($EX, $last);
+            $this->beginComplexBlock($EX);
+
+            ob_start();
+            $this->recognizeAndDecompileClosedBlocks($EX, $first, $last, $indent . INDENT);
+            $body = ob_get_clean();
+
+            $as = foldToCode($firstJmpOp['fe_as'], $EX);
+            if (isset($firstJmpOp['fe_key'])) {
+                $as = str($firstJmpOp['fe_key'], $EX) . ' => ' . str($as);
+            }
+
+            echo $indent, 'foreach (', str($firstJmpOp['fe_src'], $EX), " as $as) {", PHP_EOL;
+            echo $body;
+            echo $indent, '}', PHP_EOL;
+
             $this->endComplexBlock($EX);
             return;
@@ -910 +951 @@
         else {
             $next = null;
-        }
-        if ($op['opcode'] == XC_FE_FETCH) {
-            $opline = $next;
-            $next = $op['op2']['opline_num'];
-            $end = $next - 1;
-
-            ob_start();
-            $this->outputCode($EX, $opline, $end /* - 1 skip last jmp */, $indent . INDENT);
-            $body = ob_get_clean();
-
-            $as = foldToCode($op['fe_as'], $EX);
-            if (isset($op['fe_key'])) {
-                $as = str($op['fe_key'], $EX) . ' => ' . str($as);
-            }
-            echo "{$indent}foreach (" . str($op['fe_src'], $EX) . " as $as) {\n";
-            echo $body;
-            echo "{$indent}}";
-            // $this->outputCode($EX, $next, $last, $indent);
-            // return;
         }
         /*

trunk/decompilesample.php

@@ -295 +295 @@
 
 foreach ($array as $key => $value) {
-    foreach ($array as $key => $value) {
+    foreach ($value as $key => $value) {
         echo $key . ' = ' . $value . "\n";
         break 2;