Index: /trunk/processor/head.m4 =================================================================== --- /trunk/processor/head.m4 (revision 916) +++ /trunk/processor/head.m4 (revision 917) @@ -63,6 +63,11 @@ typedef zend_trait_precedence *zend_trait_precedence_ptr; #endif - -typedef zend_uchar xc_zval_data_type; +#ifdef ZEND_ENGINE_2_3 +typedef int last_brk_cont_t; +#else +typedef zend_uint last_brk_cont_t; +#endif + +typedef zend_uchar xc_zval_type_t; typedef int xc_op_type; typedef zend_uchar xc_opcode; Index: /trunk/processor/process.m4 =================================================================== --- /trunk/processor/process.m4 (revision 916) +++ /trunk/processor/process.m4 (revision 917) @@ -20,5 +20,5 @@ ') dnl }}} -define(`PROCESS_zval_data_type', `dnl {{{ (1:elm) +define(`PROCESS_xc_zval_type_t', `dnl {{{ (1:elm) IFDPRINT(` INDENT() @@ -28,5 +28,5 @@ ') dnl }}} -define(`PROCESS_op_type', `dnl {{{ (1:elm) +define(`PROCESS_xc_op_type', `dnl {{{ (1:elm) IFDPRINT(` INDENT() @@ -36,5 +36,5 @@ ') dnl }}} -define(`PROCESS_opcode', `dnl {{{ (1:elm) +define(`PROCESS_xc_opcode', `dnl {{{ (1:elm) IFDPRINT(` INDENT() @@ -66,9 +66,10 @@ , `$1', `xc_entry_type_t', `PROCESS_SCALAR(`$2', `d', `$1')' , `$1', `xc_hash_value_t', `PROCESS_SCALAR(`$2', `lu', `$1')' + , `$1', `last_brk_cont_t', `PROCESS_SCALAR(`$2', `d', `$1')' , `$1', `xc_ztstring', `PROCESS_xc_ztstring(`$2')' - , `$1', `xc_zval_data_type', `PROCESS_zval_data_type(`$2')' - , `$1', `xc_op_type', `PROCESS_op_type(`$2')' - , `$1', `xc_opcode', `PROCESS_opcode(`$2')' + , `$1', `xc_zval_type_t', `PROCESS_xc_zval_type_t(`$2')' + , `$1', `xc_op_type', `PROCESS_xc_op_type(`$2')' + , `$1', `xc_opcode', `PROCESS_xc_opcode(`$2')' , `$1', `opcode_handler_t', `/* is copying enough? */COPY(`$2')' , `$1', `xc_md5sum_t', `COPY(`$2')' Index: /trunk/processor/processor.m4 =================================================================== --- /trunk/processor/processor.m4 (revision 916) +++ /trunk/processor/processor.m4 (revision 917) @@ -141,5 +141,5 @@ dnl }}} DONE(value) - PROCESS(xc_zval_data_type, type) + PROCESS(xc_zval_type_t, type) #ifdef ZEND_ENGINE_2_3 PROCESS(zend_uchar, is_ref__gc) @@ -380,7 +380,7 @@ #ifdef ZEND_ENGINE_2_4 - STRUCT_ARRAY(default_properties_count, zval_ptr_nullable, default_properties_table) + STRUCT_ARRAY(int, default_properties_count, zval_ptr_nullable, default_properties_table) PROCESS(int, default_properties_count) - STRUCT_ARRAY(default_static_members_count, zval_ptr_nullable, default_static_members_table) + STRUCT_ARRAY(int, default_static_members_count, zval_ptr_nullable, default_static_members_table) PROCESS(int, default_static_members_count) IFCOPY(`dst->static_members_table = dst->default_static_members_table;') @@ -411,6 +411,6 @@ COPYNULL(traits) COPYZERO(num_traits) - STRUCT_ARRAY(, zend_trait_alias_ptr, trait_aliases) - STRUCT_ARRAY(, zend_trait_precedence_ptr, trait_precedences) + STRUCT_ARRAY(, , zend_trait_alias_ptr, trait_aliases) + STRUCT_ARRAY(, , zend_trait_precedence_ptr, trait_precedences) # endif #else @@ -716,5 +716,5 @@ STRUCT_P(HashTable, static_variables, HashTable_zval_ptr) #ifdef ZEND_ENGINE_2 - STRUCT_ARRAY(num_args, zend_arg_info, arg_info) + STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info) gc_arg_info = 1; #endif @@ -793,5 +793,5 @@ #ifdef ZEND_ENGINE_2 PROCESS(zend_uint, fn_flags) - STRUCT_ARRAY(num_args, zend_arg_info, arg_info) + STRUCT_ARRAY(zend_uint, num_args, zend_arg_info, arg_info) PROCESS(zend_uint, num_args) PROCESS(zend_uint, required_num_args) @@ -833,10 +833,10 @@ #ifdef ZEND_ENGINE_2_4 dnl used when copying opcodes - STRUCT_ARRAY(last_literal, zend_literal, literals) + STRUCT_ARRAY(int, last_literal, zend_literal, literals) PROCESS(int, last_literal) #endif dnl uses literals - STRUCT_ARRAY(last, zend_op, opcodes) + STRUCT_ARRAY(zend_uint, last, zend_op, opcodes) PROCESS(zend_uint, last) #ifndef ZEND_ENGINE_2_4 @@ -845,5 +845,5 @@ #ifdef IS_CV - STRUCT_ARRAY(last_var, zend_compiled_variable, vars) + STRUCT_ARRAY(int, last_var, zend_compiled_variable, vars) PROCESS(int, last_var) # ifndef ZEND_ENGINE_2_4 @@ -859,6 +859,6 @@ PROCESS(zend_uint, T) - STRUCT_ARRAY(last_brk_cont, zend_brk_cont_element, brk_cont_array) - PROCESS(zend_uint, last_brk_cont) + STRUCT_ARRAY(last_brk_cont_t, last_brk_cont, zend_brk_cont_element, brk_cont_array) + PROCESS(last_brk_cont_t, last_brk_cont) #ifndef ZEND_ENGINE_2_4 PROCESS(zend_uint, current_brk_cont) @@ -869,5 +869,5 @@ #ifdef ZEND_ENGINE_2 - STRUCT_ARRAY(last_try_catch, zend_try_catch_element, try_catch_array) + STRUCT_ARRAY(int, last_try_catch, zend_try_catch_element, try_catch_array) PROCESS(int, last_try_catch) #endif @@ -997,8 +997,8 @@ #ifdef ZEND_ENGINE_2_4 PROCESS(zend_uint, literalinfo_cnt) - STRUCT_ARRAY(literalinfo_cnt, xc_op_array_info_detail_t, literalinfos) + STRUCT_ARRAY(zend_uint, literalinfo_cnt, xc_op_array_info_detail_t, literalinfos) #else PROCESS(zend_uint, oplineinfo_cnt) - STRUCT_ARRAY(oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos) + STRUCT_ARRAY(zend_uint, oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos) #endif ') @@ -1035,5 +1035,5 @@ PROCESS(zend_uint, methodinfo_cnt) IFRESTORE(`COPY(methodinfos)', ` - STRUCT_ARRAY(methodinfo_cnt, xc_op_array_info_t, methodinfos) + STRUCT_ARRAY(zend_uint, methodinfo_cnt, xc_op_array_info_t, methodinfos) ') IFRESTORE(` @@ -1103,12 +1103,12 @@ #ifdef HAVE_XCACHE_CONSTANT PROCESS(zend_uint, constinfo_cnt) - STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos) + STRUCT_ARRAY(zend_uint, constinfo_cnt, xc_constinfo_t, constinfos) #endif PROCESS(zend_uint, funcinfo_cnt) - STRUCT_ARRAY(funcinfo_cnt, xc_funcinfo_t, funcinfos) + STRUCT_ARRAY(zend_uint, funcinfo_cnt, xc_funcinfo_t, funcinfos) PROCESS(zend_uint, classinfo_cnt) - STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index')) + STRUCT_ARRAY(zend_uint, classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index')) #ifdef ZEND_ENGINE_2_1 PROCESS(zend_uint, autoglobal_cnt) @@ -1116,5 +1116,5 @@ COPY(autoglobals) ', ` - STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals) + STRUCT_ARRAY(zend_uint, autoglobal_cnt, xc_autoglobal_t, autoglobals) ') #endif @@ -1124,5 +1124,5 @@ COPY(compilererrors) ', ` - STRUCT_ARRAY(compilererror_cnt, xc_compilererror_t, compilererrors) + STRUCT_ARRAY(zend_uint, compilererror_cnt, xc_compilererror_t, compilererrors) ') #endif Index: /trunk/processor/struct.m4 =================================================================== --- /trunk/processor/struct.m4 (revision 916) +++ /trunk/processor/struct.m4 (revision 917) @@ -172,11 +172,11 @@ ') dnl }}} -dnl {{{ STRUCT_ARRAY(1:count, 2:type, 3:elm, 4:name=type, 5:loopcounter) +dnl {{{ STRUCT_ARRAY(1:count_type, 2:count, 3:type, 4:elm, 5:name=type, 6:loopcounter) define(`STRUCT_ARRAY', ` - if (SRC(`$3')) { + if (SRC(`$4')) { ifelse( - `$5', `', `int i; pushdef(`LOOPCOUNTER', `i')', - `', `', `pushdef(`LOOPCOUNTER', `$5')') - pushdefFUNC_NAME(`$2', `$4') + `$6', `', `ifelse(`$1', `', `size_t', `$1') i; pushdef(`LOOPCOUNTER', `i')', + `', `', `pushdef(`LOOPCOUNTER', `$6')') + pushdefFUNC_NAME(`$3', `$5') IFDASM(` zval *arr; @@ -185,6 +185,6 @@ for (LOOPCOUNTER = 0; - ifelse(`$1', `', `SRC(`$3[LOOPCOUNTER]')', - `', `', `LOOPCOUNTER < SRC(`$1')'); + ifelse(`$2', `', `SRC(`$4[LOOPCOUNTER]')', + `', `', `LOOPCOUNTER < SRC(`$2')'); ++LOOPCOUNTER) { zval *zv; @@ -192,13 +192,13 @@ ALLOC_INIT_ZVAL(zv); array_init(zv); - FUNC_NAME (zv, &(SRC(`$3[LOOPCOUNTER]')) TSRMLS_CC); + FUNC_NAME (zv, &(SRC(`$4[LOOPCOUNTER]')) TSRMLS_CC); add_next_index_zval(arr, zv); } - add_assoc_zval_ex(dst, ZEND_STRS("$3"), arr); + add_assoc_zval_ex(dst, ZEND_STRS("$4"), arr); ', ` dnl find count with NULL - ifelse(`$1', `', ` + ifelse(`$2', `', ` size_t count = 0; - while (SRC(`$3[count]')) { + while (SRC(`$4[count]')) { ++count; } @@ -206,26 +206,26 @@ pushdef(`ARRAY_ELEMENT_COUNT', `count') ', - `', `', `pushdef(`ARRAY_ELEMENT_COUNT', `SRC(`$1')')') - ALLOC(`dst->$3', `$2', `ARRAY_ELEMENT_COUNT') + `', `', `pushdef(`ARRAY_ELEMENT_COUNT', `SRC(`$2')')') + ALLOC(`dst->$4', `$3', `ARRAY_ELEMENT_COUNT') popdef(`ARRAY_ELEMENT_COUNT') for (LOOPCOUNTER = 0; - ifelse(`$1', `', `SRC(`$3[LOOPCOUNTER]')', - `', `', `LOOPCOUNTER < SRC(`$1')'); + ifelse(`$2', `', `SRC(`$4[LOOPCOUNTER]')', + `', `', `LOOPCOUNTER < SRC(`$2')'); ++LOOPCOUNTER) { DISABLECHECK(` - STRUCT(`$2', `$3[LOOPCOUNTER]', `$4') + STRUCT(`$3', `$4[LOOPCOUNTER]', `$5') ') } dnl the end marker - ifelse(`$1', `', `IFCOPY(`DST(`$3[LOOPCOUNTER]') = NULL;')') + ifelse(`$2', `', `IFCOPY(`DST(`$4[LOOPCOUNTER]') = NULL;')') ')dnl IFDASM - DONE(`$3') + DONE(`$4') popdef(`FUNC_NAME') popdef(`LOOPCOUNTER') } else { - COPYNULL(`$3') - } -') -dnl }}} + COPYNULL(`$4') + } +') +dnl }}} Index: /trunk/utils.c =================================================================== --- /trunk/utils.c (revision 916) +++ /trunk/utils.c (revision 917) @@ -176,5 +176,5 @@ #endif case ZEND_JMP: - assert(Z_OP(opline->op1).jmp_addr >= op_array->opcodes && Z_OP(opline->op1).jmp_addr - op_array->opcodes < op_array->last); + assert(Z_OP(opline->op1).jmp_addr >= op_array->opcodes && (zend_uint) (Z_OP(opline->op1).jmp_addr - op_array->opcodes) < op_array->last); Z_OP(opline->op1).opline_num = Z_OP(opline->op1).jmp_addr - op_array->opcodes; break; @@ -189,5 +189,5 @@ case ZEND_JMP_SET_VAR: #endif - assert(Z_OP(opline->op2).jmp_addr >= op_array->opcodes && Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last); + assert(Z_OP(opline->op2).jmp_addr >= op_array->opcodes && (zend_uint) (Z_OP(opline->op2).jmp_addr - op_array->opcodes) < op_array->last); Z_OP(opline->op2).opline_num = Z_OP(opline->op2).jmp_addr - op_array->opcodes; break; Index: /trunk/xcache.c =================================================================== --- /trunk/xcache.c (revision 916) +++ /trunk/xcache.c (revision 917) @@ -38,5 +38,5 @@ #include "utils.h" -#define VAR_ENTRY_EXPIRED(pentry) ((pentry)->ttl && XG(request_time) > (pentry)->ctime + (pentry)->ttl) +#define VAR_ENTRY_EXPIRED(pentry) ((pentry)->ttl && XG(request_time) > (pentry)->ctime + (time_t) (pentry)->ttl) #define CHECK(x, e) do { if ((x) == NULL) { zend_error(E_ERROR, "XCache: " e); goto err; } } while (0) #define LOCK(x) xc_lock((x)->lck) @@ -464,5 +464,5 @@ { TRACE("ttl %lu, %lu %lu", (zend_ulong) XG(request_time), (zend_ulong) entry->atime, xc_php_ttl); - if (XG(request_time) > entry->atime + xc_php_ttl) { + if (XG(request_time) > entry->atime + (time_t) xc_php_ttl) { return 1; } @@ -481,7 +481,7 @@ { TRACE("interval %lu, %lu %lu", (zend_ulong) XG(request_time), (zend_ulong) cache->last_gc_expires, gc_interval); - if (XG(request_time) - cache->last_gc_expires >= gc_interval) { + if (XG(request_time) >= cache->last_gc_expires + (time_t) gc_interval) { ENTER_LOCK(cache) { - if (XG(request_time) - cache->last_gc_expires >= gc_interval) { + if (XG(request_time) >= cache->last_gc_expires + (time_t) gc_interval) { cache->last_gc_expires = XG(request_time); xc_entry_apply_unlocked(type, cache, apply_func TSRMLS_CC); @@ -1192,5 +1192,5 @@ ulong old_rsid = EG(regular_list).nNextFreeElement; - stream = php_stream_open_wrapper(ZEND_24(NOTHING, (char *)) compiler->filename, "rb", USE_PATH | REPORT_ERRORS | ENFORCE_SAFE_MODE | STREAM_DISABLE_OPEN_BASEDIR, NULL); + stream = php_stream_open_wrapper((char *) compiler->filename, "rb", USE_PATH | REPORT_ERRORS | ENFORCE_SAFE_MODE | STREAM_DISABLE_OPEN_BASEDIR, NULL); if (!stream) { return FAILURE; @@ -1240,5 +1240,6 @@ { char *class_name; - int i, class_len; + zend_uint i; + int class_len; xc_cest_t cest; xc_entry_data_php_t *php = (xc_entry_data_php_t *) data; @@ -1285,5 +1286,9 @@ static void xc_collect_op_array_info(xc_compiler_t *compiler, xc_const_usage_t *usage, xc_op_array_info_t *op_array_info, zend_op_array *op_array TSRMLS_DC) /* {{{ */ { - int i; +#ifdef ZEND_ENGINE_2_4 + int literalindex; +#else + zend_uint oplinenum; +#endif xc_vector_t details; @@ -1315,6 +1320,6 @@ #ifdef ZEND_ENGINE_2_4 - for (i = 0; i < op_array->last_literal; i++) { - zend_literal *literal = &op_array->literals[i]; + for (literalindex = 0; literalindex < op_array->last_literal; literalindex++) { + zend_literal *literal = &op_array->literals[literalindex]; zend_uint literalinfo = 0; if (Z_TYPE(literal->constant) == IS_STRING) { @@ -1330,5 +1335,5 @@ if (literalinfo) { xc_op_array_info_detail_t detail; - detail.index = i; + detail.index = literalindex; detail.info = literalinfo; xc_vector_add(xc_op_array_info_detail_t, &details, detail); @@ -1339,6 +1344,6 @@ op_array_info->literalinfos = xc_vector_detach(xc_op_array_info_detail_t, &details); #else /* ZEND_ENGINE_2_4 */ - for (i = 0; i < op_array->last; i++) { - zend_op *opline = &op_array->opcodes[i]; + for (oplinenum = 0; oplinenum < op_array->last; oplinenum++) { + zend_op *opline = &op_array->opcodes[oplinenum]; zend_uint oplineinfo = 0; if (Z_OP_TYPE(opline->op1) == IS_CONST) { @@ -1370,5 +1375,5 @@ if (oplineinfo) { xc_op_array_info_detail_t detail; - detail.index = i; + detail.index = oplinenum; detail.info = oplineinfo; xc_vector_add(xc_op_array_info_detail_t, &details, detail); @@ -1384,10 +1389,10 @@ void xc_fix_op_array_info(const xc_entry_php_t *entry_php, const xc_entry_data_php_t *php, zend_op_array *op_array, int shallow_copy, const xc_op_array_info_t *op_array_info TSRMLS_DC) /* {{{ */ { - int i; - #ifdef ZEND_ENGINE_2_4 - for (i = 0; i < op_array_info->literalinfo_cnt; ++i) { - int index = op_array_info->literalinfos[i].index; - int literalinfo = op_array_info->literalinfos[i].info; + int linteralindex; + + for (linteralindex = 0; linteralindex < op_array_info->literalinfo_cnt; ++linteralindex) { + int index = op_array_info->literalinfos[linteralindex].index; + int literalinfo = op_array_info->literalinfos[linteralindex].info; zend_literal *literal = &op_array->literals[index]; if ((literalinfo & xcache_literal_is_file)) { @@ -1430,8 +1435,10 @@ } } -#else - for (i = 0; i < op_array_info->oplineinfo_cnt; ++i) { - int oplineno = op_array_info->oplineinfos[i].index; - int oplineinfo = op_array_info->oplineinfos[i].info; +#else /* ZEND_ENGINE_2_4 */ + zend_uint oplinenum; + + for (oplinenum = 0; oplinenum < op_array_info->oplineinfo_cnt; ++oplinenum) { + int oplineno = op_array_info->oplineinfos[oplinenum].index; + int oplineinfo = op_array_info->oplineinfos[oplinenum].info; zend_op *opline = &op_array->opcodes[oplineno]; if ((oplineinfo & xcache_op1_is_file)) { @@ -1517,5 +1524,5 @@ } } -#endif +#endif /* ZEND_ENGINE_2_4 */ } /* }}} */ @@ -1535,9 +1542,10 @@ static void xc_free_php(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */ { - int i; + zend_uint i; if (php->classinfos) { for (i = 0; i < php->classinfo_cnt; i ++) { xc_classinfo_t *classinfo = &php->classinfos[i]; - int j; + zend_uint j; + for (j = 0; j < classinfo->methodinfo_cnt; j ++) { xc_free_op_array_info(&classinfo->methodinfos[j] TSRMLS_CC); @@ -1576,5 +1584,5 @@ { zend_op_array *op_array; - int old_constinfo_cnt, old_funcinfo_cnt, old_classinfo_cnt; + zend_uint old_constinfo_cnt, old_funcinfo_cnt, old_classinfo_cnt; zend_bool catched = 0; @@ -1657,6 +1665,6 @@ /* {{{ shallow copy, pointers only */ { Bucket *b; - unsigned int i; - unsigned int j; + zend_uint i; + zend_uint j; #define COPY_H(vartype, var, cnt, name, datatype) do { \ @@ -1779,5 +1787,5 @@ compiler->new_php.have_early_binding = 0; { - int i; + zend_uint i; for (i = 0; i < compiler->new_php.classinfo_cnt; i ++) { compiler->new_php.classinfos[i].oplineno = -1; @@ -2125,5 +2133,5 @@ { xc_shm_t *shm; - int i; + size_t i; if (xc_php_caches) { @@ -2150,5 +2158,5 @@ { xc_shm_t *shm; - int i; + size_t i; if (xc_php_caches) { @@ -2249,5 +2257,5 @@ static xc_shm_t *xc_cache_destroy(xc_cache_t **caches, xc_hash_t *hcache) /* {{{ */ { - int i; + size_t i; xc_cache_t *cache; xc_shm_t *shm; @@ -2282,5 +2290,5 @@ xc_mem_t *mem; time_t now = time(NULL); - int i; + size_t i; xc_memsize_t memsize; @@ -2405,5 +2413,5 @@ static void xc_request_init(TSRMLS_D) /* {{{ */ { - int i; + size_t i; if (!XG(internal_table_copied)) { @@ -2499,5 +2507,5 @@ #endif { - int i; + size_t i; if (xcache_globals->php_holds != NULL) { @@ -3715,5 +3723,5 @@ static int xc_config_hash(xc_hash_t *p, char *name, char *default_value) /* {{{ */ { - int bits, size; + size_t bits, size; char *value; Index: /trunk/xcache.h =================================================================== --- /trunk/xcache.h (revision 916) +++ /trunk/xcache.h (revision 917) @@ -227,7 +227,7 @@ typedef ulong xc_hash_value_t; typedef struct { - int bits; - int size; - int mask; + size_t bits; + size_t size; + xc_hash_value_t mask; } xc_hash_t; @@ -420,5 +420,5 @@ time_t dtime; /* deletion time of this entry */ zend_ulong hits; - long ttl; + zend_ulong ttl; xc_entry_name_t name;