Changeset 1472


Ignore:
Timestamp:
2013-11-13T05:19:00+01:00 (19 months ago)
Author:
moo
Message:

relocate: marco name PTR_FROM_VIRTUAL_EX

Location:
trunk/processor
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/hashtable.m4

    r1471 r1472  
    7575        DONE(arBuckets)
    7676        DISABLECHECK(`
    77         for (srcBucket = UNRELOCATED_EX(`Bucket', SRC(`pListHead')); srcBucket != NULL; srcBucket = UNRELOCATED_EX(`Bucket', `srcBucket->pListNext')) {
     77        for (srcBucket = PTR_FROM_VIRTUAL_EX(`Bucket', SRC(`pListHead')); srcBucket != NULL; srcBucket = PTR_FROM_VIRTUAL_EX(`Bucket', `srcBucket->pListNext')) {
    7878            IFCALCCOPY(`bucketSize = BUCKET_SIZE(srcBucket);')
    7979            ALLOC(dstBucket, char, bucketSize, , Bucket)
     
    148148        for (n = 0; n < SRC(`nTableSize'); ++n) {
    149149            if (SRC(`arBuckets[n]')) {
    150                 next = UNRELOCATED_EX(`Bucket', `DST(`arBuckets[n]')');
     150                next = PTR_FROM_VIRTUAL_EX(`Bucket', `DST(`arBuckets[n]')');
    151151                do {
    152152                        dstBucket = next;
    153                         next = UNRELOCATED_EX(`Bucket', `next->pNext');
     153                        next = PTR_FROM_VIRTUAL_EX(`Bucket', `next->pNext');
    154154                        if (dstBucket->pListLast) {
    155155                            RELOCATE_EX(Bucket, dstBucket->pListLast)
  • trunk/processor/main.m4

    r1471 r1472  
    2525define(`INDENT', `xc_dprint_indent(indent);')
    2626dnl }}}
    27 dnl {{{ UNRELOCATED_EX(1:type, 2:elm)
    28 define(`UNRELOCATED_EX', `$2')
     27dnl {{{ PTR_FROM_VIRTUAL_EX(1:type, 2:elm)
     28define(`PTR_FROM_VIRTUAL_EX', `$2')
    2929dnl }}}
    3030dnl {{{ ALLOC(1:dst, 2:type, 3:count=1, 4:clean=false, 5:realtype=$2)
     
    263263REDEF(`PROCESSOR_TYPE', `restore') include(srcdir`/processor/processor.m4')
    264264
    265 pushdef(`UNRELOCATED_EX', `ptradd($1 *, notnullable($2), ptrdiff)')
     265pushdef(`PTR_FROM_VIRTUAL_EX', `ptradd($1 *, notnullable($2), ptrdiff)')
    266266pushdef(`RELOCATE_EX', `$2 = ptradd($1 *, notnullable($2), relocatediff);')
    267267pushdef(`SRC', defn(`DST'))
     
    269269popdef(`SRC')
    270270popdef(`RELOCATE_EX')
    271 popdef(`UNRELOCATED_EX')
     271popdef(`PTR_FROM_VIRTUAL_EX')
    272272
    273273#ifdef HAVE_XCACHE_DPRINT
  • trunk/processor/struct.m4

    r1471 r1472  
    149149        IFRESTORE(`processor, $6 $2, $6 $3')
    150150        IFRELOCATE(`
    151             ifelse(`$6', `', `UNRELOCATED_EX(`$1', `$3')', `$6 $3')
     151            ifelse(`$6', `', `PTR_FROM_VIRTUAL_EX(`$1', `$3')', `$6 $3')
    152152            , ptrdiff
    153153            , relocatediff
Note: See TracChangeset for help on using the changeset viewer.