Changeset 795 for trunk/Decompiler.class.php

Timestamp:

2011-04-26T07:28:21+02:00 (2 years ago)

Author:

moo

Message:

Decompiler: decompile try/catch

File:

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

trunk/Decompiler.class.php

@@ -615 +615 @@
     function &fixOpcode($opcodes, $removeTailing = false, $defaultReturnValue = null) // {{{
     {
-        for ($i = 0, $cnt = count($opcodes); $i < $cnt; $i ++) {
+        $last = count($opcodes) - 1;
+        for ($i = 0; $i <= $last; $i ++) {
             if (function_exists('xcache_get_fixed_opcode')) {
                 $opcodes[$i]['opcode'] = xcache_get_fixed_opcode($opcodes[$i]['opcode'], $i);
@@ -706 +707 @@
         $lastOp = &$opcodes[$last];
 
+        // {{{ try/catch
+        if (!empty($firstOp['jmpins']) && !empty($opcodes[$firstOp['jmpins'][0]]['isCatchBegin'])) {
+            $catchBlocks = array();
+            $catchFirst = $firstOp['jmpins'][0];
+
+            $tryFirst = $first;
+            $tryLast = $catchFirst - 1;
+
+            // search for XC_CATCH
+            $this->removeJmpInfo($EX, $catchFirst);
+            for ($i = $catchFirst; $i <= $last; ) {
+                if ($opcodes[$i]['opcode'] == XC_CATCH) {
+                    $catchOpLine = $i;
+                    $this->removeJmpInfo($EX, $catchOpLine);
+
+                    $catchNext = $opcodes[$catchOpLine]['extended_value'];
+                    $catchBodyLast = $catchNext - 1;
+                    if ($opcodes[$catchBodyLast]['opcode'] == XC_JMP) {
+                        --$catchBodyLast;
+                    }
+
+                    $catchBlocks[$catchFirst] = array($catchOpLine, $catchBodyLast);
+
+                    $i = $catchFirst = $catchNext;
+                }
+                else {
+                    ++$i;
+                }
+            }
+
+            if ($opcodes[$tryLast]['opcode'] == XC_JMP) {
+                --$tryLast;
+            }
+
+            $this->beginComplexBlock($EX);
+            echo $indent, 'try {', PHP_EOL;
+            $this->recognizeAndDecompileClosedBlocks($EX, $tryFirst, $tryLast, $indent . INDENT);
+            echo $indent, '}', PHP_EOL;
+            foreach ($catchBlocks as $catchFirst => $catchInfo) {
+                list($catchOpLine, $catchBodyLast) = $catchInfo;
+                $catchBodyFirst = $catchOpLine + 1;
+                $this->recognizeAndDecompileClosedBlocks($EX, $catchFirst, $catchOpLine, $indent);
+                $catchOp = &$opcodes[$catchOpLine];
+                echo $indent, 'catch (', str($this->getOpVal($catchOp['op1'], $EX)), ' ', str($this->getOpVal($catchOp['op2'], $EX)), ') {', PHP_EOL;
+                unset($catchOp);
+
+                $EX['lastBlock'] = null;
+                $this->recognizeAndDecompileClosedBlocks($EX, $catchBodyFirst, $catchBodyLast, $indent . INDENT);
+                echo $indent, '}', PHP_EOL;
+            }
+            $this->endComplexBlock($EX);
+            return;
+        }
+        // }}}
+
         if ($firstOp['opcode'] == XC_SWITCH_FREE && isset($T[$firstOp['op1']['var']])) {
             // TODO: merge this code to CASE code. use SWITCH_FREE to detect begin of switch by using $Ts if possible
@@ -722 +778 @@
         ) {
             $cases = array();
-            $caseNext = null;
             $caseDefault = null;
             $caseOp = null;
-            for ($i = $first; $i <= $last; ++$i) {
+            for ($i = $first; $i <= $last; ) {
                 $op = $opcodes[$i];
                 if ($op['opcode'] == XC_CASE) {
@@ -734 +789 @@
                     assert('$jmpz["opcode"] == XC_JMPZ');
                     $caseNext = $jmpz['jmpouts'][0];
-                    $i = $cases[$i] = $caseNext - 1;
-                }
-                else if ($op['opcode'] == XC_JMP) {
+                    $cases[$i] = $caseNext - 1;
+                    $i = $caseNext;
+                }
+                else if ($op['opcode'] == XC_JMP && $op['jmpouts'][0] >= $i) {
                     // default
-                    if ($op['jmpouts'][0] >= $i) {
-                        $caseNext = $op['jmpouts'][0];
-                        $caseDefault = $i;
-                        $i = $cases[$i] = $caseNext - 1;
-                    }
+                    $caseNext = $op['jmpouts'][0];
+                    $caseDefault = $i;
+                    $cases[$i] = $caseNext - 1;
+                    $i = $caseNext;
+                }
+                else {
+                    ++$i;
                 }
             }
@@ -881 +939 @@
 
         $starti = $first;
-        for ($i = $starti; $i <= $last; ++$i) {
-            $op = $opcodes[$i];
-            if (!empty($op['jmpins']) || !empty($op['jmpouts'])) {
+        for ($i = $starti; $i <= $last; ) {
+            if (!empty($opcodes[$i]['jmpins']) || !empty($opcodes[$i]['jmpouts'])) {
                 $blockFirst = $i;
                 $blockLast = -1;
@@ -902 +959 @@
                     ++$j;
                 } while ($j <= $blockLast);
-                assert('$blockLast <= $last');
+                if (!assert('$blockLast <= $last')) {
+                    var_dump($blockLast, $last);
+                }
 
                 if ($blockLast >= $blockFirst) {
@@ -910 +969 @@
                     $this->decompileComplexBlock($EX, $blockFirst, $blockLast, $indent);
                     $starti = $blockLast + 1;
-                    $i = $starti - 1;
-                    continue;
-                }
+                    $i = $starti;
+                }
+                else {
+                    ++$i;
+                }
+            }
+            else {
+                ++$i;
             }
         }
@@ -924 +988 @@
         $op_array['opcodes'] = $this->fixOpcode($op_array['opcodes'], true, $indent == '' ? 1 : null);
         $opcodes = &$op_array['opcodes'];
+        $last = count($opcodes) - 1;
         // {{{ build jmpins/jmpouts to op_array
-        for ($i = 0, $cnt = count($opcodes); $i < $cnt; $i ++) {
+        for ($i = 0; $i <= $last; $i ++) {
             $op = &$opcodes[$i];
             $op['line'] = $i;
@@ -987 +1052 @@
                 $opcodes[$i + 2]['jmpins'][] = $i;
                 break;
+
+            case XC_CATCH:
+                $catchNext = $op['extended_value'];
+                $op['jmpouts'] = array($catchNext);
+                $opcodes[$catchNext]['jmpins'][] = $i;
+                break;
             }
             /*
@@ -995 +1066 @@
         }
         unset($op);
+        if ($op_array['try_catch_array']) {
+            foreach ($op_array['try_catch_array'] as $try_catch_element) {
+                $catch_op = $try_catch_element['catch_op'];
+                $try_op = $try_catch_element['try_op'];
+                $opcodes[$try_op]['jmpins'][] = $catch_op;
+                $opcodes[$catch_op]['jmpouts'][] = $try_op;
+                $opcodes[$catch_op]['isCatchBegin'] = true;
+            }
+        }
         // }}}
         // build semi-basic blocks
         $nextbbs = array();
         $starti = 0;
-        for ($i = 1, $cnt = count($opcodes); $i < $cnt; $i ++) {
+        for ($i = 1; $i <= $last; $i ++) {
             if (isset($opcodes[$i]['jmpins'])
              || isset($opcodes[$i - 1]['jmpouts'])) {
@@ -1006 +1086 @@
             }
         }
-        $nextbbs[$starti] = $cnt;
+        $nextbbs[$starti] = $last + 1;
 
         $EX = array();
@@ -1239 +1319 @@
                     // }}}
                 case XC_CATCH: // {{{
-                    $resvar = 'catch (' . str($this->getOpVal($op1, $EX)) . ' ' . str($this->getOpVal($op2, $EX)) . ')';
                     break;
                     // }}}
@@ -2022 +2101 @@
     function dumpop($op, &$EX) // {{{
     {
+        assert('isset($op)');
         $op1 = $op['op1'];
         $op2 = $op['op2'];
@@ -2053 +2133 @@
                 if ($k == 'result') {
                     var_dump($op);
+                    assert(0);
                     exit;
-                    assert(0);
                 }
                 else {
@@ -2062 +2142 @@
         }
         $d[';'] = $op['extended_value'];
+        if (!empty($op['jmpouts'])) {
+            $d['>>'] = implode(',', $op['jmpouts']);
+        }
+        if (!empty($op['jmpins'])) {
+            $d['<<'] = implode(',', $op['jmpins']);
+        }
 
         foreach ($d as $k => $v) {