X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=6aa35874df7d3a244a8be9a919c81e09cc46105e;hp=e6abd39fa8697a77f352d0e56674330790b5b2ad;hb=55bd27b8f08a151128d7065fa2819aa3e9605299;hpb=875a8079bc142ca92027b07427d72c03fe5268a5 diff --git a/src/bitboard.h b/src/bitboard.h index e6abd39f..6aa35874 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -23,15 +23,31 @@ #include "types.h" +namespace Bitboards { + +void init(); +void print(Bitboard b); + +} + +namespace Bitbases { + +void init_kpk(); +uint32_t probe_kpk(Square wksq, Square wpsq, Square bksq, Color stm); + +} + +CACHE_LINE_ALIGNMENT + extern Bitboard RMasks[64]; extern Bitboard RMagics[64]; extern Bitboard* RAttacks[64]; -extern int RShifts[64]; +extern unsigned RShifts[64]; extern Bitboard BMasks[64]; extern Bitboard BMagics[64]; extern Bitboard* BAttacks[64]; -extern int BShifts[64]; +extern unsigned BShifts[64]; extern Bitboard SquareBB[64]; extern Bitboard FileBB[8]; @@ -41,37 +57,41 @@ extern Bitboard ThisAndAdjacentFilesBB[8]; extern Bitboard InFrontBB[2][8]; extern Bitboard StepAttacksBB[16][64]; extern Bitboard BetweenBB[64][64]; -extern Bitboard SquaresInFrontMask[2][64]; +extern Bitboard DistanceRingsBB[64][8]; +extern Bitboard ForwardBB[2][64]; extern Bitboard PassedPawnMask[2][64]; extern Bitboard AttackSpanMask[2][64]; extern Bitboard PseudoAttacks[6][64]; -/// Functions for testing whether a given bit is set in a bitboard, and for -/// setting and clearing bits. +/// Overloads of bitwise operators between a Bitboard and a Square for testing +/// whether a given bit is set in a bitboard, and for setting and clearing bits. -inline Bitboard bit_is_set(Bitboard b, Square s) { +inline Bitboard operator&(Bitboard b, Square s) { return b & SquareBB[s]; } -inline void set_bit(Bitboard* b, Square s) { - *b |= SquareBB[s]; +inline Bitboard& operator|=(Bitboard& b, Square s) { + return b |= SquareBB[s]; } -inline void xor_bit(Bitboard* b, Square s) { - *b ^= SquareBB[s]; +inline Bitboard& operator^=(Bitboard& b, Square s) { + return b ^= SquareBB[s]; } +inline Bitboard operator|(Bitboard b, Square s) { + return b | SquareBB[s]; +} -/// Functions used to update a bitboard after a move. This is faster -/// then calling a sequence of clear_bit() + set_bit() - -inline Bitboard make_move_bb(Square from, Square to) { - return SquareBB[from] | SquareBB[to]; +inline Bitboard operator^(Bitboard b, Square s) { + return b ^ SquareBB[s]; } -inline void do_move_bb(Bitboard* b, Bitboard move_bb) { - *b ^= move_bb; + +/// more_than_one() returns true if in 'b' there is more than one bit set + +inline bool more_than_one(Bitboard b) { + return b & (b - 1); } @@ -126,61 +146,23 @@ inline Bitboard in_front_bb(Color c, Square 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 -/// all squares attacked by a rook, bishop or queen on the given square. - -#if defined(IS_64BIT) - -FORCE_INLINE unsigned r_index(Square s, Bitboard occ) { - return unsigned(((occ & RMasks[s]) * RMagics[s]) >> RShifts[s]); -} - -FORCE_INLINE unsigned b_index(Square s, Bitboard occ) { - return unsigned(((occ & BMasks[s]) * BMagics[s]) >> BShifts[s]); -} - -#else // if !defined(IS_64BIT) - -FORCE_INLINE unsigned r_index(Square s, Bitboard occ) { - Bitboard b = occ & RMasks[s]; - return unsigned(int(b) * int(RMagics[s]) ^ int(b >> 32) * int(RMagics[s] >> 32)) >> RShifts[s]; -} - -FORCE_INLINE unsigned b_index(Square s, Bitboard occ) { - Bitboard b = occ & BMasks[s]; - return unsigned(int(b) * int(BMagics[s]) ^ int(b >> 32) * int(BMagics[s] >> 32)) >> BShifts[s]; -} - -#endif +/// between_bb returns a bitboard representing all squares between two squares. +/// For instance, between_bb(SQ_C4, SQ_F7) returns a bitboard with the bits for +/// square d5 and e6 set. If s1 and s2 are not on the same line, file or diagonal, +/// 0 is returned. -inline Bitboard rook_attacks_bb(Square s, Bitboard occ) { - return RAttacks[s][r_index(s, occ)]; -} - -inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) { - return BAttacks[s][b_index(s, occ)]; -} - - -/// squares_between returns a bitboard representing all squares between -/// two squares. For instance, squares_between(SQ_C4, SQ_F7) returns a -/// bitboard with the bits for square d5 and e6 set. If s1 and s2 are not -/// on the same line, file or diagonal, EmptyBoardBB is returned. - -inline Bitboard squares_between(Square s1, Square s2) { +inline Bitboard between_bb(Square s1, Square s2) { return BetweenBB[s1][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. Definition of the table is: -/// SquaresInFrontOf[c][s] = in_front_bb(c, s) & file_bb(s) +/// forward_bb 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. Definition of the table is: +/// ForwardBB[c][s] = in_front_bb(c, s) & file_bb(s) -inline Bitboard squares_in_front_of(Color c, Square s) { - return SquaresInFrontMask[c][s]; +inline Bitboard forward_bb(Color c, Square s) { + return ForwardBB[c][s]; } @@ -217,48 +199,97 @@ inline bool squares_aligned(Square s1, Square s2, Square s3) { /// the same color of the given square. inline Bitboard same_color_squares(Square s) { - return bit_is_set(0xAA55AA55AA55AA55ULL, s) ? 0xAA55AA55AA55AA55ULL - : ~0xAA55AA55AA55AA55ULL; + return Bitboard(0xAA55AA55AA55AA55ULL) & s ? 0xAA55AA55AA55AA55ULL + : ~0xAA55AA55AA55AA55ULL; +} + + +/// Functions for computing sliding attack bitboards. Function attacks_bb() takes +/// a square and a bitboard of occupied squares as input, and returns a bitboard +/// representing all squares attacked by Pt (bishop or rook) on the given square. +template +FORCE_INLINE unsigned magic_index(Square s, Bitboard occ) { + + Bitboard* const Masks = Pt == ROOK ? RMasks : BMasks; + Bitboard* const Magics = Pt == ROOK ? RMagics : BMagics; + unsigned* const Shifts = Pt == ROOK ? RShifts : BShifts; + + if (Is64Bit) + return unsigned(((occ & Masks[s]) * Magics[s]) >> Shifts[s]); + + unsigned lo = unsigned(occ) & unsigned(Masks[s]); + unsigned hi = unsigned(occ >> 32) & unsigned(Masks[s] >> 32); + return (lo * unsigned(Magics[s]) ^ hi * unsigned(Magics[s] >> 32)) >> Shifts[s]; +} + +template +inline Bitboard attacks_bb(Square s, Bitboard occ) { + return (Pt == ROOK ? RAttacks : BAttacks)[s][magic_index(s, occ)]; } -/// first_1() finds the least significant nonzero bit in a nonzero bitboard. -/// pop_1st_bit() finds and clears the least significant nonzero bit in a -/// nonzero bitboard. +/// 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. #if defined(USE_BSFQ) -#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) +# if defined(_MSC_VER) && !defined(__INTEL_COMPILER) -FORCE_INLINE Square first_1(Bitboard b) { - unsigned long index; - _BitScanForward64(&index, b); - return (Square) index; +FORCE_INLINE Square lsb(Bitboard b) { + unsigned long index; + _BitScanForward64(&index, b); + return (Square) index; } -#else -FORCE_INLINE Square first_1(Bitboard b) { // Assembly code by Heinz van Saanen - Bitboard dummy; - __asm__("bsfq %1, %0": "=r"(dummy): "rm"(b) ); - return (Square) dummy; +FORCE_INLINE Square msb(Bitboard b) { + unsigned long index; + _BitScanReverse64(&index, b); + return (Square) index; } -#endif -FORCE_INLINE Square pop_1st_bit(Bitboard* b) { - const Square s = first_1(*b); - *b &= ~(1ULL<> 32))); +} + +# else + +FORCE_INLINE Square lsb(Bitboard b) { // Assembly code by Heinz van Saanen + Bitboard index; + __asm__("bsfq %1, %0": "=r"(index): "rm"(b) ); + return (Square) index; +} + +FORCE_INLINE Square msb(Bitboard b) { + Bitboard index; + __asm__("bsrq %1, %0": "=r"(index): "rm"(b) ); + return (Square) index; +} + +# endif + +FORCE_INLINE Square pop_lsb(Bitboard* b) { + const Square s = lsb(*b); + *b &= ~(1ULL << s); return s; } #else // if !defined(USE_BSFQ) -extern Square first_1(Bitboard b); -extern Square pop_1st_bit(Bitboard* b); +extern Square msb(Bitboard b); +extern Square lsb(Bitboard b); +extern Square pop_lsb(Bitboard* b); #endif - -extern void print_bitboard(Bitboard b); -extern void bitboards_init(); - #endif // !defined(BITBOARD_H_INCLUDED)