-Change: define BitArray_Test/Set/Clear as macros

zecho · Apr 19, 2018 · f4264ae · f4264ae
1 parent b21a503
commit f4264ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/tools.c b/src/tools.c
@@ -307,6 +307,7 @@ uint16 Tools_RandomLCG_Range(uint16 min, uint16 max)
 	return ret;
 }
 
+#ifndef BITARRAY_MACROS
 /**
  * Test a bit in a bit array.
  * @param array Bit array.
@@ -337,3 +338,4 @@ void BitArray_Clear(uint8 *array, uint16 index)
 {
 	array[index >> 3] &= ~(1 << (index & 7));
 }
+#endif
diff --git a/src/tools.h b/src/tools.h
@@ -33,8 +33,16 @@ extern void Tools_Random_Seed(uint32 seed);
 extern void Tools_RandomLCG_Seed(uint16 seed);
 extern uint16 Tools_RandomLCG_Range(uint16 min, uint16 max);
 
+#define BITARRAY_MACROS
+
+#ifdef BITARRAY_MACROS
+#define BitArray_Test(array, index)  (((const uint8 *)(array))[(index) >> 3] & (1 << ((index) & 7)))
+#define BitArray_Set(array, index)   ((uint8 *)(array))[(index) >> 3] |= (1 << ((index) & 7))
+#define BitArray_Clear(array, index) ((uint8 *)(array))[(index) >> 3] &= ~(1 << ((index) & 7))
+#else
 extern bool BitArray_Test(uint8 *array, uint16 index);
 extern void BitArray_Set(uint8 *array, uint16 index);
 extern void BitArray_Clear(uint8 *array, uint16 index);
+#endif
 
 #endif /* TOOLS_H */