Changeset 1442 in svn for trunk/processor/main.m4


Ignore:
Timestamp:
2013-11-06T16:57:52Z (22 months ago)
Author:
Xuefer
Message:

rename ptrmove to relocate, reduce export to only necessary onces

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/main.m4

    r1440 r1442  
    2727dnl {{{ SRCPTR(1:type, 2:elm)
    2828define(`SRCPTR', `SRCPTR_EX(`$1', `SRC(`$2')')')
    29 define(`SRCPTR_EX', `IFPTRMOVE(`(($1 *) (((char *) $2) + ptrmove->src))', `$2')')
    30 dnl }}}
    31 dnl {{{ SRCPTR(1:type, 2:elm)
     29define(`SRCPTR_EX', `IFPTRMOVE(`(($1 *) (((char *) $2) + relocate->src))', `$2')')
     30dnl }}}
     31dnl {{{ DSTPTR(1:type, 2:elm)
    3232define(`DSTPTR', `DSTPTR_EX(`$1', `DST(`$2')')')
    33 define(`DSTPTR_EX', `SRCPTR_EX($@)')
     33define(`DSTPTR_EX', `IFPTRMOVE(`(($1 *) (((char *) $2) + relocate->dst))', `$2')')
    3434dnl }}}
    3535dnl {{{ ALLOC(1:dst, 2:type, 3:count=1, 4:clean=false, 5:realtype=$2)
     
    128128')')
    129129dnl }}}
    130 dnl {{{ EXPORT
    131 define(`EXPORT', `define(`EXPORT_$1')')
     130dnl {{{ EXPORT(1:type, 2:processor)
     131define(`EXPORT', `define(`EXPORT_$1_$2', 1)')
    132132dnl }}}
    133133dnl {{{ FIXPOINTER(1:type, 2:ele)
     
    137137define(`FIXPOINTER_EX', `
    138138    IFSTORE(`$2 = ($1 *) processor->shm->handlers->to_readonly(processor->shm, (void *)$2);')
    139     IFPTRMOVE(`$2 = ($1 *) (((char *) $3) + ptrmove->ptrdiff);')
     139    IFPTRMOVE(`$2 = ($1 *) (((char *) $3) + relocate->ptrdiff);')
    140140')
    141141dnl }}}
     
    237237define(`IFCALCSTORE', `IFSTORE(`$1', `IFCALC(`$1', `$2')')')
    238238define(`IFRESTORE', `ifelse(PROCESSOR_TYPE, `restore', `$1', `$2')')
    239 define(`IFPTRMOVE', `ifelse(PROCESSOR_TYPE, `ptrmove', `$1', `$2')')
     239define(`IFPTRMOVE', `ifelse(PROCESSOR_TYPE, `relocate', `$1', `$2')')
    240240define(`IFCOPY', `IFSTORE(`$1', `IFRESTORE(`$1', `$2')')')
    241241define(`IFCALCCOPY', `IFCALC(`$1', `IFCOPY(`$1', `$2')')')
     
    244244dnl }}}
    245245
    246 EXPORT(`zend_op')
    247 EXPORT(`zend_op_array')
    248 EXPORT(`zend_function')
    249 EXPORT(`HashTable_zend_function')
    250 EXPORT(`zend_class_entry')
    251 EXPORT(`xc_classinfo_t')
    252 EXPORT(`xc_funcinfo_t')
    253 EXPORT(`xc_entry_var_t')
    254 EXPORT(`xc_entry_php_t')
    255 EXPORT(`xc_entry_data_php_t')
    256 EXPORT(`zval')
     246EXPORT(`dasm', `zend_op_array')
     247EXPORT(`dasm', `zend_function')
     248EXPORT(`dasm', `zend_class_entry')
     249
     250EXPORT(`calc',    `xc_entry_data_php_t')
     251EXPORT(`calc',    `xc_entry_php_t')
     252EXPORT(`calc',    `xc_entry_var_t')
     253EXPORT(`store',   `xc_entry_data_php_t')
     254EXPORT(`store',   `xc_entry_php_t')
     255EXPORT(`store',   `xc_entry_var_t')
     256EXPORT(`restore', `xc_entry_data_php_t')
     257EXPORT(`restore', `xc_entry_php_t')
     258EXPORT(`dasm',    `xc_entry_data_php_t')
     259EXPORT(`dprint',  `xc_entry_php_t')
     260
     261EXPORT(`restore', `zval')
     262EXPORT(`dprint',  `zval')
    257263
    258264include(srcdir`/processor/hashtable.m4')
     
    265271REDEF(`PROCESSOR_TYPE', `store') include(srcdir`/processor/processor.m4')
    266272REDEF(`PROCESSOR_TYPE', `restore') include(srcdir`/processor/processor.m4')
    267 REDEF(`PROCESSOR_TYPE', `ptrmove') include(srcdir`/processor/processor.m4')
     273REDEF(`PROCESSOR_TYPE', `relocate') include(srcdir`/processor/processor.m4')
    268274
    269275#ifdef HAVE_XCACHE_DPRINT
Note: See TracChangeset for help on using the changeset viewer.