X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbitcount.h;h=7609da40c30c2282ecc3dab112a70b7185bbef1d;hb=d4af15f682c1967450233ab62cba1a6c5d601df6;hp=2300bc96452cef857a819b7ab73b3ddbe8f2cf3e;hpb=c5ec94d0f1b128fc2c691c7231663a345409d5cc;p=stockfish
diff --git a/src/bitcount.h b/src/bitcount.h
index 2300bc96..7609da40 100644
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -1,14 +1,14 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -18,10 +18,11 @@
along with this program. If not, see .
*/
-#if !defined(BITCOUNT_H_INCLUDED)
+#ifndef BITCOUNT_H_INCLUDED
#define BITCOUNT_H_INCLUDED
#include
+
#include "types.h"
enum BitCountType {
@@ -32,14 +33,14 @@ enum BitCountType {
CNT_HW_POPCNT
};
-/// Determine at compile time the best popcount<> specialization according if
-/// platform is 32 or 64 bits, to the maximum number of nonzero bits to count
-/// and if hardware popcnt instruction is available.
-const BitCountType Full = HasPopCnt ? CNT_HW_POPCNT : Is64Bit ? CNT_64 : CNT_32;
+/// Determine at compile time the best popcount<> specialization according to
+/// whether the platform is 32 or 64 bit, the maximum number of non-zero
+/// bits to count and if the hardware popcnt instruction is available.
+const BitCountType Full = HasPopCnt ? CNT_HW_POPCNT : Is64Bit ? CNT_64 : CNT_32;
const BitCountType Max15 = HasPopCnt ? CNT_HW_POPCNT : Is64Bit ? CNT_64_MAX15 : CNT_32_MAX15;
-/// popcount() counts the number of nonzero bits in a bitboard
+/// popcount() counts the number of non-zero bits in a bitboard
template inline int popcount(Bitboard);
template<>
@@ -81,7 +82,7 @@ inline int popcount(Bitboard b) {
template<>
inline int popcount(Bitboard b) {
-#if !defined(USE_POPCNT)
+#ifndef USE_POPCNT
assert(false);
return b != 0; // Avoid 'b not used' warning
@@ -94,12 +95,11 @@ inline int popcount(Bitboard b) {
return (int)__popcnt64(b);
-#else
+#else // Assumed gcc or compatible compiler
- __asm__("popcnt %1, %0" : "=r" (b) : "r" (b));
- return b;
+ return __builtin_popcountll(b);
#endif
}
-#endif // !defined(BITCOUNT_H_INCLUDED)
+#endif // #ifndef BITCOUNT_H_INCLUDED