Changeset 781 for trunk/xcache.c

Timestamp:

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

Author:

moo

Message:

Decompiler: handle closure use()

File:

• trunk/xcache.c (modified) (7 diffs)

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)