xmode.marker: more correct faster update-match-group

[factor.git] / vm / bitwise_hacks.hpp

diff --git a/vm/bitwise_hacks.hpp b/vm/bitwise_hacks.hpp
index 7e02783e743e815fe1bd1a415dc8129f8a87f3b9..ed338dd3039794708a4a9b8ebb1f1f3c1759dbe0 100644 (file)
--- a/vm/bitwise_hacks.hpp
+++ b/vm/bitwise_hacks.hpp
@@ -4,29 +4,48 @@ inline cell log2(cell x) {
   cell n;
 #if defined(FACTOR_X86)
 #if defined(_MSC_VER)
-  _BitScanReverse(&n, x);
+  _BitScanReverse((unsigned long*)&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);
+  _BitScanReverse64((unsigned long*)&n, x);
 #else
   asm("bsr %1, %0;" : "=r"(n) : "r"(x));
 #endif
-#elif defined(FACTOR_PPC64)
-#if defined(__GNUC__)
-  n = (63 - __builtin_clzll(x));
+
+#elif defined(FACTOR_ARM)
+#if defined(_MSC_VER)
+  _BitScanReverse((unsigned long*)&n, x);
 #else
-#error Unsupported compiler
+  n = (31 - __builtin_clz(x));
 #endif
+
+#elif defined(FACTOR_ARM64)
+#if defined(_MSC_VER)
+  n = 0;
+  _BitScanReverse64((unsigned long*)&n, x);
+#else
+  n = (63 - __builtin_clzll(x));
+#endif
+
 #elif defined(FACTOR_PPC32)
 #if defined(__GNUC__)
   n = (31 - __builtin_clz(x));
 #else
 #error Unsupported compiler
 #endif
+
+#elif defined(FACTOR_PPC64)
+#if defined(__GNUC__)
+  n = (63 - __builtin_clzll(x));
+#else
+#error Unsupported compiler
+#endif
+
 #else
 #error Unsupported CPU
 #endif