X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.cpp;h=fd3db6715b6e15278a5c8d382d37798132adc37b;hp=3f855c574e6c0e0cc4377820218559f9bbf331e8;hb=1ff5ce8863cb71f42dc0f707dd566e566c658eb5;hpb=4ede49cd850392f28bc9da9537c111d2c3f0b297 diff --git a/src/bitboard.cpp b/src/bitboard.cpp index 3f855c57..fd3db671 100644 --- a/src/bitboard.cpp +++ b/src/bitboard.cpp @@ -19,11 +19,10 @@ #include #include -#include +#include #include "bitboard.h" #include "bitcount.h" -#include "misc.h" #include "rkiss.h" CACHE_LINE_ALIGNMENT @@ -45,6 +44,7 @@ Bitboard AdjacentFilesBB[FILE_NB]; Bitboard InFrontBB[COLOR_NB][RANK_NB]; Bitboard StepAttacksBB[PIECE_NB][SQUARE_NB]; Bitboard BetweenBB[SQUARE_NB][SQUARE_NB]; +Bitboard LineBB[SQUARE_NB][SQUARE_NB]; Bitboard DistanceRingsBB[SQUARE_NB][8]; Bitboard ForwardBB[COLOR_NB][SQUARE_NB]; Bitboard PassedPawnMask[COLOR_NB][SQUARE_NB]; @@ -80,10 +80,10 @@ namespace { } } -/// lsb()/msb() finds the least/most significant bit in a nonzero bitboard. -/// pop_lsb() finds and clears the least significant bit in a nonzero bitboard. +/// 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. -#if !defined(USE_BSFQ) +#ifndef USE_BSFQ Square lsb(Bitboard b) { return BSFTable[bsf_index(b)]; } @@ -122,26 +122,27 @@ Square msb(Bitboard b) { return (Square)(result + MS1BTable[b32]); } -#endif // !defined(USE_BSFQ) +#endif // ifndef USE_BSFQ -/// Bitboards::print() prints a bitboard in an easily readable format to the -/// standard output. This is sometimes useful for debugging. +/// Bitboards::pretty() returns an ASCII representation of a bitboard to be +/// printed to standard output. This is sometimes useful for debugging. -void Bitboards::print(Bitboard b) { +const std::string Bitboards::pretty(Bitboard b) { - sync_cout; + std::ostringstream ss; - for (Rank rank = RANK_8; rank >= RANK_1; rank--) + for (Rank rank = RANK_8; rank >= RANK_1; --rank) { - std::cout << "+---+---+---+---+---+---+---+---+" << '\n'; + ss << "+---+---+---+---+---+---+---+---+" << '\n'; - for (File file = FILE_A; file <= FILE_H; file++) - std::cout << "| " << (b & (file | rank) ? "X " : " "); + for (File file = FILE_A; file <= FILE_H; ++file) + ss << "| " << (b & (file | rank) ? "X " : " "); - std::cout << "|\n"; + ss << "|\n"; } - std::cout << "+---+---+---+---+---+---+---+---+" << sync_endl; + ss << "+---+---+---+---+---+---+---+---+"; + return ss.str(); } @@ -150,58 +151,52 @@ void Bitboards::print(Bitboard b) { void Bitboards::init() { - for (int k = 0, i = 0; i < 8; i++) - while (k < (2 << i)) - MS1BTable[k++] = i; + for (Square s = SQ_A1; s <= SQ_H8; ++s) + BSFTable[bsf_index(SquareBB[s] = 1ULL << s)] = s; - for (int i = 0; i < 64; i++) - BSFTable[bsf_index(1ULL << i)] = Square(i); - - for (Square s = SQ_A1; s <= SQ_H8; s++) - SquareBB[s] = 1ULL << s; + for (Bitboard b = 1; b < 256; ++b) + MS1BTable[b] = more_than_one(b) ? MS1BTable[b - 1] : lsb(b); FileBB[FILE_A] = FileABB; RankBB[RANK_1] = Rank1BB; - for (int i = 1; i < 8; i++) + for (int i = 1; i < 8; ++i) { FileBB[i] = FileBB[i - 1] << 1; RankBB[i] = RankBB[i - 1] << 8; } - for (File f = FILE_A; f <= FILE_H; f++) + for (File f = FILE_A; f <= FILE_H; ++f) AdjacentFilesBB[f] = (f > FILE_A ? FileBB[f - 1] : 0) | (f < FILE_H ? FileBB[f + 1] : 0); - for (Rank r = RANK_1; r < RANK_8; r++) + for (Rank r = RANK_1; r < RANK_8; ++r) InFrontBB[WHITE][r] = ~(InFrontBB[BLACK][r + 1] = InFrontBB[BLACK][r] | RankBB[r]); - for (Color c = WHITE; c <= BLACK; c++) - for (Square s = SQ_A1; s <= SQ_H8; s++) + for (Color c = WHITE; c <= BLACK; ++c) + for (Square s = SQ_A1; s <= SQ_H8; ++s) { ForwardBB[c][s] = InFrontBB[c][rank_of(s)] & FileBB[file_of(s)]; PawnAttackSpan[c][s] = InFrontBB[c][rank_of(s)] & AdjacentFilesBB[file_of(s)]; PassedPawnMask[c][s] = ForwardBB[c][s] | PawnAttackSpan[c][s]; } - for (Square s1 = SQ_A1; s1 <= SQ_H8; s1++) - for (Square s2 = SQ_A1; s2 <= SQ_H8; s2++) + for (Square s1 = SQ_A1; s1 <= SQ_H8; ++s1) + for (Square s2 = SQ_A1; s2 <= SQ_H8; ++s2) + { SquareDistance[s1][s2] = std::max(file_distance(s1, s2), rank_distance(s1, s2)); - - for (Square s1 = SQ_A1; s1 <= SQ_H8; s1++) - for (int d = 1; d < 8; d++) - for (Square s2 = SQ_A1; s2 <= SQ_H8; s2++) - if (SquareDistance[s1][s2] == d) - DistanceRingsBB[s1][d - 1] |= s2; + if (s1 != s2) + DistanceRingsBB[s1][SquareDistance[s1][s2] - 1] |= s2; + } int steps[][9] = { {}, { 7, 9 }, { 17, 15, 10, 6, -6, -10, -15, -17 }, {}, {}, {}, { 9, 7, -7, -9, 8, 1, -1, -8 } }; - for (Color c = WHITE; c <= BLACK; c++) - for (PieceType pt = PAWN; pt <= KING; pt++) - for (Square s = SQ_A1; s <= SQ_H8; s++) - for (int k = 0; steps[pt][k]; k++) + for (Color c = WHITE; c <= BLACK; ++c) + for (PieceType pt = PAWN; pt <= KING; ++pt) + for (Square s = SQ_A1; s <= SQ_H8; ++s) + for (int i = 0; steps[pt][i]; ++i) { - Square to = s + Square(c == WHITE ? steps[pt][k] : -steps[pt][k]); + Square to = s + Square(c == WHITE ? steps[pt][i] : -steps[pt][i]); if (is_ok(to) && square_distance(s, to) < 3) StepAttacksBB[make_piece(c, pt)][s] |= to; @@ -213,21 +208,23 @@ void Bitboards::init() { init_magics(RTable, RAttacks, RMagics, RMasks, RShifts, RDeltas, magic_index); init_magics(BTable, BAttacks, BMagics, BMasks, BShifts, BDeltas, magic_index); - for (Square s = SQ_A1; s <= SQ_H8; s++) + for (Square s1 = SQ_A1; s1 <= SQ_H8; ++s1) { - PseudoAttacks[QUEEN][s] = PseudoAttacks[BISHOP][s] = attacks_bb(s, 0); - PseudoAttacks[QUEEN][s] |= PseudoAttacks[ ROOK][s] = attacks_bb< ROOK>(s, 0); - } + PseudoAttacks[QUEEN][s1] = PseudoAttacks[BISHOP][s1] = attacks_bb(s1, 0); + PseudoAttacks[QUEEN][s1] |= PseudoAttacks[ ROOK][s1] = attacks_bb< ROOK>(s1, 0); - for (Square s1 = SQ_A1; s1 <= SQ_H8; s1++) - for (Square s2 = SQ_A1; s2 <= SQ_H8; s2++) - if (PseudoAttacks[QUEEN][s1] & s2) - { - Square delta = (s2 - s1) / square_distance(s1, s2); + for (Square s2 = SQ_A1; s2 <= SQ_H8; ++s2) + { + Piece pc = (PseudoAttacks[BISHOP][s1] & s2) ? W_BISHOP : + (PseudoAttacks[ROOK][s1] & s2) ? W_ROOK : NO_PIECE; + + if (pc == NO_PIECE) + continue; - for (Square s = s1 + delta; s != s2; s += delta) - BetweenBB[s1][s2] |= s; - } + LineBB[s1][s2] = (attacks_bb(pc, s1, 0) & attacks_bb(pc, s2, 0)) | s1 | s2; + BetweenBB[s1][s2] = attacks_bb(pc, s1, SquareBB[s2]) & attacks_bb(pc, s2, SquareBB[s1]); + } + } } @@ -237,7 +234,7 @@ namespace { Bitboard attack = 0; - for (int i = 0; i < 4; i++) + for (int i = 0; i < 4; ++i) for (Square s = sq + deltas[i]; is_ok(s) && square_distance(s, s - deltas[i]) == 1; s += deltas[i]) @@ -255,7 +252,7 @@ namespace { Bitboard pick_random(RKISS& rk, int booster) { // Values s1 and s2 are used to rotate the candidate magic of a - // quantity known to be the optimal to quickly find the magics. + // quantity known to be optimal to quickly find the magics. int s1 = booster & 63, s2 = (booster >> 6) & 63; Bitboard m = rk.rand(); @@ -283,7 +280,7 @@ namespace { // attacks[s] is a pointer to the beginning of the attacks table for square 's' attacks[SQ_A1] = table; - for (Square s = SQ_A1; s <= SQ_H8; s++) + for (Square s = SQ_A1; s <= SQ_H8; ++s) { // Board edges are not considered in the relevant occupancies edges = ((Rank1BB | Rank8BB) & ~rank_bb(s)) | ((FileABB | FileHBB) & ~file_bb(s)); @@ -324,7 +321,7 @@ namespace { // looks up the correct sliding attack in the attacks[s] database. // Note that we build up the database for square 's' as a side // effect of verifying the magic. - for (i = 0; i < size; i++) + for (i = 0; i < size; ++i) { Bitboard& attack = attacks[s][index(s, occupancy[i])];