Changeset 781

Timestamp:

2011-04-22T14:05:08+02:00 (2 years ago)

Author:

moo

Message:

Decompiler: handle closure use()

Location:

trunk

Files:

• Decompiler.class.php (modified) (5 diffs)
• decompilesample.php (modified) (1 diff)
• xcache.c (modified) (7 diffs)

trunk/Decompiler.class.php

@@ -1141 +1141 @@
                         break;
                     }
+                    if (is_a($rvalue, 'Decompiler_Fetch')) {
+                        $src = str($rvalue->src, $EX);
+                        if ('$' . unquoteName($src) == $lvalue) {
+                            switch ($rvalue->fetchType) {
+                            case ZEND_FETCH_STATIC:
+                                $statics = &$EX['op_array']['static_variables'];
+                                if ((xcache_get_type($statics[$name]) & IS_LEXICAL_VAR)) {
+                                    $EX['uses'][] = str($lvalue);
+                                    unset($statics);
+                                    break 2;
+                                }
+                                unset($statics);
+                            }
+                        }
+                    }
                     $resvar = "$lvalue = " . str($rvalue, $EX);
-                    if (0) {
-                    if ($op2['op_type'] == XC_IS_VAR) {
-                        $resvar .= ' /* isvar */';
-                    }
-                    else if ($op2['op_type'] == XC_IS_TMP_VAR) {
-                        $resvar .= ' /* istmp */';
-                    }
-                    }
                     break;
                     // }}}
@@ -1165 +1172 @@
                             case ZEND_FETCH_STATIC:
                                 $statics = &$EX['op_array']['static_variables'];
+                                if ((xcache_get_type($statics[$name]) & IS_LEXICAL_REF)) {
+                                    $EX['uses'][] = '&' . str($lvalue);
+                                    unset($statics);
+                                    break 2;
+                                }
+
                                 $resvar = 'static ' . $lvalue;
                                 $name = unquoteName($src);
@@ -1854 +1867 @@
     function duses(&$EX, $indent) // {{{
     {
-        if (!$EX['uses']) {
-            return;
-        }
-
-        $uses = array();
-        foreach ($EX['uses'] as $name => $value) {
-            $uses = '$' . $name;
-        }
-        echo ' use(', implode(', ', $uses), ')';
+        if ($EX['uses']) {
+            echo ' use(', implode(', ', $EX['uses']), ')';
+        }
     }
     // }}}
@@ -1886 +1893 @@
             $functionName = '';
         }
-        echo 'function ', $functionName, '(';
+        echo 'function', $functionName ? ' ' . $functionName : '', '(';
         $this->dargs($EX, $indent);
         echo ")";
@@ -2257 +2264 @@
 define('IS_CONSTANT', 8);
 define('IS_CONSTANT_ARRAY',   9);
+/* Ugly hack to support constants as static array indices */
+define('IS_CONSTANT_TYPE_MASK',   0x0f);
+define('IS_CONSTANT_UNQUALIFIED', 0x10);
+define('IS_CONSTANT_INDEX',       0x80);
+define('IS_LEXICAL_VAR',          0x20);
+define('IS_LEXICAL_REF',          0x40);
 
 @define('XC_IS_CV', 16);

trunk/decompilesample.php

@@ -360 +360 @@
 $total = 0;
 $tax = 1;
-$callback = function ($quantity, $product) use ($tax, &$total) {
-    static $static = array(1);
+$callback = function($quantity, $product) use($tax, &$total) {
+    $tax = 'tax';
+    static $static1 = array(1);
+    static $static2;
     $tax = 'tax';
     $tax = --$tax;

trunk/xcache.c

@@ -2876 +2876 @@
 /* }}} */
 /* {{{ proto int xcache_get_refcount(mixed variable)
-   Get reference count of variable */
+   XCache internal uses only: Get reference count of variable */
 PHP_FUNCTION(xcache_get_refcount)
 {
@@ -2888 +2888 @@
 /* }}} */
 /* {{{ proto bool xcache_get_isref(mixed variable)
-   check if variable data is marked referenced */
+   XCache internal uses only: Check if variable data is marked referenced */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xcache_get_isref, 0, 0, 1)
+    ZEND_ARG_INFO(1, variable)
+ZEND_END_ARG_INFO()
+
 PHP_FUNCTION(xcache_get_isref)
 {
@@ -2896 +2900 @@
     }
 
-    RETURN_BOOL(Z_ISREF_P(variable));
+    RETURN_BOOL(Z_ISREF_P(variable) && Z_REFCOUNT_P(variable) >= 3);
 }
 /* }}} */
@@ -3047 +3051 @@
 /* }}} */
 #endif
-/* {{{ proto mixed xcache_get_special_value(zval value) */
+/* {{{ proto mixed xcache_get_special_value(zval value)
+   XCache internal use only: For decompiler to get static value with type fixed */
 PHP_FUNCTION(xcache_get_special_value)
 {
@@ -3072 +3077 @@
         RETURN_NULL();
     }
+}
+/* }}} */
+/* {{{ proto int xcache_get_type(zval value)
+   XCache internal use only for disassembler to get variable type in engine level */
+PHP_FUNCTION(xcache_get_type)
+{
+    zval *value;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &value) == FAILURE) {
+        return;
+    }
+
+    RETURN_LONG(Z_TYPE_P(value));
 }
 /* }}} */
@@ -3126 +3144 @@
 #endif
     PHP_FE(xcache_get_special_value, NULL)
+    PHP_FE(xcache_get_type,          NULL)
     PHP_FE(xcache_get_op_type,       NULL)
     PHP_FE(xcache_get_data_type,     NULL)
@@ -3141 +3160 @@
     PHP_FE(xcache_unset_by_prefix,   NULL)
     PHP_FE(xcache_get_refcount,      NULL)
-    PHP_FE(xcache_get_isref,         NULL)
+    PHP_FE(xcache_get_isref,         arginfo_xcache_get_isref)
 #ifdef HAVE_XCACHE_DPRINT
     PHP_FE(xcache_dprint,            NULL)