Changeset 2139 for trunk/symbol_table

Timestamp:

May 23, 2012, 4:05:15 PM (7 years ago)

Author:

ksherdy

Message:

Added alignement checks.

File:

• trunk/symbol_table/src/buffer.hpp (modified) (4 diffs)

trunk/symbol_table/src/buffer.hpp

@@ -11 +11 @@
 #define PADDING_BLOCKS 0
 #define PADDING_SIZE (BLOCK_SIZE * PADDING_BLOCKS)
-#define COPYBACK_BLOCKS 2
+#define COPYBACK_BLOCKS 1
 #define COPYBACK_SIZE (BLOCK_SIZE * COPYBACK_BLOCKS)
-#define SEGMENT_BLOCKS  4
+#define SEGMENT_BLOCKS  15
 #define SEGMENT_SIZE (BLOCK_SIZE * SEGMENT_BLOCKS)
 #define BUFFER_SIZE (COPYBACK_SIZE + SEGMENT_SIZE + PADDING_SIZE)
@@ -28 +28 @@
 ///////////////////////////////////////////////////////////////////////////
 #define ALLOC_STATIC_ALIGNED_BYTE_BUFFER(copyback, base) \
-        BitBlock aligned_##base[BUFFER_SIZE]; \
+        ATTRIBUTE_SIMD_ALIGN BitBlock aligned_##base[BUFFER_SIZE]; \
         assert_bitblock_align((void*)aligned_##base);\
         copyback = (uint8_t *)aligned_##base; \
@@ -35 +35 @@
 
 #define ALLOC_STATIC_ALIGNED_BITBLOCK_BUFFER(copyback, base) \
-        BitBlock aligned_##base[BUFFER_SIZE/8]; \
+        ATTRIBUTE_SIMD_ALIGN BitBlock aligned_##base[BUFFER_SIZE/8]; \
         assert_bitblock_align((void*)aligned_##base);\
         copyback = (BitBlock *) aligned_##base; \
@@ -42 +42 @@
 
 #define COPY_BACK_BYTE_BUFFER(copyback, base) \
-do {    memmove(copyback,(uint8_t *)base + (SEGMENT_SIZE - COPYBACK_SIZE), COPYBACK_SIZE);\
+do {    void * src = copyback;\
+        void * dest = (uint8_t *)base + (SEGMENT_SIZE - COPYBACK_SIZE);\
+        assert_bitblock_align(src);\
+        assert_bitblock_align(dest);\
+        memmove(src, dest, COPYBACK_SIZE);\
 } while(0)
 
 #define COPY_BACK_BITBLOCK_BUFFER(copyback, base) \
-do {    memmove(copyback,&((uint8_t *)base)[(SEGMENT_SIZE-COPYBACK_SIZE)/8],COPYBACK_SIZE/8);\
+do {    void * src = copyback;\
+        void * dest = (uint8_t *)base + ((SEGMENT_SIZE - COPYBACK_SIZE)/8);\
+        assert_bitblock_align(src);\
+        assert_bitblock_align(dest);\
+        memmove(src, dest, COPYBACK_SIZE/8);\
 } while(0)