Changeset 875 in svn


Ignore:
Timestamp:
2012-03-31T20:32:21+02:00 (3 years ago)
Author:
Xuefer
Message:

PHP_5_4: fix for ZEND_JMP_SET_VAR

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r873 r875  
    667667            case ZEND_JMP_SET:
    668668#endif
     669#ifdef ZEND_JMP_SET_VAR
     670            case ZEND_JMP_SET_VAR:
     671#endif
    669672                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);
    670673                Z_OP(dst->op2).jmp_addr = processor->active_op_array_dst->opcodes + (Z_OP(src->op2).jmp_addr - processor->active_op_array_src->opcodes);
     
    758761#ifdef ZEND_JMP_SET
    759762                    case ZEND_JMP_SET:
     763#endif
     764#ifdef ZEND_JMP_SET_VAR
     765            case ZEND_JMP_SET_VAR:
    760766#endif
    761767                        Z_OP(opline->op2).jmp_addr = dst->opcodes + (Z_OP(opline->op2).jmp_addr - src->opcodes);
  • trunk/utils.c

    r860 r875  
    175175#ifdef ZEND_JMP_SET
    176176            case ZEND_JMP_SET:
     177#endif
     178#ifdef ZEND_JMP_SET_VAR
     179            case ZEND_JMP_SET_VAR:
    177180#endif
    178181                assert(Z_OP(opline->op2).jmp_addr >= op_array->opcodes && Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last);
Note: See TracChangeset for help on using the changeset viewer.