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


Ignore:
Timestamp:
2013-11-13T05:01:47+01:00 (21 months ago)
Author:
Xuefer
Message:

relocate: rename marcos to relocate

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/main.m4

    r1468 r1471  
    2525define(`INDENT', `xc_dprint_indent(indent);')
    2626dnl }}}
    27 dnl {{{ SRCPTR_EX(1:type, 2:elm)
    28 define(`SRCPTR_EX', `DSTPTR_EX(`$1', `$2')')
    29 dnl }}}
    30 dnl {{{ DSTPTR_EX(1:type, 2:elm)
    31 define(`DSTPTR_EX', `$2')
     27dnl {{{ UNRELOCATED_EX(1:type, 2:elm)
     28define(`UNRELOCATED_EX', `$2')
    3229dnl }}}
    3330dnl {{{ ALLOC(1:dst, 2:type, 3:count=1, 4:clean=false, 5:realtype=$2)
     
    136133define(`EXPORT_PROCESSOR', `define(`EXPORT_$1_$2', 1)')
    137134dnl }}}
    138 dnl {{{ FIXPOINTER(1:type, 2:ele)
    139 define(`FIXPOINTER', `FIXPOINTER_EX(`$1', `DST(`$2')')')
    140 dnl }}}
    141 dnl {{{ FIXPOINTER_EX(1:type, 2:dst)
    142 define(`FIXPOINTER_EX', `')
     135dnl {{{ RELOCATE(1:type, 2:ele)
     136define(`RELOCATE', `RELOCATE_EX(`$1', `DST(`$2')')')
     137dnl }}}
     138dnl {{{ RELOCATE_EX(1:type, 2:dst)
     139define(`RELOCATE_EX', `')
    143140dnl }}}
    144141dnl {{{ IFNOTMEMCPY
     
    242239define(`IFCALCCOPY', `IFCALC(`$1', `IFCOPY(`$1', `$2')')')
    243240define(`IFRELOCATE', `ifelse(PROCESSOR_TYPE, `relocate', `$1', `$2')')
    244 define(`IFFIXPOINTER', `IFSTORE(`$1', `IFRELOCATE(`$1', `$2')')')
     241define(`IFRELOCATE', `IFSTORE(`$1', `IFRELOCATE(`$1', `$2')')')
    245242define(`IFDPRINT', `ifelse(PROCESSOR_TYPE, `dprint', `$1', `$2')')
    246243define(`IFDASM', `ifelse(PROCESSOR_TYPE, `dasm', `$1', `$2')')
     
    260257REDEF(`PROCESSOR_TYPE', `calc') include(srcdir`/processor/processor.m4')
    261258
    262 pushdef(`FIXPOINTER_EX', `$2 = ptradd($1 *, notnullable($2), processor->relocatediff);')
     259pushdef(`RELOCATE_EX', `$2 = ptradd($1 *, notnullable($2), processor->relocatediff);')
    263260REDEF(`PROCESSOR_TYPE', `store') include(srcdir`/processor/processor.m4')
    264 popdef(`FIXPOINTER_EX')
     261popdef(`RELOCATE_EX')
    265262
    266263REDEF(`PROCESSOR_TYPE', `restore') include(srcdir`/processor/processor.m4')
    267264
    268 pushdef(`DSTPTR_EX', `ptradd($1 *, notnullable($2), ptrdiff)')
    269 pushdef(`FIXPOINTER_EX', `$2 = ptradd($1 *, notnullable($2), relocatediff);')
     265pushdef(`UNRELOCATED_EX', `ptradd($1 *, notnullable($2), ptrdiff)')
     266pushdef(`RELOCATE_EX', `$2 = ptradd($1 *, notnullable($2), relocatediff);')
    270267pushdef(`SRC', defn(`DST'))
    271268REDEF(`PROCESSOR_TYPE', `relocate') include(srcdir`/processor/processor.m4')
    272269popdef(`SRC')
    273 popdef(`FIXPOINTER_EX')
    274 popdef(`DSTPTR_EX')
     270popdef(`RELOCATE_EX')
     271popdef(`UNRELOCATED_EX')
    275272
    276273#ifdef HAVE_XCACHE_DPRINT
Note: See TracChangeset for help on using the changeset viewer.