Changeset 1474 in svn for trunk

Timestamp:

2013-11-13T05:01:22Z (5 years ago)

Author:

Xuefer

Message:

relocate: fix ifrelocate()

Location:

trunk/processor

Files:

• hashtable.m4 (modified) (2 diffs)
• main.m4 (modified) (1 diff)
• struct.m4 (modified) (2 diffs)

trunk/processor/hashtable.m4

@@ -48 +48 @@
     dnl }}}
     Bucket *srcBucket;
-    IFRELOCATE(`Bucket *next;')
+    IFCOPY(`Bucket *first = NULL, *last = NULL;')
     IFRELOCATE(`Bucket *dstBucket = NULL;')
-    IFCOPY(`Bucket *dstBucket = NULL, *first = NULL, *last = NULL;')
-    dnl only used for copy
-    IFCOPY(`uint n;')
+    IFRESTORE(`Bucket *dstBucket = NULL;')
     IFRELOCATE(`uint n;')
+    IFRESTORE(`uint n;')
     IFCALCCOPY(`size_t bucketSize;')
 
@@ -148 +147 @@
         for (n = 0; n < SRC(`nTableSize'); ++n) {
             if (SRC(`arBuckets[n]')) {
-                next = PTR_FROM_VIRTUAL_EX(`Bucket', `DST(`arBuckets[n]')');
+                Bucket *next = PTR_FROM_VIRTUAL_EX(`Bucket', `DST(`arBuckets[n]')');
                 do {
                         dstBucket = next;

trunk/processor/main.m4

@@ -242 +242 @@
 define(`IFCOPY', `IFSTORE(`$1', `IFRESTORE(`$1', `$2')')')
 define(`IFCALCCOPY', `IFCALC(`$1', `IFCOPY(`$1', `$2')')')
-define(`IFRELOCATE', `ifelse(PROCESSOR_TYPE, `relocate', `$1', `$2')')
-define(`IFRELOCATE', `IFSTORE(`$1', `IFRELOCATE(`$1', `$2')')')
+define(`IFRELOCATEONLY', `ifelse(PROCESSOR_TYPE, `relocate', `$1', `$2')')
+define(`IFRELOCATE', `IFSTORE(`$1', `IFRELOCATEONLY(`$1', `$2')')')
 define(`IFDPRINT', `ifelse(PROCESSOR_TYPE, `dprint', `$1', `$2')')
 define(`IFDASM', `ifelse(PROCESSOR_TYPE, `dasm', `$1', `$2')')

trunk/processor/struct.m4

@@ -15 +15 @@
         IFSTORE(  `xc_processor_t *processor, $1 *dst, const $1 * const src')
         IFRESTORE(`xc_processor_t *processor, $1 *dst, const $1 * const src')
-        IFRELOCATE(`$1 *const dst, ptrdiff_t ptrdiff, ptrdiff_t relocatediff')
+        IFRELOCATEONLY(`$1 *const dst, ptrdiff_t ptrdiff, ptrdiff_t relocatediff')
         IFDASM(`xc_dasm_t *dasm, zval *dst, const $1 * const src')
         TSRMLS_DC
@@ -148 +148 @@
         IFSTORE(  `processor, $6 $2, $6 $3')
         IFRESTORE(`processor, $6 $2, $6 $3')
-        IFRELOCATE(`
+        IFRELOCATEONLY(`
             ifelse(`$6', `', `PTR_FROM_VIRTUAL_EX(`$1', `$3')', `$6 $3')
             , ptrdiff