Changeset 731 for trunk/phpdop.phpr

Timestamp:

04/10/2011 11:07:58 AM (2 years ago)

Author:

moo

Message:

PHP_6: disassembler/decompiler: fix function static variable

Files:

• trunk/phpdop.phpr (modified) (4 diffs)

trunk/phpdop.phpr

@@ -3 +3 @@
 
 $srcdir = dirname(__FILE__);
+require_once("$srcdir/Decompiler.class.php");
 if (file_exists("$srcdir/phpdc.debug.php")) {
     include("$srcdir/phpdc.debug.php");
@@ -11 +12 @@
     switch ($op['op_type']) {
     case 1: // CONST
-        return var_export($op['u.constant'], true);
+        return var_export($op['constant'], true);
 
     case 2: // IS_TMP_VAR
-        return 't@' . $op['u.var'];
+        return 't@' . $op['var'];
 
     case 4:
-        return 'v$' . $op['u.var'];
+        return 'v$' . $op['var'];
 
     case 8: // UNUSED
-        if (isset($op['u.opline_num'])) {
-            return 'l#' . $op['u.opline_num'];
+        if (isset($op['opline_num'])) {
+            return 'l#' . $op['opline_num'];
         }
         else {
@@ -28 +29 @@
 
     default:
-        return $op['op_type'] . $op['u.var'];
+        return $op['op_type'] . $op['var'];
     }
 }
 
-function dump_opcodes($op_array, $indent = '')
+function dump_opcodes($opcodes, $indent = '')
 {
+    global $decompiler;
+
     $types = array('result' => 5, 'op1' => 20, 'op2' => 20);
-    foreach ($op_array as $line => $op) {
+    foreach ($decompiler->fixOpcode($opcodes) as $line => $op) {
         echo $indent;
         echo sprintf("%3d ", $op['lineno']);
@@ -91 +94 @@
     die("Usage: $argv[0] <file>\n");
 }
+$decompiler = new Decompiler();
 $pk = xcache_dasm_file($argv[1]);
 $op_array = $funcs = $classes = null;