Ignore:
Timestamp:
2013-07-08T10:00:36+02:00 (23 months ago)
Author:
moo
Message:

remove php 4 support completely

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mod_optimizer/xc_optimizer.c

    r1280 r1281  
    1 #if 1
     1#if 0
    22#   define XCACHE_DEBUG
    33#endif
     
    4444
    4545    bbid_t     fall;
    46 #ifdef ZEND_ENGINE_2
    4746    bbid_t     catch;
    48 #endif
    4947#ifdef ZEND_ENGINE_2_5
    5048    bbid_t     finally;
     
    300298
    301299    bb->fall       = BBID_INVALID;
    302 #ifdef ZEND_ENGINE_2
    303300    bb->catch      = BBID_INVALID;
    304 #endif
    305301#ifdef ZEND_ENGINE_2_5
    306302    bb->finally    = BBID_INVALID;
     
    336332    op_flowinfo_t fi;
    337333    zend_op *last = bb->opcodes + bb->count - 1;
    338     bbid_t catchbbid = ZESW(BBID_INVALID, bb->catch);
     334    bbid_t catchbbid = bb->catch;
    339335    bbid_t finallybbid;
    340336#ifdef ZEND_ENGINE_2_5
     337    finallybbid = bb->finally;
     338#else
    341339    finallybbid = BBID_INVALID;
    342 #else
    343     finallybbid = bb->finally;
    344340#endif
    345341
     
    413409        zend_bool isbbhead;
    414410        bbid_t bbid;
    415 #ifdef ZEND_ENGINE_2
    416411        bbid_t catchbbid;
    417 #endif
    418412#ifdef ZEND_ENGINE_2_5
    419413        bbid_t finallybbid;
     
    442436        }
    443437    }
    444 #ifdef ZEND_ENGINE_2
    445438    /* mark try start */
    446439    for (i = 0; i < op_array->last_try_catch; i ++) {
    447440        oplineinfos[op_array->try_catch_array[i].try_op].isbbhead = 1;
    448441    }
    449 #endif
    450442    /* }}} */
    451443    /* {{{ fill op lines with newly allocated id */
     
    463455    }
    464456    /* }}} */
    465 #ifdef ZEND_ENGINE_2
    466457    /* {{{ fill op lines with catch id */
    467458    for (i = 0; i < count; i ++) {
     
    494485#endif
    495486    /* }}} */
    496 #endif
    497487    /* {{{ create basic blocks */
    498488    start = 0;
     
    506496        opline = op_array->opcodes + start;
    507497        bb = bbs_new_bb_ex(bbs, opline, i - start);
    508 #ifdef ZEND_ENGINE_2
    509498        bb->catch = oplineinfos[start].catchbbid;
    510 #endif
    511499#ifdef ZEND_ENGINE_2_5
    512500        bb->finally = oplineinfos[start].finallybbid;
     
    549537{
    550538    int i;
    551 #ifdef ZEND_ENGINE_2
    552539    bbid_t lasttrybbid;
    553540    bbid_t lastcatchbbid;
    554 #endif
    555541#ifdef ZEND_ENGINE_2_5
    556542    bbid_t lastfinallybbid;
     
    578564    }
    579565
    580 #ifdef ZEND_ENGINE_2
    581566    lasttrybbid   = BBID_INVALID;
    582567    lastcatchbbid = BBID_INVALID;
     
    608593    }
    609594    /* it is impossible to have last bb catched */
    610 #endif
    611595}
    612596/* }}} */
     
    624608
    625609#ifdef XCACHE_DEBUG
     610    xc_fix_opcode(op_array TSRMLS_CC);
    626611#   if 0
    627612    TRACE("optimize file: %s", op_array->filename);
     
    654639#   endif
    655640    op_print(op_array, 0, op_array->opcodes, op_array->opcodes + op_array->last);
     641    xc_undo_fix_opcode(op_array TSRMLS_CC);
    656642#endif
    657643    return 0;
     
    737723    NO_MODULE_GLOBALS,
    738724#endif
    739 #ifdef ZEND_ENGINE_2
    740725    NULL,
    741 #else
    742     NULL,
    743     NULL,
    744 #endif
    745726    STANDARD_MODULE_PROPERTIES_EX
    746727};
Note: See TracChangeset for help on using the changeset viewer.