Changeset 709 for trunk/disassembler.c

Timestamp:

04/08/2011 06:08:37 AM (2 years ago)

Author:

moo

Message:

disassembler: don't dump builtin functions

Files:

• trunk/disassembler.c (modified) (5 diffs)

trunk/disassembler.c

@@ -6 +6 @@
 #define return_value dst
 
+/* sandbox {{{ */
+#undef TG
+#undef OG
+#define TG(x) (sandbox->tmp_##x)
+#define OG(x) (sandbox->orig_##x)
+/* }}} */
+
 #ifndef HAVE_XCACHE_OPCODE_SPEC_DEF
 #error disassembler cannot be built without xcache/opcode_spec_def.h
 #endif
-static void xc_dasm(zval *dst, zend_op_array *op_array TSRMLS_DC) /* {{{ */
+static void xc_dasm(xc_sandbox_t *sandbox, zval *dst, zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {
     Bucket *b;
@@ -33 +40 @@
     ALLOC_INIT_ZVAL(list);
     array_init(list);
-    xc_dasm_HashTable_zend_function(list, CG(function_table) TSRMLS_CC);
+    b = TG(internal_function_tail) ? TG(internal_function_tail)->pListNext : TG(function_table).pListHead;
+    for (; b; b = b->pListNext) {
+        ALLOC_INIT_ZVAL(zv);
+        array_init(zv);
+        xc_dasm_zend_function(zv, b->pData TSRMLS_CC);
+
+        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), b->arKey, b->nKeyLength, zv);
+    }
     add_assoc_zval_ex(dst, ZEND_STRS("function_table"), list);
     
@@ -39 +53 @@
     ALLOC_INIT_ZVAL(list);
     array_init(list);
-    for (b = CG(class_table)->pListHead; b; b = b->pListNext) {
+    b = TG(internal_class_tail) ? TG(internal_class_tail)->pListNext : TG(class_table).pListHead;
+    for (; b; b = b->pListNext) {
         ALLOC_INIT_ZVAL(zv);
         array_init(zv);
@@ -97 +112 @@
     }
 
-    xc_dasm(dst, op_array TSRMLS_CC);
+    xc_dasm(&sandbox, dst, op_array TSRMLS_CC);
 
     /* free */
@@ -142 +157 @@
     }
 
-    xc_dasm(dst, op_array TSRMLS_CC);
+    xc_dasm(&sandbox, dst, op_array TSRMLS_CC);
 
     /* free */