Changeset 873


Ignore:
Timestamp:
2012-03-31T19:15:06+02:00 (3 years ago)
Author:
moo
Message:

fix build

Location:
trunk/processor
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/head.m4

    r865 r873  
    9090    zend_uint cache_class_index;
    9191
    92 #ifndef NDEBUG
    9392    const zend_op_array    *active_op_array_src;
    9493    zend_op_array          *active_op_array_dst;
    95 #endif
    96     const zend_op          *active_opcodes_src;
    97     zend_op                *active_opcodes_dst;
    9894    const zend_class_entry *active_class_entry_src;
    9995    zend_class_entry       *active_class_entry_dst;
  • trunk/processor/processor.m4

    r866 r873  
    637637#endif
    638638    IFCOPY(`
     639        assert(processor->active_op_array_src);
     640        assert(processor->active_op_array_dst);
    639641#ifdef ZEND_ENGINE_2_4
    640642        pushdef(`UNION_znode_op_literal', `
     
    653655#endif
    654656            case ZEND_JMP:
    655                 assert(Z_OP(src->op1).jmp_addr >= processor->active_opcodes_src && Z_OP(src->op1).jmp_addr - processor->active_opcodes_src < processor->active_op_array_src->last);
    656                 Z_OP(dst->op1).jmp_addr = processor->active_opcodes_dst + (Z_OP(src->op1).jmp_addr - processor->active_opcodes_src);
    657                 assert(Z_OP(dst->op1).jmp_addr >= processor->active_opcodes_dst && Z_OP(dst->op1).jmp_addr - processor->active_opcodes_dst < processor->active_op_array_dst->last);
     657                assert(Z_OP(src->op1).jmp_addr >= processor->active_op_array_src->opcodes && Z_OP(src->op1).jmp_addr - processor->active_op_array_src->opcodes < processor->active_op_array_src->last);
     658                Z_OP(dst->op1).jmp_addr = processor->active_op_array_dst->opcodes + (Z_OP(src->op1).jmp_addr - processor->active_op_array_src->opcodes);
     659                assert(Z_OP(dst->op1).jmp_addr >= processor->active_op_array_dst->opcodes && Z_OP(dst->op1).jmp_addr - processor->active_op_array_dst->opcodes < processor->active_op_array_dst->last);
    658660                break;
    659661
     
    665667            case ZEND_JMP_SET:
    666668#endif
    667                 assert(Z_OP(src->op2).jmp_addr >= processor->active_opcodes_src && Z_OP(src->op2).jmp_addr - processor->active_opcodes_src < processor->active_op_array_src->last);
    668                 Z_OP(dst->op2).jmp_addr = processor->active_opcodes_dst + (Z_OP(src->op2).jmp_addr - processor->active_opcodes_src);
    669                 assert(Z_OP(dst->op2).jmp_addr >= processor->active_opcodes_dst && Z_OP(dst->op2).jmp_addr - processor->active_opcodes_dst < processor->active_op_array_dst->last);
     669                assert(Z_OP(src->op2).jmp_addr >= processor->active_op_array_src->opcodes && Z_OP(src->op2).jmp_addr - processor->active_op_array_src->opcodes < processor->active_op_array_src->last);
     670                Z_OP(dst->op2).jmp_addr = processor->active_op_array_dst->opcodes + (Z_OP(src->op2).jmp_addr - processor->active_op_array_src->opcodes);
     671                assert(Z_OP(dst->op2).jmp_addr >= processor->active_op_array_dst->opcodes && Z_OP(dst->op2).jmp_addr - processor->active_op_array_dst->opcodes < processor->active_op_array_dst->last);
    670672                break;
    671673
     
    687689#endif
    688690DEF_STRUCT_P_FUNC(`zend_op_array', , `dnl {{{
     691    IFCOPY(`
     692        processor->active_op_array_dst = dst;
     693        processor->active_op_array_src = src;
     694    ')
     695    {
    689696    IFRESTORE(`
    690697    const xc_op_array_info_t *op_array_info = &processor->active_op_array_infos_src[processor->active_op_array_index++];
     
    820827
    821828#ifdef ZEND_ENGINE_2_4
    822     dnl before copying opcodes
     829    dnl used when copying opcodes
    823830    STRUCT_ARRAY(last_literal, zend_literal, literals)
    824831    PROCESS(int, last_literal)
    825832#endif
    826833
    827     pushdef(`AFTER_ALLOC', `IFCOPY(`
    828 #ifndef NDEBUG
    829         processor->active_op_array_dst = dst;
    830         processor->active_op_array_src = src;
    831 #endif
    832         processor->active_opcodes_dst = dst->opcodes;
    833         processor->active_opcodes_src = src->opcodes;
    834     ')')
     834    dnl uses literals
    835835    STRUCT_ARRAY(last, zend_op, opcodes)
    836     popdef(`AFTER_ALLOC')
    837836    PROCESS(zend_uint, last)
    838837#ifndef ZEND_ENGINE_2_4
     
    962961        }
    963962    ')
     963    }
     964    IFCOPY(`
     965        processor->active_op_array_dst = NULL;
     966        processor->active_op_array_src = NULL;
     967    ')
    964968')
    965969dnl }}}
  • trunk/processor/struct.m4

    r843 r873  
    214214            popdef(`ARRAY_ELEMENT_COUNT')
    215215
    216             ifdef(`AFTER_ALLOC', AFTER_ALLOC)
    217 
    218216            for (LOOPCOUNTER = 0;
    219217                    ifelse(`$1', `', `SRC(`$3[LOOPCOUNTER]')',
     
    233231    else {
    234232        COPYNULL(`$3')
    235         ifdef(`AFTER_ALLOC', AFTER_ALLOC)
    236     }
    237 ')
    238 dnl }}}
     233    }
     234')
     235dnl }}}
Note: See TracChangeset for help on using the changeset viewer.