X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.cpp;h=d4b433fcdc7e0e9e5756ccc75ed8696a7ab24dfd;hp=3df7d42546b333935d45cfce913a7330bc6a3c49;hb=da2f8880b96004505e27b0b87f5df5bfe67a72a9;hpb=b3470d7ab1d8cfe0bacffc42fc9b30347940b5f4 diff --git a/src/bitboard.cpp b/src/bitboard.cpp index 3df7d425..d4b433fc 100644 --- a/src/bitboard.cpp +++ b/src/bitboard.cpp @@ -18,8 +18,7 @@ */ #include -#include -#include +#include // For memset #include "bitboard.h" #include "bitcount.h" @@ -130,19 +129,17 @@ Square msb(Bitboard b) { const std::string Bitboards::pretty(Bitboard b) { - std::ostringstream ss; + std::string s = "+---+---+---+---+---+---+---+---+\n"; - for (Rank rank = RANK_8; rank >= RANK_1; --rank) + for (Rank r = RANK_8; r >= RANK_1; --r) { - ss << "+---+---+---+---+---+---+---+---+" << '\n'; + for (File f = FILE_A; f <= FILE_H; ++f) + s.append(b & make_square(f, r) ? "| X " : "| "); - for (File file = FILE_A; file <= FILE_H; ++file) - ss << "| " << (b & (file | rank) ? "X " : " "); - - ss << "|\n"; + s.append("|\n+---+---+---+---+---+---+---+---+\n"); } - ss << "+---+---+---+---+---+---+---+---+"; - return ss.str(); + + return s; } @@ -282,7 +279,12 @@ namespace { b = size = 0; do { occupancy[size] = b; - reference[size++] = sliding_attack(deltas, s, b); + reference[size] = sliding_attack(deltas, s, b); + + if (HasPext) + attacks[s][_pext_u64(b, masks[s])] = reference[size]; + + size++; b = (b - masks[s]) & masks[s]; } while (b); @@ -291,6 +293,9 @@ namespace { if (s < SQ_H8) attacks[s + 1] = attacks[s] + size; + if (HasPext) + continue; + booster = MagicBoosters[Is64Bit][rank_of(s)]; // Find a magic for square 's' picking up an (almost) random number