X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.cpp;h=2adf27794209a4e89d175eca412453a2beda2f48;hp=13735e3df9537d9cce6f726b1ccfda909ce45ba3;hb=82ad9ce9cfb0eff33f1d781f329f7c5dc0b277eb;hpb=dd4796fcd5559847d4b8aab7d21ffff9929799ce
diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index 13735e3d..2adf2779 100644
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -18,21 +18,27 @@
along with this program. If not, see .
*/
+#include
#include
#include "bitboard.h"
#include "misc.h"
uint8_t PopCnt16[1 << 16];
-int8_t SquareDistance[SQUARE_NB][SQUARE_NB];
+uint8_t SquareDistance[SQUARE_NB][SQUARE_NB];
-Bitboard SquareBB[SQUARE_NB];
-Bitboard ForwardRanksBB[COLOR_NB][RANK_NB];
Bitboard BetweenBB[SQUARE_NB][SQUARE_NB];
Bitboard LineBB[SQUARE_NB][SQUARE_NB];
Bitboard DistanceRingBB[SQUARE_NB][8];
Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB];
Bitboard PawnAttacks[COLOR_NB][SQUARE_NB];
+Bitboard SquareBB[SQUARE_NB];
+
+Bitboard KingFlank[FILE_NB] = {
+ QueenSide ^ FileDBB, QueenSide, QueenSide,
+ CenterFiles, CenterFiles,
+ KingSide, KingSide, KingSide ^ FileEBB
+};
Magic RookMagics[SQUARE_NB];
Magic BishopMagics[SQUARE_NB];
@@ -43,15 +49,6 @@ namespace {
Bitboard BishopTable[0x1480]; // To store bishop attacks
void init_magics(Bitboard table[], Magic magics[], Direction directions[]);
-
- // popcount16() counts the non-zero bits using SWAR-Popcount algorithm
-
- unsigned popcount16(unsigned u) {
- u -= (u >> 1) & 0x5555U;
- u = ((u >> 2) & 0x3333U) + (u & 0x3333U);
- u = ((u >> 4) + u) & 0x0F0FU;
- return (u * 0x0101U) >> 8;
- }
}
@@ -80,17 +77,13 @@ const std::string Bitboards::pretty(Bitboard b) {
void Bitboards::init() {
for (unsigned i = 0; i < (1 << 16); ++i)
- PopCnt16[i] = (uint8_t) popcount16(i);
+ PopCnt16[i] = std::bitset<16>(i).count();
for (Square s = SQ_A1; s <= SQ_H8; ++s)
SquareBB[s] = (1ULL << s);
- for (Rank r = RANK_1; r < RANK_8; ++r)
- ForwardRanksBB[WHITE][r] = ~(ForwardRanksBB[BLACK][r + 1] = ForwardRanksBB[BLACK][r] | rank_bb(r));
-
for (Square s1 = SQ_A1; s1 <= SQ_H8; ++s1)
for (Square s2 = SQ_A1; s2 <= SQ_H8; ++s2)
- if (s1 != s2)
{
SquareDistance[s1][s2] = std::max(distance(s1, s2), distance(s1, s2));
DistanceRingBB[s1][SquareDistance[s1][s2]] |= s2;
@@ -127,13 +120,11 @@ void Bitboards::init() {
for (PieceType pt : { BISHOP, ROOK })
for (Square s2 = SQ_A1; s2 <= SQ_H8; ++s2)
- {
- if (!(PseudoAttacks[pt][s1] & s2))
- continue;
-
- LineBB[s1][s2] = (attacks_bb(pt, s1, 0) & attacks_bb(pt, s2, 0)) | s1 | s2;
- BetweenBB[s1][s2] = attacks_bb(pt, s1, SquareBB[s2]) & attacks_bb(pt, s2, SquareBB[s1]);
- }
+ if (PseudoAttacks[pt][s1] & s2)
+ {
+ LineBB[s1][s2] = (attacks_bb(pt, s1, 0) & attacks_bb(pt, s2, 0)) | s1 | s2;
+ BetweenBB[s1][s2] = attacks_bb(pt, s1, square_bb(s2)) & attacks_bb(pt, s2, square_bb(s1));
+ }
}
}