X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=2a4ab1666b7509b42e80a932d11e536fc0071a2d;hp=42c096d1992ad50d82c78dfaa11b993dd624f57c;hb=d9113d127b491db0a427a416217d55d3d298c25e;hpb=be5b32bb9cbf134ccf8df7c17554557e9828957d diff --git a/src/bitboard.h b/src/bitboard.h index 42c096d1..2a4ab166 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -18,23 +18,11 @@ along with this program. If not, see . */ - #if !defined(BITBOARD_H_INCLUDED) #define BITBOARD_H_INCLUDED -//// -//// Includes -//// - -#include "piece.h" -#include "square.h" #include "types.h" - -//// -//// Constants and variables -//// - const Bitboard EmptyBoardBB = 0; const Bitboard FileABB = 0x0101010101010101ULL; @@ -60,13 +48,12 @@ extern const Bitboard FileBB[8]; extern const Bitboard NeighboringFilesBB[8]; extern const Bitboard ThisAndNeighboringFilesBB[8]; extern const Bitboard RankBB[8]; -extern const Bitboard RelativeRankBB[2][8]; extern const Bitboard InFrontBB[2][8]; extern Bitboard SetMaskBB[65]; extern Bitboard ClearMaskBB[65]; -extern Bitboard NonSlidingAttacksBB[16][64]; +extern Bitboard StepAttacksBB[16][64]; extern Bitboard BetweenBB[64][64]; extern Bitboard SquaresInFrontMask[2][64]; @@ -92,10 +79,6 @@ extern Bitboard QueenPseudoAttacks[64]; extern uint8_t BitCount8Bit[256]; -//// -//// Inline functions -//// - /// Functions for testing whether a given bit is set in a bitboard, and for /// setting and clearing bits. @@ -123,7 +106,8 @@ inline void do_move_bb(Bitboard *b, Bitboard move_bb) { *b ^= move_bb; } -/// rank_bb() and file_bb() take a file or a square as input, and return + +/// 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) { @@ -131,7 +115,7 @@ inline Bitboard rank_bb(Rank r) { } inline Bitboard rank_bb(Square s) { - return rank_bb(square_rank(s)); + return RankBB[square_rank(s)]; } inline Bitboard file_bb(File f) { @@ -139,11 +123,11 @@ inline Bitboard file_bb(File f) { } inline Bitboard file_bb(Square s) { - return file_bb(square_file(s)); + return FileBB[square_file(s)]; } -/// neighboring_files_bb takes a file or a square as input, and returns a +/// neighboring_files_bb takes a file or a square as input and returns a /// bitboard representing all squares on the neighboring files. inline Bitboard neighboring_files_bb(File f) { @@ -155,9 +139,8 @@ inline Bitboard neighboring_files_bb(Square s) { } -/// this_and_neighboring_files_bb takes a file or a square as input, and -/// returns a bitboard representing all squares on the given and neighboring -/// files. +/// this_and_neighboring_files_bb takes a file or a square as input and returns +/// a bitboard representing all squares on the given and neighboring files. inline Bitboard this_and_neighboring_files_bb(File f) { return ThisAndNeighboringFilesBB[f]; @@ -168,17 +151,6 @@ inline Bitboard this_and_neighboring_files_bb(Square s) { } -/// relative_rank_bb() takes a color and a rank as input, and returns a bitboard -/// representing all squares on the given rank from the given color's point of -/// view. For instance, relative_rank_bb(WHITE, 7) gives all squares on the -/// 7th rank, while relative_rank_bb(BLACK, 7) gives all squares on the 2nd -/// rank. - -inline Bitboard relative_rank_bb(Color c, Rank r) { - return RelativeRankBB[c][r]; -} - - /// in_front_bb() takes a color and a rank or square as input, and returns a /// bitboard representing all the squares on all ranks in front of the rank /// (or square), from the given color's point of view. For instance, @@ -194,19 +166,6 @@ inline Bitboard in_front_bb(Color c, Square s) { } -/// behind_bb() takes a color and a rank or square as input, and returns a -/// bitboard representing all the squares on all ranks behind of the rank -/// (or square), from the given color's point of view. - -inline Bitboard behind_bb(Color c, Rank r) { - return InFrontBB[opposite_color(c)][r]; -} - -inline Bitboard behind_bb(Color c, Square s) { - return InFrontBB[opposite_color(c)][square_rank(s)]; -} - - /// Functions for computing sliding attack bitboards. rook_attacks_bb(), /// bishop_attacks_bb() and queen_attacks_bb() all take a square and a /// bitboard of occupied squares as input, and return a bitboard representing @@ -229,17 +188,13 @@ inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) { inline Bitboard rook_attacks_bb(Square s, Bitboard blockers) { Bitboard b = blockers & RMask[s]; return RAttacks[RAttackIndex[s] + - (unsigned(int(b) * int(RMult[s]) ^ - int(b >> 32) * int(RMult[s] >> 32)) - >> RShift[s])]; + (unsigned(int(b) * int(RMult[s]) ^ int(b >> 32) * int(RMult[s] >> 32)) >> RShift[s])]; } inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) { Bitboard b = blockers & BMask[s]; return BAttacks[BAttackIndex[s] + - (unsigned(int(b) * int(BMult[s]) ^ - int(b >> 32) * int(BMult[s] >> 32)) - >> BShift[s])]; + (unsigned(int(b) * int(BMult[s]) ^ int(b >> 32) * int(BMult[s] >> 32)) >> BShift[s])]; } #endif @@ -269,14 +224,6 @@ inline Bitboard squares_in_front_of(Color c, Square s) { } -/// squares_behind is similar to squares_in_front, but returns the squares -/// behind the square instead of in front of the square. - -inline Bitboard squares_behind(Color c, Square 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. Definition of the table is: @@ -332,12 +279,7 @@ extern Square pop_1st_bit(Bitboard* b); #endif -//// -//// Prototypes -//// - extern void print_bitboard(Bitboard b); extern void init_bitboards(); - #endif // !defined(BITBOARD_H_INCLUDED)