Ignore:
Timestamp:
2012-04-01T05:39:31+02:00 (3 years ago)
Author:
moo
Message:

kill warning

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/main.m4

    r860 r877  
    3232    /* allocate */ 
    3333    IFCALC(` 
    34         IFASSERT(` 
     34        IFAUTOCHECK(` 
    3535            xc_stack_push(&processor->allocsizes, (void *) (long) (SIZE)); 
    3636            xc_stack_push(&processor->allocsizes, (void *) (long) (__LINE__)); 
     
    4040    ') 
    4141    IFSTORE(` 
    42         IFASSERT(`{ 
     42        IFAUTOCHECK(`{ 
    4343            if (!xc_stack_count(&processor->allocsizes)) { 
    4444                fprintf(stderr, "mismatch `$@' at line %d\n", __LINE__); 
     
    5858        $1 = (REALTYPE *) (processor->p = (char *) ALIGN(processor->p)); 
    5959        ifelse(`$4', `', ` 
    60                 IFASSERT(`memsetptr($1, (void *) (unsigned long) __LINE__, SIZE);') 
     60                IFAUTOCHECK(`memsetptr($1, (void *) (unsigned long) __LINE__, SIZE);') 
    6161            ', ` 
    6262                memset($1, 0, SIZE); 
     
    7575                REALTYPE*COUNT, `HashTable*1', `ALLOC_HASHTABLE($1);', 
    7676                `', `', `$1 = (REALTYPE *) emalloc(SIZE);') 
    77             IFASSERT(`memsetptr($1, (void *) __LINE__, SIZE);') 
     77            IFAUTOCHECK(`memsetptr($1, (void *) __LINE__, SIZE);') 
    7878        ', ` 
    7979            $1 = (REALTYPE *) ecalloc(COUNT, sizeof($2)); 
     
    105105') 
    106106dnl }}} 
    107 dnl {{{ IFASSERTEX 
    108 define(`IFASSERTEX', `ifdef(`XCACHE_ENABLE_TEST', `$1', `$2')') 
    109 dnl }}} 
    110 dnl {{{ IFASSERT 
    111 define(`IFASSERT', `IFASSERTEX(` 
     107dnl {{{ IFAUTOCHECKEX 
     108define(`IFAUTOCHECKEX', `ifdef(`XCACHE_ENABLE_TEST', `$1', `$2')') 
     109dnl }}} 
     110dnl {{{ IFAUTOCHECK 
     111define(`IFAUTOCHECK', `IFAUTOCHECKEX(` 
    112112#ifndef NDEBUG 
    113113        $1 
     
    206206dnl }}} 
    207207dnl {{{ DONE_* 
    208 define(`DONE_SIZE', `IFASSERT(`dnl 
    209     done_size += $1`'; 
    210     done_count ++; 
     208define(`DONE_SIZE', `IFAUTOCHECK(`dnl 
     209    xc_autocheck_done_size += $1`'; 
     210    xc_autocheck_done_count ++; 
    211211')') 
    212212define(`DONE', ` 
    213213    define(`ELEMENTS_DONE', defn(`ELEMENTS_DONE')`,"$1"') 
    214     IFASSERT(`dnl 
    215         if (zend_u_hash_exists(&done_names, IS_STRING, "$1", sizeof("$1"))) { 
     214    IFAUTOCHECK(`dnl 
     215        if (zend_u_hash_exists(&xc_autocheck_done_names, IS_STRING, "$1", sizeof("$1"))) { 
    216216            fprintf(stderr 
    217217                , "duplicate field at %s `#'%d FUNC_NAME`' : %s\n" 
     
    222222        else { 
    223223            zend_uchar b = 1; 
    224             zend_hash_add(&done_names, "$1", sizeof("$1"), (void*)&b, sizeof(b), NULL); 
     224            zend_hash_add(&xc_autocheck_done_names, "$1", sizeof("$1"), (void*)&b, sizeof(b), NULL); 
    225225        } 
    226226    ') 
     
    236236dnl }}} 
    237237dnl {{{ IF** 
    238 define(`IFCALC', `ifelse(KIND, `calc', `$1', `$2')') 
    239 define(`IFSTORE', `ifelse(KIND, `store', `$1', `$2')') 
     238define(`IFCALC', `ifelse(PROCESSOR_TYPE, `calc', `$1', `$2')') 
     239define(`IFSTORE', `ifelse(PROCESSOR_TYPE, `store', `$1', `$2')') 
    240240define(`IFCALCSTORE', `IFSTORE(`$1', `IFCALC(`$1', `$2')')') 
    241 define(`IFRESTORE', `ifelse(KIND, `restore', `$1', `$2')') 
     241define(`IFRESTORE', `ifelse(PROCESSOR_TYPE, `restore', `$1', `$2')') 
    242242define(`IFCOPY', `IFSTORE(`$1', `IFRESTORE(`$1', `$2')')') 
    243243define(`IFCALCCOPY', `IFCALC(`$1', `IFCOPY(`$1', `$2')')') 
    244 define(`IFDPRINT', `ifelse(KIND, `dprint', `$1', `$2')') 
    245 define(`IFASM', `ifelse(KIND, `asm', `$1', `$2')') 
    246 define(`IFDASM', `ifelse(KIND, `dasm', `$1', `$2')') 
     244define(`IFDPRINT', `ifelse(PROCESSOR_TYPE, `dprint', `$1', `$2')') 
     245define(`IFASM', `ifelse(PROCESSOR_TYPE, `asm', `$1', `$2')') 
     246define(`IFDASM', `ifelse(PROCESSOR_TYPE, `dasm', `$1', `$2')') 
    247247dnl }}} 
    248248EXPORT(`zend_op') 
     
    265265 
    266266define(`IFNOTMEMCPY', `ifdef(`USEMEMCPY', `', `$1')') 
    267 REDEF(`KIND', `calc') include(srcdir`/processor/processor.m4') 
     267REDEF(`PROCESSOR_TYPE', `calc') include(srcdir`/processor/processor.m4') 
    268268pushdef(`xc_get_class_num', ``xc_get_class_num'($@)') 
    269 REDEF(`KIND', `store') include(srcdir`/processor/processor.m4') 
     269REDEF(`PROCESSOR_TYPE', `store') include(srcdir`/processor/processor.m4') 
    270270popdef(`xc_get_class_num') 
    271271pushdef(`xc_get_class', ``xc_get_class'($@)') 
    272 REDEF(`KIND', `restore') include(srcdir`/processor/processor.m4') 
     272REDEF(`PROCESSOR_TYPE', `restore') include(srcdir`/processor/processor.m4') 
    273273popdef(`xc_get_class') 
    274274 
    275275REDEF(`IFNOTMEMCPY', `$1') 
    276276#ifdef HAVE_XCACHE_DPRINT 
    277 REDEF(`KIND', `dprint') include(srcdir`/processor/processor.m4') 
     277REDEF(`PROCESSOR_TYPE', `dprint') include(srcdir`/processor/processor.m4') 
    278278#endif /* HAVE_XCACHE_DPRINT */ 
    279279#ifdef HAVE_XCACHE_DISASSEMBLER 
    280 REDEF(`KIND', `dasm') include(srcdir`/processor/processor.m4') 
     280REDEF(`PROCESSOR_TYPE', `dasm') include(srcdir`/processor/processor.m4') 
    281281#endif /* HAVE_XCACHE_DISASSEMBLER */ 
    282282#ifdef HAVE_XCACHE_ASSEMBLER 
    283 REDEF(`KIND', `asm') include(srcdir`/processor/processor.m4') 
     283REDEF(`PROCESSOR_TYPE', `asm') include(srcdir`/processor/processor.m4') 
    284284#endif /* HAVE_XCACHE_ASSEMBLER */ 
    285285 
Note: See TracChangeset for help on using the changeset viewer.