Changeset 618 in svn


Ignore:
Timestamp:
2009-07-05T08:34:06+02:00 (6 years ago)
Author:
Xuefer
Message:

merged r487,r491,r492,r495 from trunk

Location:
branches/1.3
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/ChangeLog

    r614 r618  
    771.2.2 2007-12-29
    88== ChangeLog ==
     9 * added module dependency
    910 * added module dependency
    1011 * live with wrong system time: allow caching files with mtime in further
  • branches/1.3/const_string.c

    r617 r618  
    4848    /* 8 */ "IS_CONSTANT",
    4949    /* 9 */ "IS_CONSTANT_ARRAY",
    50     /* 10 */ "IS_UNICODE",
    51 #if 0
    52     /* 11 */ "",
    53     /* 12 */ "",
    54     /* 13 */ "",
    55     /* 14 */ "",
    56     /* 15 */ "", "", "", "", "",
    57 
    58 /* IS_CONSTANT_INDEX */
    59     /* 20 */ "CIDX IS_NULL",
    60     /* 21 */ "CIDX IS_LONG",
    61     /* 22 */ "CIDX IS_DOUBLE",
    62     /* 23 */ "CIDX IS_BOOL",
    63     /* 24 */ "CIDX IS_ARRAY",
    64     /* 25 */ "CIDX IS_OBJECT",
    65     /* 26 */ "CIDX IS_STRING",
    66     /* 27 */ "CIDX IS_RESOURCE",
    67     /* 28 */ "CIDX IS_CONSTANT",
    68     /* 29 */ "CIDX IS_CONSTANT_ARRAY"
    69     /* 20 */ "CIDX IS_UNICODE",
    70 #endif
     50    /* 10 */ "IS_UNICODE"
    7151};
    7252
     
    7858const char *xc_get_data_type(zend_uchar data_type)
    7959{
    80 #if 0
    81     if (data_type & IS_CONSTANT_INDEX) {
    82         data_type = (data_type & ~IS_CONSTANT_INDEX) + 20;
    83     }
    84 #endif
    85     data_type &= ~IS_CONSTANT_INDEX;
    86     return data_type_names[data_type];
     60    return data_type_names[(data_type & IS_CONSTANT_TYPE_MASK)];
    8761}
    8862/* }}} */
  • branches/1.3/processor/processor.m4

    r617 r618  
    7979        *dst = *src;
    8080        zval_copy_ctor(dst);
    81         ZVAL_REFCOUNT(dst) = 1;
     81        Z_SET_REFCOUNT(*dst, 1);
    8282        DONE(value)
    8383        DONE(type)
     
    9696dnl {{{ zvalue_value
    9797        DISABLECHECK(`
    98         switch (src->type & ~IS_CONSTANT_INDEX) {
     98        switch ((Z_TYPE_P(src) & IS_CONSTANT_TYPE_MASK)) {
    9999            case IS_LONG:
    100100            case IS_RESOURCE:
     
    756756#ifdef HAVE_XCACHE_CONSTANT
    757757    DISPATCH(zend_uint, constinfo_cnt)
    758     STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
     758    IFRESTORE(`
     759        COPY(constinfos)
     760    ', `
     761        STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
     762    ')
    759763#endif
    760764
     
    769773    ')
    770774    STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos)
     775    popdef(`BEFORE_LOOP')
    771776#ifdef ZEND_ENGINE_2_1
    772777    DISPATCH(zend_uint, autoglobal_cnt)
    773     STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
     778    IFRESTORE(`
     779        COPY(autoglobals)
     780    ', `
     781        STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
     782    ')
    774783#endif
    775784    DISPATCH(zend_bool, have_early_binding)
    776     popdef(`BEFORE_LOOP')
    777785')
    778786dnl }}}
  • branches/1.3/xcache.h

    r617 r618  
    5555#ifndef Z_SET_REFCOUNT
    5656#   define Z_SET_REFCOUNT(z, rc) (z).refcount = rc;
     57#endif
     58#ifndef IS_CONSTANT_TYPE_MASK
     59#   define IS_CONSTANT_TYPE_MASK 0xf
    5760#endif
    5861
Note: See TracChangeset for help on using the changeset viewer.