Changeset 311 for trunk/processor/head.m4

Timestamp:

12/09/2006 05:27:03 PM (6 years ago)

Author:

moo

Message:

restruct cached compile, add md5 table to recognize and merge file with same content

Files:

• trunk/processor/head.m4 (modified) (11 diffs)

trunk/processor/head.m4

@@ -65 +65 @@
     zend_bool reference; /* enable if to deal with reference */
     zend_bool have_references;
-    const xc_entry_t *xce_src;
-    const xc_entry_t *xce_dst;
+    const xc_entry_data_php_t *php_src;
+    const xc_entry_data_php_t *php_dst;
+    const xc_cache_t          *cache;
     const zend_class_entry *cache_ce;
     zend_uint cache_class_num;
@@ -186 +187 @@
 static zend_ulong xc_get_class_num(xc_processor_t *processor, zend_class_entry *ce) {
     zend_ulong i;
-    const xc_entry_t *xce = processor->xce_src;
+    const xc_entry_data_php_t *php = processor->php_src;
     zend_class_entry *ceptr;
 
@@ -192 +193 @@
         return processor->cache_class_num;
     }
-    for (i = 0; i < xce->data.php->classinfo_cnt; i ++) {
-        ceptr = CestToCePtr(xce->data.php->classinfos[i].cest);
+    for (i = 0; i < php->classinfo_cnt; i ++) {
+        ceptr = CestToCePtr(php->classinfos[i].cest);
         if (ZCEP_REFCOUNT_PTR(ceptr) == ZCEP_REFCOUNT_PTR(ce)) {
             processor->cache_ce = ceptr;
@@ -209 +210 @@
     /* must be parent or currrent class */
     assert(class_num <= processor->active_class_num);
-    return CestToCePtr(processor->xce_dst->data.php->classinfos[class_num - 1].cest);
+    return CestToCePtr(processor->php_dst->classinfos[class_num - 1].cest);
 }
 #endif
@@ -275 +276 @@
 /* }}} */
 dnl ================ export API
-/* export: xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC); :export {{{ */
-xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC) {
-    xc_entry_t *dst;
+define(`DEFINE_STORE_API', `
+/* export: $1 *xc_processor_store_$1($1 *src TSRMLS_DC); :export {{{ */
+$1 *xc_processor_store_$1($1 *src TSRMLS_DC) {
+    $1 *dst;
     xc_processor_t processor;
 
     memset(&processor, 0, sizeof(processor));
     processor.reference = 1;
+    processor.cache = src->cache;
 
     IFASSERT(`xc_stack_init(&processor.allocsizes);')
@@ -295 +298 @@
         processor.size = ALIGN(processor.size + sizeof(src[0]));
 
-        xc_calc_xc_entry_t(&processor, src TSRMLS_CC);
+        xc_calc_$1(&processor, src TSRMLS_CC);
         if (processor.reference) {
             zend_hash_destroy(&processor.zvalptrs);
@@ -302 +305 @@
     }
     src->size = processor.size;
-    src->have_references = processor.have_references;
+    ifelse(`$1', `xc_entry_t', `
+        src->data.var->have_references = processor.have_references;
+    ', `
+        src->have_references = processor.have_references;
+    ')
 
     IFASSERT(`xc_stack_reverse(&processor.allocsizes);')
@@ -314 +321 @@
 
         /* mem :) */
-        processor.p = (char *) src->cache->mem->handlers->malloc(src->cache->mem, processor.size);
+        processor.p = (char *) processor.cache->mem->handlers->malloc(processor.cache->mem, processor.size);
         if (processor.p == NULL) {
             dst = NULL;
@@ -323 +330 @@
 
         /* allocate */
-        dst = (xc_entry_t *) processor.p;
+        dst = ($1 *) processor.p;
         processor.p = (char *) ALIGN(processor.p + sizeof(dst[0]));
 
-        xc_store_xc_entry_t(&processor, dst, src TSRMLS_CC);
+        xc_store_$1(&processor, dst, src TSRMLS_CC);
         IFASSERT(` {
             int real = processor.p - oldp;
@@ -348 +355 @@
 }
 /* }}} */
-/* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */
-xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC) {
+')
+DEFINE_STORE_API(`xc_entry_t')
+DEFINE_STORE_API(`xc_entry_data_php_t')
+/* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src TSRMLS_DC); :export {{{ */
+xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src TSRMLS_DC) {
+    xc_processor_t processor;
+
+    memset(&processor, 0, sizeof(processor));
+    xc_restore_xc_entry_t(&processor, dst, src TSRMLS_CC);
+
+    return dst;
+}
+/* }}} */
+/* export: xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */
+xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC) {
     xc_processor_t processor;
 
     memset(&processor, 0, sizeof(processor));
     processor.readonly_protection = readonly_protection;
+    /* this function is used for php data only */
     if (src->have_references) {
         processor.reference = 1;
@@ -361 +382 @@
         zend_hash_init(&processor.zvalptrs, 0, NULL, NULL, 0);
     }
-    xc_restore_xc_entry_t(&processor, dst, src TSRMLS_CC);
+    xc_restore_xc_entry_data_php_t(&processor, dst, src TSRMLS_CC);
     if (processor.reference) {
         zend_hash_destroy(&processor.zvalptrs);