Changeset 618

Timestamp:

2009-07-05T08:34:06+02:00 (4 years ago)

Author:

moo

Message:

merged r487,r491,r492,r495 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff)
• const_string.c (modified) (2 diffs)
• processor/processor.m4 (modified) (4 diffs)
• xcache.h (modified) (1 diff)

branches/1.3/ChangeLog

@@ -7 +7 @@
 1.2.2 2007-12-29
 == ChangeLog ==
+ * added module dependency
  * added module dependency
  * live with wrong system time: allow caching files with mtime in further

branches/1.3/const_string.c

@@ -48 +48 @@
     /* 8 */ "IS_CONSTANT",
     /* 9 */ "IS_CONSTANT_ARRAY",
-    /* 10 */ "IS_UNICODE",
-#if 0
-    /* 11 */ "",
-    /* 12 */ "",
-    /* 13 */ "",
-    /* 14 */ "",
-    /* 15 */ "", "", "", "", "",
-
-/* IS_CONSTANT_INDEX */
-    /* 20 */ "CIDX IS_NULL",
-    /* 21 */ "CIDX IS_LONG",
-    /* 22 */ "CIDX IS_DOUBLE",
-    /* 23 */ "CIDX IS_BOOL",
-    /* 24 */ "CIDX IS_ARRAY",
-    /* 25 */ "CIDX IS_OBJECT",
-    /* 26 */ "CIDX IS_STRING",
-    /* 27 */ "CIDX IS_RESOURCE",
-    /* 28 */ "CIDX IS_CONSTANT",
-    /* 29 */ "CIDX IS_CONSTANT_ARRAY"
-    /* 20 */ "CIDX IS_UNICODE",
-#endif
+    /* 10 */ "IS_UNICODE"
 };
 
@@ -78 +58 @@
 const char *xc_get_data_type(zend_uchar data_type)
 {
-#if 0
-    if (data_type & IS_CONSTANT_INDEX) {
-        data_type = (data_type & ~IS_CONSTANT_INDEX) + 20;
-    }
-#endif
-    data_type &= ~IS_CONSTANT_INDEX;
-    return data_type_names[data_type];
+    return data_type_names[(data_type & IS_CONSTANT_TYPE_MASK)];
 }
 /* }}} */

branches/1.3/processor/processor.m4

@@ -79 +79 @@
         *dst = *src;
         zval_copy_ctor(dst);
-        ZVAL_REFCOUNT(dst) = 1;
+        Z_SET_REFCOUNT(*dst, 1);
         DONE(value)
         DONE(type)
@@ -96 +96 @@
 dnl {{{ zvalue_value
         DISABLECHECK(`
-        switch (src->type & ~IS_CONSTANT_INDEX) {
+        switch ((Z_TYPE_P(src) & IS_CONSTANT_TYPE_MASK)) {
             case IS_LONG:
             case IS_RESOURCE:
@@ -756 +756 @@
 #ifdef HAVE_XCACHE_CONSTANT
     DISPATCH(zend_uint, constinfo_cnt)
-    STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
+    IFRESTORE(`
+        COPY(constinfos)
+    ', `
+        STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
+    ')
 #endif
 
@@ -769 +773 @@
     ')
     STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos)
+    popdef(`BEFORE_LOOP')
 #ifdef ZEND_ENGINE_2_1
     DISPATCH(zend_uint, autoglobal_cnt)
-    STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
+    IFRESTORE(`
+        COPY(autoglobals)
+    ', `
+        STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
+    ')
 #endif
     DISPATCH(zend_bool, have_early_binding)
-    popdef(`BEFORE_LOOP')
 ')
 dnl }}}

branches/1.3/xcache.h

@@ -55 +55 @@
 #ifndef Z_SET_REFCOUNT
 #   define Z_SET_REFCOUNT(z, rc) (z).refcount = rc;
+#endif
+#ifndef IS_CONSTANT_TYPE_MASK
+#   define IS_CONSTANT_TYPE_MASK 0xf
 #endif