Changeset 2135 for trunk/lib

Timestamp:

May 23, 2012, 3:16:20 PM (7 years ago)

Author:

ksherdy

Message:

Added alignment assertion.

Location:

trunk/lib

Files:

• bitblock.hpp (modified) (1 diff)
• bitblock_align.hpp (modified) (1 diff)
• hash.hpp (modified) (1 diff)

trunk/lib/bitblock.hpp

@@ -43 +43 @@
 static IDISA_ALWAYS_INLINE BitBlock mask_reverse_zeroes(uint32_t count);
 static IDISA_ALWAYS_INLINE uint32_t bitstream_scan(BitBlock * v, uint32_t pos);
+static IDISA_ALWAYS_INLINE void assert_bitblock_align(void * addr);
 static IDISA_ALWAYS_INLINE void assert_bitblock_align(BitBlock v);
 

trunk/lib/bitblock_align.hpp

@@ -12 +12 @@
 using namespace std;
 
+static IDISA_ALWAYS_INLINE void assert_bitblock_align(void * addr) {
+    assert(0 == (addr) & (sizeof(BitBlock)-1));
+}
+
 static IDISA_ALWAYS_INLINE void assert_bitblock_align(BitBlock v) {
-    assert(0 != (&v) & (sizeof(BitBlock)-1));
+    assert(0 == (&v) & (sizeof(BitBlock)-1));
 }
 

trunk/lib/hash.hpp

@@ -10 +10 @@
 // #define HASH_HPP_DEBUG
 
-#define NDEBUG // if NDEBUG then disable assertions
+//#define NDEBUG // if NDEBUG then disable assertions
 
 #include "../lib/bitblock.hpp"