Changeset 791

Timestamp:

2011-04-25T17:27:44+02:00 (2 years ago)

Author:

moo

Message:

Decompiler: fix foreach to not be recognized as switch, fix i/j looping

File:

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

trunk/Decompiler.class.php

@@ -585 +585 @@
                 $ret = foldToCode($ret, $EX);
             }
-            if ($free) {
+            if ($free && empty($this->keepTs)) {
                 unset($T[$op['var']]);
             }
@@ -880 +880 @@
         $opcodes = &$EX['opcodes'];
 
-        $i = $starti = $first;
-        while ($i <= $last) {
+        $starti = $first;
+        for ($i = $starti; $i <= $last; ++$i) {
             $op = $opcodes[$i];
             if (!empty($op['jmpins']) || !empty($op['jmpouts'])) {
                 $blockFirst = $i;
                 $blockLast = -1;
-                $i = $blockFirst;
-                // $this->dumpRange($EX, $i, $last, $indent);
+                $j = $blockFirst;
                 do {
-                    $op = $opcodes[$i];
+                    $op = $opcodes[$j];
                     if (!empty($op['jmpins'])) {
                         // care about jumping from blocks behind, not before
@@ -901 +900 @@
                         $blockLast = max($blockLast, max($op['jmpouts']) - 1);
                     }
-                    ++$i;
-                } while ($i <= $blockLast);
+                    ++$j;
+                } while ($j <= $blockLast);
                 assert('$blockLast <= $last');
 
@@ -910 +909 @@
                     }
                     $this->decompileComplexBlock($EX, $blockFirst, $blockLast, $indent);
-                    $i = $starti = $blockLast + 1;
+                    $starti = $blockLast + 1;
+                    $i = $starti - 1;
                     continue;
                 }
             }
-            ++$i;
         }
         if ($starti <= $last) {
@@ -1030 +1029 @@
 
         /* dump whole array
+        $this->keepTs = true;
         $this->dasmBasicBlock($EX, $first, $last);
         for ($i = $first; $i <= $last; ++$i) {
@@ -1778 +1778 @@
                     // }}}
                 case XC_FE_FETCH: // {{{
-                    $op['fe_src'] = $this->getOpVal($op1, $EX);
+                    $op['fe_src'] = $this->getOpVal($op1, $EX, false, true);
                     $fe = new Decompiler_ForeachBox($op);
                     $fe->iskey = false;