X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.cpp;h=b3dbd00be2f6fe5583a2e16ad7c4e2771b504609;hp=b7fce20d9206a4fdab6716ef7158b08e27a5b12f;hb=d3091971b789b4be4c56fdf608eae33c5c54bbd4;hpb=c556fe1d716fcef3215c239f02b314ec7b42f0d1

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index b7fce20d..b3dbd00b 100644
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -79,23 +79,6 @@ namespace {
   }
 }
 
-
-/// Intel PEXT (parallel extraction) software implementation
-Bitboard pext(Bitboard b, Bitboard mask) {
-
-  Bitboard res = 0;
-
-  for (Bitboard bb = 1; mask; bb += bb)
-  {
-      if (b & mask & -mask)
-          res |= bb;
-
-      mask &= mask - 1;
-  }
-  return res;
-}
-
-
 /// lsb()/msb() finds the least/most significant bit in a non-zero bitboard.
 /// pop_lsb() finds and clears the least significant bit in a non-zero bitboard.
 
@@ -166,7 +149,10 @@ const std::string Bitboards::pretty(Bitboard b) {
 void Bitboards::init() {
 
   for (Square s = SQ_A1; s <= SQ_H8; ++s)
-      BSFTable[bsf_index(SquareBB[s] = 1ULL << s)] = s;
+  {
+      SquareBB[s] = 1ULL << s;
+      BSFTable[bsf_index(SquareBB[s])] = s;
+  }
 
   for (Bitboard b = 1; b < 256; ++b)
       MS1BTable[b] = more_than_one(b) ? MS1BTable[b - 1] : lsb(b);
@@ -268,9 +254,8 @@ namespace {
   void init_magics(Bitboard table[], Bitboard* attacks[], Bitboard magics[],
                    Bitboard masks[], unsigned shifts[], Square deltas[], Fn index) {
 
-    int MagicBoosters[][8] = { {  969, 1976, 2850,  542, 2069, 2852, 1708,  164 },
-                               { 3101,  552, 3555,  926,  834,   26, 2131, 1117 } };
-
+    int MagicBoosters[][RANK_NB] = { {  969, 1976, 2850,  542, 2069, 2852, 1708,  164 },
+                                     { 3101,  552, 3555,  926,  834,   26, 2131, 1117 } };
     RKISS rk;
     Bitboard occupancy[4096], reference[4096], edges, b;
     int i, size, booster;
@@ -299,7 +284,7 @@ namespace {
             reference[size] = sliding_attack(deltas, s, b);
 
             if (HasPext)
-                attacks[s][pext(occupancy[size], masks[s])] = reference[size];
+                attacks[s][_pext_u64(b, masks[s])] = reference[size];
 
             size++;
             b = (b - masks[s]) & masks[s];
@@ -318,7 +303,8 @@ namespace {
         // Find a magic for square 's' picking up an (almost) random number
         // until we find the one that passes the verification test.
         do {
-            do magics[s] = rk.magic_rand<Bitboard>(booster);
+            do
+                magics[s] = rk.magic_rand<Bitboard>(booster);
             while (popcount<Max15>((magics[s] * masks[s]) >> 56) < 6);
 
             std::memset(attacks[s], 0, size * sizeof(Bitboard));