X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=bff9846c5eb9d730a4a3e5a0ddd6c67e4d2cfc59;hp=fb798ec9f8442e6af1d4de074776c1eae00b0e95;hb=6080fecf9cba9ac063f8f07bd25004c14016bd33;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c diff --git a/src/bitboard.h b/src/bitboard.h index fb798ec9..bff9846c 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -26,7 +26,6 @@ //// Includes //// -#include "direction.h" #include "piece.h" #include "square.h" #include "types.h" @@ -36,28 +35,25 @@ //// Constants and variables //// -const Bitboard EmptyBoardBB = 0ULL; - -const Bitboard WhiteSquaresBB = 0x55AA55AA55AA55AAULL; -const Bitboard BlackSquaresBB = 0xAA55AA55AA55AA55ULL; +const Bitboard EmptyBoardBB = 0; const Bitboard FileABB = 0x0101010101010101ULL; -const Bitboard FileBBB = 0x0202020202020202ULL; -const Bitboard FileCBB = 0x0404040404040404ULL; -const Bitboard FileDBB = 0x0808080808080808ULL; -const Bitboard FileEBB = 0x1010101010101010ULL; -const Bitboard FileFBB = 0x2020202020202020ULL; -const Bitboard FileGBB = 0x4040404040404040ULL; -const Bitboard FileHBB = 0x8080808080808080ULL; - -const Bitboard Rank1BB = 0xFFULL; -const Bitboard Rank2BB = 0xFF00ULL; -const Bitboard Rank3BB = 0xFF0000ULL; -const Bitboard Rank4BB = 0xFF000000ULL; -const Bitboard Rank5BB = 0xFF00000000ULL; -const Bitboard Rank6BB = 0xFF0000000000ULL; -const Bitboard Rank7BB = 0xFF000000000000ULL; -const Bitboard Rank8BB = 0xFF00000000000000ULL; +const Bitboard FileBBB = FileABB << 1; +const Bitboard FileCBB = FileABB << 2; +const Bitboard FileDBB = FileABB << 3; +const Bitboard FileEBB = FileABB << 4; +const Bitboard FileFBB = FileABB << 5; +const Bitboard FileGBB = FileABB << 6; +const Bitboard FileHBB = FileABB << 7; + +const Bitboard Rank1BB = 0xFF; +const Bitboard Rank2BB = Rank1BB << (8 * 1); +const Bitboard Rank3BB = Rank1BB << (8 * 2); +const Bitboard Rank4BB = Rank1BB << (8 * 3); +const Bitboard Rank5BB = Rank1BB << (8 * 4); +const Bitboard Rank6BB = Rank1BB << (8 * 5); +const Bitboard Rank7BB = Rank1BB << (8 * 6); +const Bitboard Rank8BB = Rank1BB << (8 * 7); extern const Bitboard SquaresByColorBB[2]; extern const Bitboard FileBB[8]; @@ -74,8 +70,9 @@ extern Bitboard StepAttackBB[16][64]; extern Bitboard RayBB[64][8]; extern Bitboard BetweenBB[64][64]; +extern Bitboard SquaresInFrontMask[2][64]; extern Bitboard PassedPawnMask[2][64]; -extern Bitboard OutpostMask[2][64]; +extern Bitboard AttackSpanMask[2][64]; extern const uint64_t RMult[64]; extern const int RShift[64]; @@ -127,9 +124,8 @@ inline void do_move_bb(Bitboard *b, Bitboard move_bb) { *b ^= move_bb; } -/// rank_bb() and file_bb() gives a bitboard containing all squares on a given -/// file or rank. It is also possible to pass a square as input to these -/// functions. +/// rank_bb() and file_bb() take a file or a square as input, and return +/// a bitboard representing all squares on the given file or rank. inline Bitboard rank_bb(Rank r) { return RankBB[r]; @@ -156,7 +152,7 @@ inline Bitboard neighboring_files_bb(File f) { } inline Bitboard neighboring_files_bb(Square s) { - return neighboring_files_bb(square_file(s)); + return NeighboringFilesBB[square_file(s)]; } @@ -169,7 +165,7 @@ inline Bitboard this_and_neighboring_files_bb(File f) { } inline Bitboard this_and_neighboring_files_bb(Square s) { - return this_and_neighboring_files_bb(square_file(s)); + return ThisAndNeighboringFilesBB[square_file(s)]; } @@ -195,7 +191,7 @@ inline Bitboard in_front_bb(Color c, Rank r) { } inline Bitboard in_front_bb(Color c, Square s) { - return in_front_bb(c, square_rank(s)); + return InFrontBB[c][square_rank(s)]; } @@ -208,7 +204,7 @@ inline Bitboard behind_bb(Color c, Rank r) { } inline Bitboard behind_bb(Color c, Square s) { - return in_front_bb(opposite_color(c), square_rank(s)); + return InFrontBB[opposite_color(c)][square_rank(s)]; } @@ -274,12 +270,11 @@ inline Bitboard squares_between(Square s1, Square s2) { /// squares_in_front_of takes a color and a square as input, and returns a /// bitboard representing all squares along the line in front of the square, -/// from the point of view of the given color. For instance, -/// squares_in_front_of(BLACK, SQ_E4) returns a bitboard with the squares -/// e3, e2 and e1 set. +/// from the point of view of the given color. Definition of the table is: +/// SquaresInFrontOf[c][s] = in_front_bb(c, s) & file_bb(s) inline Bitboard squares_in_front_of(Color c, Square s) { - return in_front_bb(c, s) & file_bb(s); + return SquaresInFrontMask[c][s]; } @@ -287,33 +282,27 @@ inline Bitboard squares_in_front_of(Color c, Square s) { /// behind the square instead of in front of the square. inline Bitboard squares_behind(Color c, Square s) { - return in_front_bb(opposite_color(c), s) & file_bb(s); + return SquaresInFrontMask[opposite_color(c)][s]; } /// passed_pawn_mask takes a color and a square as input, and returns a /// bitboard mask which can be used to test if a pawn of the given color on -/// the given square is a passed pawn. +/// the given square is a passed pawn. Definition of the table is: +/// PassedPawnMask[c][s] = in_front_bb(c, s) & this_and_neighboring_files_bb(s) inline Bitboard passed_pawn_mask(Color c, Square s) { return PassedPawnMask[c][s]; } -/// outpost_mask takes a color and a square as input, and returns a bitboard -/// mask which can be used to test whether a piece on the square can possibly -/// be driven away by an enemy pawn. - -inline Bitboard outpost_mask(Color c, Square s) { - return OutpostMask[c][s]; -} - - -/// isolated_pawn_mask takes a square as input, and returns a bitboard mask -/// which can be used to test whether a pawn on the given square is isolated. +/// attack_span_mask takes a color and a square as input, and returns a bitboard +/// representing all squares that can be attacked by a pawn of the given color +/// when it moves along its file starting from the given square. Definition is: +/// AttackSpanMask[c][s] = in_front_bb(c, s) & neighboring_files_bb(s); -inline Bitboard isolated_pawn_mask(Square s) { - return neighboring_files_bb(s); +inline Bitboard attack_span_mask(Color c, Square s) { + return AttackSpanMask[c][s]; } @@ -349,7 +338,6 @@ extern Square pop_1st_bit(Bitboard* b); extern void print_bitboard(Bitboard b); extern void init_bitboards(); -extern int bitScanReverse32(uint32_t b); #endif // !defined(BITBOARD_H_INCLUDED)