Changeset 762 for trunk/Decompiler.class.php

Timestamp:

2011-04-17T14:00:32+02:00 (2 years ago)

Author:

moo

Message:

Decompiler: improve dumpop for easier reading

File:

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

trunk/Decompiler.class.php

@@ -634 +634 @@
             if ($opcodes[$last]['opcode'] == XC_HANDLE_EXCEPTION) {
                 $this->usedOps[XC_HANDLE_EXCEPTION] = true;
-                unset($opcodes[$last]);
+                $opcodes[$last]['opcode'] = XC_NOP;
                 --$last;
             }
@@ -640 +640 @@
                 $op1 = $opcodes[$last]['op1'];
                 if ($op1['op_type'] == XC_IS_CONST && array_key_exists('constant', $op1) && $op1['constant'] === $defaultReturnValue) {
-                    unset($opcodes[$last]);
+                    $opcodes[$last]['opcode'] = XC_NOP;
                     --$last;
                 }
@@ -913 +913 @@
                 continue;
             }
-            // echo $i; $this->dumpop($op, $EX); //var_dump($op);
+            // echo $i, ' '; $this->dumpop($op, $EX); //var_dump($op);
 
             $resvar = null;
@@ -1725 +1725 @@
         $op1 = $op['op1'];
         $op2 = $op['op2'];
-        $d = array('opname' => xcache_get_opcode($op['opcode']), 'opcode' => $op['opcode']);
-
-        foreach (array('op1' => 'op1', 'op2' => 'op2', 'result' => 'res') as $k => $kk) {
+        $d = array('n' => xcache_get_opcode($op['opcode']), 'c' => $op['opcode']);
+
+        foreach (array('op1' => '1:', 'op2' => '2:', 'result' => '>') as $k => $kk) {
             switch ($op[$k]['op_type']) {
             case XC_IS_UNUSED:
-                $d[$kk] = '*UNUSED* ' . $op[$k]['opline_num'];
+                $d[$kk] = 'U:' . $op[$k]['opline_num'];
                 break;
 
             case XC_IS_VAR:
                 $d[$kk] = '$' . $op[$k]['var'];
-                if ($kk != 'res') {
+                if ($k != 'result') {
                     $d[$kk] .= ':' . str($this->getOpVal($op[$k], $EX));
                 }
@@ -1742 +1742 @@
             case XC_IS_TMP_VAR:
                 $d[$kk] = '#' . $op[$k]['var'];
-                if ($kk != 'res') {
+                if ($k != 'result') {
                     $d[$kk] .= ':' . str($this->getOpVal($op[$k], $EX));
                 }
@@ -1752 +1752 @@
 
             default:
-                if ($kk == 'res') {
+                if ($k == 'result') {
                     var_dump($op);
                     exit;
@@ -1762 +1762 @@
             }
         }
-        $d['ext'] = $op['extended_value'];
-
-        var_dump($d);
+        $d[';'] = $op['extended_value'];
+
+        foreach ($d as $k => $v) {
+            echo $k, str($v), "\t";
+        }
+        echo PHP_EOL;
     }
     // }}}