[svn:parrot] r17485 - in trunk: . src

[coke]

Author: coke
Date: Wed Mar 14 22:08:03 2007
New Revision: 17485

Modified:
   trunk/   (props changed)
   trunk/src/packfile.c
   trunk/src/pmc_freeze.c

Log:
Apply #37178: [PATCH] Quiet a few alignment warnings

Courtesy doughera <doughera at lafayette dot edu>



Modified: trunk/src/packfile.c
==============================================================================
--- trunk/src/packfile.c        (original)
+++ trunk/src/packfile.c        Wed Mar 14 22:08:03 2007
@@ -95,11 +95,7 @@
 
 #define ROUND_16(val) (((val) & 0xf) ? 16 - ((val) & 0xf) : 0)
 #define ALIGN_16(st, cursor) \
-    do { \
-        (cursor) = (opcode_t *) \
-           ((char *)(cursor) \
-            + ROUND_16((char *)(cursor) - (char *)(st))); \
-    } while (0)
+    (cursor) += ROUND_16( (char *)(cursor) - (char *)(st) )/sizeof(opcode_t)
 
 /*
 
@@ -559,7 +555,7 @@
      * Map the header on top of the buffer later when we are sure
      * we have alignment done right.
      */
-    cursor = (opcode_t*)((char*)packed + PACKFILE_HEADER_BYTES);
+    cursor = packed + PACKFILE_HEADER_BYTES/sizeof(opcode_t);
     memcpy(header, packed, PACKFILE_HEADER_BYTES);
 
     if (header->wordsize != 4 && header->wordsize != 8) {

Modified: trunk/src/pmc_freeze.c
==============================================================================
--- trunk/src/pmc_freeze.c      (original)
+++ trunk/src/pmc_freeze.c      Wed Mar 14 22:08:03 2007
@@ -599,7 +599,7 @@
                 if (p->pmc_ext)
                     PMC_next_for_GC(p) = NULL;
             }
-            p = (PMC *)((char *)p + sizeof (PMC));
+            p++;
         }
     }
 }