VM: Refactor bitwise_hacks to Factor style

diff --git a/vm/bitwise_hacks.hpp b/vm/bitwise_hacks.hpp
index d337b29df70b3c08a1ad8e6ed64a5a9806da7b34..86e4b3b85d1962e27eda6553a8f3fae7c5193986 100644 (file)
--- a/vm/bitwise_hacks.hpp
+++ b/vm/bitwise_hacks.hpp
@@ -1,87 +1,78 @@
-namespace factor
-{
+namespace factor {
 
-inline cell log2(cell x)
-{
-       cell n;
+inline cell log2(cell x) {
+  cell n;
 #if defined(FACTOR_X86)
-       #if defined(_MSC_VER)
-               _BitScanReverse(&n,x);
-       #else
-               asm ("bsr %1, %0;":"=r"(n):"r"(x));
-       #endif
+#if defined(_MSC_VER)
+  _BitScanReverse(&n, x);
+#else
+  asm("bsr %1, %0;" : "=r"(n) : "r"(x));
+#endif
 #elif defined(FACTOR_AMD64)
-       #if defined(_MSC_VER)
-               n = 0;
-               _BitScanReverse64((DWORD *)&n,x);
-       #else
-               asm ("bsr %1, %0;":"=r"(n):"r"(x));
-       #endif
+#if defined(_MSC_VER)
+  n = 0;
+  _BitScanReverse64((DWORD*)&n, x);
+#else
+  asm("bsr %1, %0;" : "=r"(n) : "r"(x));
+#endif
 #elif defined(FACTOR_PPC64)
 #if defined(__GNUC__)
-       n = (63 - __builtin_clzll(x));
+  n = (63 - __builtin_clzll(x));
 #else
-       #error Unsupported compiler
+#error Unsupported compiler
 #endif
 #elif defined(FACTOR_PPC32)
 #if defined(__GNUC__)
-       n = (31 - __builtin_clz(x));
+  n = (31 - __builtin_clz(x));
 #else
-       #error Unsupported compiler
+#error Unsupported compiler
 #endif
 #else
-       #error Unsupported CPU
+#error Unsupported CPU
 #endif
-       return n;
+  return n;
 }
 
-inline cell rightmost_clear_bit(cell x)
-{
-       return log2(~x & (x + 1));
-}
+inline cell rightmost_clear_bit(cell x) { return log2(~x & (x + 1)); }
 
-inline cell rightmost_set_bit(cell x)
-{
-       return log2(x & (~x + 1));
-}
+inline cell rightmost_set_bit(cell x) { return log2(x & (~x + 1)); }
 
-inline cell popcount(cell x)
-{
+inline cell popcount(cell x) {
 #if defined(__GNUC__)
 #ifdef FACTOR_64
-       return __builtin_popcountll(x);
+  return __builtin_popcountll(x);
 #else
-       return __builtin_popcount(x);
+  return __builtin_popcount(x);
 #endif
 #else
 #ifdef FACTOR_64
-       u64 k1 = 0x5555555555555555ll;
-       u64 k2 = 0x3333333333333333ll;
-       u64 k4 = 0x0f0f0f0f0f0f0f0fll;
-       u64 kf = 0x0101010101010101ll;
-       cell ks = 56;
+  u64 k1 = 0x5555555555555555ll;
+  u64 k2 = 0x3333333333333333ll;
+  u64 k4 = 0x0f0f0f0f0f0f0f0fll;
+  u64 kf = 0x0101010101010101ll;
+  cell ks = 56;
 #else
-       u32 k1 = 0x55555555;
-       u32 k2 = 0x33333333;
-       u32 k4 = 0xf0f0f0f;
-       u32 kf = 0x1010101;
-       cell ks = 24;
+  u32 k1 = 0x55555555;
+  u32 k2 = 0x33333333;
+  u32 k4 = 0xf0f0f0f;
+  u32 kf = 0x1010101;
+  cell ks = 24;
 #endif
 
-       x =  x       - ((x >> 1)  & k1); // put count of each 2 bits into those 2 bits
-       x = (x & k2) + ((x >> 2)  & k2); // put count of each 4 bits into those 4 bits
-       x = (x       +  (x >> 4)) & k4 ; // put count of each 8 bits into those 8 bits
-       x = (x * kf) >> ks; // returns 8 most significant bits of x + (x<<8) + (x<<16) + (x<<24) + ...
+  x = x - ((x >> 1) & k1);         // put count of each 2 bits into those 2 bits
+  x = (x & k2) + ((x >> 2) & k2);  // put count of each 4 bits into those 4 bits
+  x = (x + (x >> 4)) & k4;         // put count of each 8 bits into those 8 bits
+  x = (x * kf) >> ks;  // returns 8 most significant bits of x + (x<<8) +
+                       // (x<<16) + (x<<24) + ...
 
-       return x;
+  return x;
 #endif
 }
 
-inline bool bitmap_p(u8 *bitmap, cell index)
-{
-       cell byte = index >> 3;
-       cell bit = index & 7;
-       return (bitmap[byte] & (1 << bit)) != 0;
+inline bool bitmap_p(u8* bitmap, cell index) {
+  cell byte = index >> 3;
+  cell bit = index & 7;
+  return (bitmap[byte] & (1 << bit)) != 0;
 }
 
 }