X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitcount.h;h=d57b3f407339d9d2c311f9cf1a1ac12f7fbb8a94;hp=41a1446e01b700b7d6fa08b9425b1a199a2a9122;hb=b1e79fed99d52dcb20d2d6a9c62522226e957963;hpb=f90f810ac4de5ea2f5582ca05a9354c33971a953

diff --git a/src/bitcount.h b/src/bitcount.h
index 41a1446e..d57b3f40 100644
--- a/src/bitcount.h
+++ b/src/bitcount.h
@@ -66,7 +66,6 @@ inline bool cpu_has_popcnt() {
 }
 
 #define POPCNT_INTRINSIC(x) __popcnt64(x)
-#define BITSCAN_INTRINSIC(idx, x) _BitScanForward64(idx, x)
 
 #elif defined(__INTEL_COMPILER) && (defined(__x86_64) || defined(_M_X64)) // Intel compiler
 
@@ -80,14 +79,12 @@ inline bool cpu_has_popcnt() {
 }
 
 #define POPCNT_INTRINSIC(x) _mm_popcnt_u64(x)
-#define BITSCAN_INTRINSIC(idx, x) _BitScanForward64(idx, x)
 
 #else // Safe fallback for unsupported compilers
 
 inline bool cpu_has_popcnt() { return false; }
 
-#define POPCNT_INTRINSIC(x) sw_count_1s(x)
-#define BITSCAN_INTRINSIC(idx, x) sw_count_1s(x) // dummy
+#define POPCNT_INTRINSIC(x) count_1s(x)
 
 #endif
 
@@ -96,19 +93,19 @@ inline bool cpu_has_popcnt() { return false; }
 
 #if defined(BITCOUNT_LOOP)
 
-inline int sw_count_1s(Bitboard b) {
+inline int count_1s(Bitboard b) {
   int r;
   for(r = 0; b; r++, b &= b - 1);
   return r;
 }
 
-inline int sw_count_1s_max_15(Bitboard b) {
+inline int count_1s_max_15(Bitboard b) {
   return count_1s(b);
 }
 
 #elif defined(BITCOUNT_SWAR_32)
 
-inline int sw_count_1s(Bitboard b) {
+inline int count_1s(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);
   v -= (v >> 1) & 0x55555555; // 0-2 in 2 bits
   w -= (w >> 1) & 0x55555555;
@@ -120,7 +117,7 @@ inline int sw_count_1s(Bitboard b) {
   return int(v >> 24);
 }
 
-inline int sw_count_1s_max_15(Bitboard b) {
+inline int count_1s_max_15(Bitboard b) {
   unsigned w = unsigned(b >> 32), v = unsigned(b);
   v -= (v >> 1) & 0x55555555; // 0-2 in 2 bits
   w -= (w >> 1) & 0x55555555;
@@ -133,7 +130,7 @@ inline int sw_count_1s_max_15(Bitboard b) {
 
 #elif defined(BITCOUNT_SWAR_64)
 
-inline int sw_count_1s(Bitboard b) {
+inline int count_1s(Bitboard b) {
   b -= ((b>>1) & 0x5555555555555555ULL);
   b = ((b>>2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL);
   b = ((b>>4) + b) & 0x0F0F0F0F0F0F0F0FULL;
@@ -141,7 +138,7 @@ inline int sw_count_1s(Bitboard b) {
   return int(b >> 56);
 }
 
-inline int sw_count_1s_max_15(Bitboard b) {
+inline int count_1s_max_15(Bitboard b) {
   b -= (b>>1) & 0x5555555555555555ULL;
   b = ((b>>2) & 0x3333333333333333ULL) + (b & 0x3333333333333333ULL);
   b *= 0x1111111111111111ULL;
@@ -158,13 +155,13 @@ inline int sw_count_1s_max_15(Bitboard b) {
 template<bool UseIntrinsic>
 inline int count_1s(Bitboard b) {
 
-  return UseIntrinsic ? POPCNT_INTRINSIC(b) : sw_count_1s(b);
+  return UseIntrinsic ? POPCNT_INTRINSIC(b) : count_1s(b);
 }
 
 template<bool UseIntrinsic>
 inline int count_1s_max_15(Bitboard b) {
 
-  return UseIntrinsic ? POPCNT_INTRINSIC(b) : sw_count_1s_max_15(b);
+  return UseIntrinsic ? POPCNT_INTRINSIC(b) : count_1s_max_15(b);
 }
 
 
@@ -186,25 +183,4 @@ const bool CpuHas64BitPath = true;
 const bool CpuHas64BitPath = false;
 #endif
 
-
-/// pop_1st_bit() finds and clears the least significant nonzero bit in a
-/// nonzero bitboard. If template parameter is true an intrinsic is called,
-/// otherwise we fallback on a software implementation.
-
-template<bool UseIntrinsic>
-inline Square pop_1st_bit(Bitboard *b) {
-
-  return pop_1st_bit(b);
-}
-
-template<>
-inline Square pop_1st_bit<true>(Bitboard *b) {
-
-  unsigned long idx;
-  Bitboard bb = *b;
-  BITSCAN_INTRINSIC(&idx, bb);
-  *b &= (bb - 1);
-  return Square(idx);
-}
-
 #endif // !defined(BITCOUNT_H_INCLUDED)