64 bits by default

vmg · May 18, 2013 · 8720d12 · 8720d12
1 parent da758ac
commit 8720d12
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ewah_bitmap.c b/ewah_bitmap.c
@@ -161,17 +161,17 @@ void ewah_bitmap_set(struct ewah_bitmap *self, size_t i)
 		if (dist > 1)
 			add_word_stream(self, false, dist - 1);
 
-		add_literal(self, 1 << (i % BITS_IN_WORD));
+		add_literal(self, (eword_t)1 << (i % BITS_IN_WORD));
 		return;
 	}
 
 	if (rlw_get_literal_words(self->rlw) == 0) {
 		rlw_set_running_len(self->rlw, rlw_get_running_len(self->rlw) - 1);
-		add_literal(self, 1 << (i % BITS_IN_WORD));
+		add_literal(self, (eword_t)1 << (i % BITS_IN_WORD));
 		return;
 	}
 
-	self->buffer[self->buffer_size - 1] |= (1 << (i % BITS_IN_WORD));
+	self->buffer[self->buffer_size - 1] |= ((eword_t)1 << (i % BITS_IN_WORD));
 
 	/* check if we just completed a stream of 1s */
 	if (self->buffer[self->buffer_size - 1] == (eword_t)(~0)) {
@@ -206,7 +206,7 @@ void ewah_bitmap_each_bit(struct ewah_bitmap *self, void (*callback)(size_t, voi
 
 			/* todo: zero count optimization */
 			for (c = 0; c < BITS_IN_WORD; ++c, ++pos) {
-				if ((self->buffer[pointer] & (1 << c)) != 0) {
+				if ((self->buffer[pointer] & ((eword_t)1 << c)) != 0) {
 					callback(pos, payload);
 				}
 			}

diff --git a/ewok.h b/ewok.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-typedef uint32_t eword_t;
+typedef uint64_t eword_t;
 #define BITS_IN_WORD (sizeof(eword_t) * 8)
 
 struct ewah_bitmap {

diff --git a/ewok_rlw.h b/ewok_rlw.h
@@ -9,7 +9,7 @@
 
 #define RLW_LARGEST_RUNNING_COUNT_SHIFT (RLW_LARGEST_RUNNING_COUNT << 1)
 
-#define RLW_RUNNING_LEN_PLUS_BIT ((1 << (RLW_RUNNING_BITS + 1)) - 1)
+#define RLW_RUNNING_LEN_PLUS_BIT (((eword_t)1 << (RLW_RUNNING_BITS + 1)) - 1)
 
 static bool rlw_get_run_bit(const eword_t *word)
 {