Changeset 758

Timestamp:

04/17/2011 10:23:57 AM (2 years ago)

Author:

moo

Message:

Decompiler: improves break/continue/goto, updates test sample

Location:

trunk

Files:

• Decompiler.class.php (modified) (5 diffs)
• decompilesample.php (modified) (4 diffs)

trunk/Decompiler.class.php

@@ -650 +650 @@
             $op['line'] = $i;
             switch ($op['opcode']) {
+            case XC_CONT:
+            case XC_BRK:
+                $op['jmpouts'] = array();
+                break;
+
             case XC_GOTO:
             case XC_JMP:
@@ -801 +806 @@
             return;
         }
-        if (!empty($op['jmpouts']) && isset($op['isjmp'])) {
+        if (isset($op['jmpouts']) && isset($op['isjmp'])) {
             if (isset($op['cond'])) {
                 echo "{$indent}check (" . str($op["cond"]) . ") {\n";
                 echo INDENT;
             }
-            echo $indent;
-            echo xcache_get_opcode($op['opcode']), ' line', $op['jmpouts'][0];
-            if (isset($op['jmpouts'][1])) {
-                echo ', line', $op['jmpouts'][1];
-            }
-            echo ";";
-            // echo ' // <- line', $op['line'];
-            echo "\n";
+            switch ($op['opcode']) {
+            case XC_CONT:
+            case XC_BRK:
+                break;
+
+            case XC_GOTO:
+                echo $indent, 'goto', ' line', $op['jmpouts'][0], ';', "\n";
+                break;
+
+            default:
+                echo $indent;
+                echo xcache_get_opcode($op['opcode']), ' line', $op['jmpouts'][0];
+                if (isset($op['jmpouts'][1])) {
+                    echo ', line', $op['jmpouts'][1];
+                }
+                echo ";";
+                // echo ' // <- line', $op['line'];
+                echo "\n";
+            }
             if (isset($op['cond'])) echo "$indent}\n";
         }
@@ -1521 +1537 @@
                     break;
                     // }}}
+                case XC_CONT:
+                case XC_BRK:
+                    $op['cond'] = null;
+                    $op['isjmp'] = true;
+                    $resvar = $opc == XC_CONT ? 'continue' : 'break';
+                    $count = str($this->getOpVal($op2, $EX));
+                    if ($count != '1') {
+                        $resvar .= ' ' . $count;
+                    }
+                    break;
                 case XC_GOTO:
                 case XC_JMP: // {{{
@@ -1531 +1557 @@
                     $caseValue = $this->getOpVal($op2, $EX);
                     $resvar = str($switchValue) . ' == ' . str($caseValue);
-                    break;
-                case XC_BRK:
                     break;
                 case XC_RECV_INIT:
@@ -1578 +1602 @@
                     $EX['silence'] --;
                     $lastresvar = '@' . str($lastresvar, $EX);
-                    break;
-                    // }}}
-                case XC_CONT: // {{{
                     break;
                     // }}}

trunk/decompilesample.php

@@ -186 +186 @@
 $a = $b ^ $c;
 $a = ~$b;
+$a = -$b;
+$a = +$b;
 $a = $b >> $c;
 $a = $b >> $c;
@@ -249 +251 @@
 
 foreach ($array as $key => $value) {
-    echo $key . ' = ' . $value . "\n";
-    continue;
+    foreach ($array as $key => $value) {
+        echo $key . ' = ' . $value . "\n";
+        break 2;
+        continue;
+    }
 }
 
@@ -279 +284 @@
 echo __LINE__;
 
-//* >= PHP 5.3
+//*
 echo 'PHP 5.3+ code testing';
 const CONST_VALUE = 1;
@@ -309 +314 @@
 $greet('PHP');
 $total = 0;
+$tax = 1;
 $callback = function ($quantity, $product) use ($tax, &$total) {
+    static $static = array(1);
+    $tax = 'tax';
     $pricePerItem = constant('PRICE_' . strtoupper($product));
     $total += $pricePerItem * $quantity * ($tax + 1);