Changeset 820

Timestamp:

2011-06-08T05:45:25+02:00 (2 years ago)

Author:

moo

Message:

decode optimized if/return

Location:

trunk

Files:

• Decompiler.class.php (modified) (1 diff)
• phpdop.phpr (modified) (1 diff)

trunk/Decompiler.class.php

@@ -906 +906 @@
             return;
         }
+        if ($firstOp['opcode'] == XC_JMPZ && !empty($firstOp['jmpouts'])
+         && $firstOp['jmpouts'][0] - 1 == $range[1] && $opcodes[$firstOp['jmpouts'][0] - 1]['opcode'] == XC_RETURN) {
+            $this->beginComplexBlock($EX);
+            $this->removeJmpInfo($EX, $range[0]);
+            $condition = $this->getOpVal($opcodes[$range[0]]['op1'], $EX);
+
+            echo $indent, 'if (', str($condition, $EX), ') ', '{', PHP_EOL;
+            $this->beginScope($EX);
+            $this->recognizeAndDecompileClosedBlocks($EX, $range);
+            $this->endScope($EX);
+            echo $indent, '}', PHP_EOL;
+            $this->endComplexBlock($EX);
+            return;
+        }
         // }}}
         // {{{ try/catch

trunk/phpdop.phpr

@@ -95 +95 @@
 }
 $decompiler = new Decompiler();
-$pk = xcache_dasm_file($argv[1]);
+if (isset($argv[2])) {
+    eval('$pk = ' . file_get_contents($argv[2]) . ';');
+}
+else {
+    $pk = xcache_dasm_file($argv[1]);
+}
 $op_array = $funcs = $classes = null;
 if (isset($pk['op_array'])) {