Changeset 749 for trunk/disassembler.c

Timestamp:

04/16/2011 09:01:39 PM (2 years ago)

Author:

moo

Message:

decompiler: massive improvements for php 5 and 5.3

Files:

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

trunk/disassembler.c

@@ -37 +37 @@
     add_assoc_zval_ex(dst, ZEND_STRS("op_array"), zv);
 
+    buf = emalloc(bufsize);
+
     ALLOC_INIT_ZVAL(list);
     array_init(list);
     b = TG(internal_function_tail) ? TG(internal_function_tail)->pListNext : TG(function_table).pListHead;
     for (; b; b = b->pListNext) {
+        int keysize, keyLength;
+
         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);
-    
-    buf = emalloc(bufsize);
-    ALLOC_INIT_ZVAL(list);
-    array_init(list);
-    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);
-        xc_dasm_zend_class_entry(zv, CestToCePtr(*(xc_cest_t *)b->pData) TSRMLS_CC);
 
         keysize = BUCKET_KEY_SIZE(b) + 2;
@@ -82 +71 @@
             }
         }
+
+        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(buf), keyLength, zv);
+    }
+    add_assoc_zval_ex(dst, ZEND_STRS("function_table"), list);
+    
+    ALLOC_INIT_ZVAL(list);
+    array_init(list);
+    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);
+        xc_dasm_zend_class_entry(zv, CestToCePtr(*(xc_cest_t *)b->pData) TSRMLS_CC);
+
+        keysize = BUCKET_KEY_SIZE(b) + 2;
+        if (keysize > bufsize) {
+            do {
+                bufsize *= 2;
+            } while (keysize > bufsize);
+            buf = erealloc(buf, bufsize);
+        }
+        memcpy(buf, BUCKET_KEY_S(b), keysize);
+        buf[keysize - 2] = buf[keysize - 1] = ""[0];
+        keyLength = b->nKeyLength;
+#ifdef IS_UNICODE
+        if (BUCKET_KEY_TYPE(b) == IS_UNICODE) {
+            if (buf[0] == ""[0] && buf[1] == ""[0]) {
+                keyLength ++;
+            }
+        } else
+#endif
+        {
+            if (buf[0] == ""[0]) {
+                keyLength ++;
+            }
+        }
         add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(buf), keyLength, zv);
     }