Changeset 726 for branches/1.3/disassembler.c

Timestamp:

2011-04-09T14:59:31+02:00 (2 years ago)

Author:

moo

Message:

merge from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• disassembler.c (modified) (8 diffs)

branches/1.3/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;
@@ -16 +23 @@
     int bufsize = 2;
     char *buf;
-    int keysize;
 
     xc_compile_result_init_cur(&cr, op_array TSRMLS_CC);
@@ -33 +39 @@
     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), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength, zv);
+    }
     add_assoc_zval_ex(dst, ZEND_STRS("function_table"), list);
     
@@ -39 +52 @@
     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) {
+        int keysize, keyLength;
+
         ALLOC_INIT_ZVAL(zv);
         array_init(zv);
@@ -53 +69 @@
         memcpy(buf, BUCKET_KEY_S(b), keysize);
         buf[keysize - 2] = buf[keysize - 1] = ""[0];
-        keysize = b->nKeyLength;
+        keyLength = b->nKeyLength;
 #ifdef IS_UNICODE
         if (BUCKET_KEY_TYPE(b) == IS_UNICODE) {
             if (buf[0] == ""[0] && buf[1] == ""[0]) {
-                keysize ++;
+                keyLength ++;
             }
         } else
@@ -63 +79 @@
         {
             if (buf[0] == ""[0]) {
-                keysize ++;
+                keyLength ++;
             }
         }
-        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(buf), b->nKeyLength, zv);
+        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(buf), keyLength, zv);
     }
     efree(buf);
@@ -97 +113 @@
     }
 
-    xc_dasm(dst, op_array TSRMLS_CC);
+    xc_dasm(&sandbox, dst, op_array TSRMLS_CC);
 
     /* free */
@@ -142 +158 @@
     }
 
-    xc_dasm(dst, op_array TSRMLS_CC);
+    xc_dasm(&sandbox, dst, op_array TSRMLS_CC);
 
     /* free */