Changeset 1416 in svn


Ignore:
Timestamp:
2013-09-29T02:51:38Z (2 years ago)
Author:
Xuefer
Message:

remove asm from processor, it just cant be implemented in processor

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/devel/run

    r1403 r1416  
    172172        --enable-xcache-decoder \
    173173        --enable-xcache-disassembler \
     174        --enable-xcache-assembler \
    174175        --enable-xcache-coverager \
    175176        --enable-xcache-test \
  • trunk/processor/hashtable.m4

    r1406 r1416  
    7575
    7676#if defined(HARDENING_PATCH_HASH_PROTECT) && HARDENING_PATCH_HASH_PROTECT
    77         IFASM(`DST(`canary') = zend_hash_canary; DONE(canary)', `
    78         dnl elseif
    79             IFRESTORE(`DST(`canary') = zend_hash_canary; DONE(canary)', `
    80                 dnl else
    81                 PROCESS(unsigned int, canary)
    82             ')
     77        IFRESTORE(`DST(`canary') = zend_hash_canary; DONE(canary)', `
     78            dnl else
     79            PROCESS(unsigned int, canary)
    8380        ')
    8481#endif
  • trunk/processor/main.m4

    r1406 r1416  
    243243define(`IFCALCCOPY', `IFCALC(`$1', `IFCOPY(`$1', `$2')')')
    244244define(`IFDPRINT', `ifelse(PROCESSOR_TYPE, `dprint', `$1', `$2')')
    245 define(`IFASM', `ifelse(PROCESSOR_TYPE, `asm', `$1', `$2')')
    246245define(`IFDASM', `ifelse(PROCESSOR_TYPE, `dasm', `$1', `$2')')
    247246dnl }}}
     
    280279REDEF(`PROCESSOR_TYPE', `dasm') include(srcdir`/processor/processor.m4')
    281280#endif /* HAVE_XCACHE_DISASSEMBLER */
    282 #ifdef HAVE_XCACHE_ASSEMBLER
    283 REDEF(`PROCESSOR_TYPE', `asm') include(srcdir`/processor/processor.m4')
    284 #endif /* HAVE_XCACHE_ASSEMBLER */
    285281
    286282ifdef(`EXIT_PENDING', `m4exit(EXIT_PENDING)')
  • trunk/processor/struct.m4

    r1387 r1416  
    1313        IFRESTORE(`xc_processor_t *processor, $1 *dst, const $1 * const src')
    1414        IFDASM(   `xc_dasm_t *dasm, zval *dst, const $1 * const src')
    15         IFASM(    `$1 *dst, const $1 * const src')
    1615        TSRMLS_DC
    1716    )ifelse(`$3', `', `;')
     
    148147        IFRESTORE(`processor, $6 $2, $6 $3')
    149148        IFDASM(   `dasm, ifdef(`DASM_STRUCT_DIRECT', `dst', `zv'), $6 $3')
    150         IFASM(    `$6 $2, $6 $3')
    151149        TSRMLS_CC
    152150    );
Note: See TracChangeset for help on using the changeset viewer.