[svn:parrot] r36362 - trunk/src

[rurban at svn.parrot.org]

Author: rurban
Date: Wed Feb  4 21:37:50 2009
New Revision: 36362
URL: https://trac.parrot.org/parrot/changeset/36362

Log:
[core] Revert the r36294 change for 64-bit to fix packfile errors.
wordsize transformers still fail, and on 64-bit this macro does
no alignment at all.

Modified:
   trunk/src/packfile.c

Modified: trunk/src/packfile.c
==============================================================================
--- trunk/src/packfile.c	Wed Feb  4 20:57:17 2009	(r36361)
+++ trunk/src/packfile.c	Wed Feb  4 21:37:50 2009	(r36362)
@@ -453,14 +453,10 @@
 
 #define TRACE_PACKFILE 0
 
-/* TODO: This is broken on 64-bit. See TT #254 */
-#if OPCODE_T_SIZE == 4
-#  define ROUND_16(val) (((val) & 0xf) ? 16 - ((val) & 0xf) : 0)
-#  define ALIGN_16(st, cursor) \
+/* TODO: This is broken on 64/32 transformations. See TT #254 */
+#define ROUND_16(val) (((val) & 0xf) ? 16 - ((val) & 0xf) : 0)
+#define ALIGN_16(st, cursor) \
     (cursor) += ROUND_16((const char *)(cursor) - (const char *)(st))/sizeof (opcode_t)
-#else
-#  define ALIGN_16(xx, ptr) ptr = (const opcode_t *)(((unsigned long)ptr + 15) & (~15))
-#endif
 
 /*