Changeset 1592 in svn


Ignore:
Timestamp:
2015-04-18T16:07:05Z (4 years ago)
Author:
Xuefer
Message:

dasm: fix include opcode spec

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r1588 r1592  
    663663                IFDASM(`{
    664664                    zval *zv;
    665                     zval *srczv = &dasm->active_op_array_src->literals[SRC(`$1.constant')].constant;
     665                    zval *srczv;
     666                    if (SRC(`$1.constant') >= dasm->active_op_array_src->last_literal) {
     667                        fprintf(stderr, "opcode %s $1 want literal %d\n", xc_get_opcode(SRC(`opcode')), SRC(`$1.constant'));
     668                        break;
     669                    }
     670                    srczv = &dasm->active_op_array_src->literals[SRC(`$1.constant')].constant;
    666671                    ALLOC_ZVAL(zv);
    667672                    MAKE_COPY_ZVAL(&srczv, zv);
  • trunk/xcache/xc_utils.c

    r1587 r1592  
    303303    switch (*op_type) {
    304304    case IS_CONST:
    305         if (spec == OPSPEC_UNUSED || spec == OPSPEC_OPLINE) {
     305        if (spec == OPSPEC_UNUSED
     306         || spec == OPSPEC_OPLINE
     307         || spec == OPSPEC_INCLUDE
     308        ) {
    306309            *op_type = IS_UNUSED;
    307310        }
Note: See TracChangeset for help on using the changeset viewer.