X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=6dd07d5407f85bc431328915c8c459e3a043d7f7;hp=a00a0bdbb648649ca0216e55b49790a039aa330d;hb=10e64e05094e75d89baa4495fa867a8a64195bb7;hpb=3ec94abcdb5f4ad81cc8829aece2d7fa64bb21db diff --git a/src/bitboard.h b/src/bitboard.h index a00a0bdb..6dd07d54 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -23,62 +23,53 @@ #include "types.h" +CACHE_LINE_ALIGNMENT + +extern Bitboard RMasks[64]; +extern Bitboard RMagics[64]; +extern Bitboard* RAttacks[64]; +extern unsigned RShifts[64]; + +extern Bitboard BMasks[64]; +extern Bitboard BMagics[64]; +extern Bitboard* BAttacks[64]; +extern unsigned BShifts[64]; + +extern Bitboard SquareBB[64]; extern Bitboard FileBB[8]; +extern Bitboard RankBB[8]; extern Bitboard AdjacentFilesBB[8]; extern Bitboard ThisAndAdjacentFilesBB[8]; -extern Bitboard RankBB[8]; extern Bitboard InFrontBB[2][8]; - -extern Bitboard SetMaskBB[65]; -extern Bitboard ClearMaskBB[65]; - extern Bitboard StepAttacksBB[16][64]; extern Bitboard BetweenBB[64][64]; - extern Bitboard SquaresInFrontMask[2][64]; extern Bitboard PassedPawnMask[2][64]; extern Bitboard AttackSpanMask[2][64]; - -extern uint64_t RMagics[64]; -extern int RShifts[64]; -extern Bitboard RMasks[64]; -extern Bitboard* RAttacks[64]; - -extern uint64_t BMagics[64]; -extern int BShifts[64]; -extern Bitboard BMasks[64]; -extern Bitboard* BAttacks[64]; - extern Bitboard PseudoAttacks[6][64]; -extern uint8_t BitCount8Bit[256]; - -/// 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) { - return b & SetMaskBB[s]; +inline Bitboard operator&(Bitboard b, Square s) { + return b & SquareBB[s]; } -inline void set_bit(Bitboard* b, Square s) { - *b |= SetMaskBB[s]; +inline Bitboard& operator|=(Bitboard& b, Square s) { + return b |= SquareBB[s]; } -inline void clear_bit(Bitboard* b, Square s) { - *b &= ClearMaskBB[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 SetMaskBB[from] | SetMaskBB[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; +inline Bitboard operator^(Bitboard b, Square s) { + return b ^ SquareBB[s]; } @@ -133,44 +124,28 @@ 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. +/// 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) { -#if defined(IS_64BIT) + Bitboard* const Masks = Pt == ROOK ? RMasks : BMasks; + Bitboard* const Magics = Pt == ROOK ? RMagics : BMagics; + unsigned* const Shifts = Pt == ROOK ? RShifts : BShifts; -FORCE_INLINE unsigned rook_index(Square s, Bitboard occ) { - return unsigned(((occ & RMasks[s]) * RMagics[s]) >> RShifts[s]); -} - -FORCE_INLINE unsigned bishop_index(Square s, Bitboard occ) { - return unsigned(((occ & BMasks[s]) * BMagics[s]) >> BShifts[s]); -} - -#else // if !defined(IS_64BIT) - -FORCE_INLINE unsigned rook_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 bishop_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 - -inline Bitboard rook_attacks_bb(Square s, Bitboard occ) { - return RAttacks[s][rook_index(s, occ)]; -} + if (Is64Bit) + return unsigned(((occ & Masks[s]) * Magics[s]) >> Shifts[s]); -inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) { - return BAttacks[s][bishop_index(s, occ)]; + 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]; } -inline Bitboard queen_attacks_bb(Square s, Bitboard blockers) { - return rook_attacks_bb(s, blockers) | bishop_attacks_bb(s, blockers); +template +inline Bitboard attacks_bb(Square s, Bitboard occ) { + Bitboard** const Attacks = Pt == ROOK ? RAttacks : BAttacks; + return Attacks[s][magic_index(s, occ)]; } @@ -219,7 +194,7 @@ inline Bitboard attack_span_mask(Color c, Square s) { inline bool squares_aligned(Square s1, Square s2, Square s3) { return (BetweenBB[s1][s2] | BetweenBB[s1][s3] | BetweenBB[s2][s3]) - & ( SetMaskBB[s1] | SetMaskBB[s2] | SetMaskBB[s3]); + & ( SquareBB[s1] | SquareBB[s2] | SquareBB[s3]); } @@ -227,8 +202,16 @@ 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; +} + + +/// single_bit() returns true if in the 'b' bitboard is set a single bit (or if +/// b == 0). + +inline bool single_bit(Bitboard b) { + return !(b & (b - 1)); } @@ -241,9 +224,15 @@ inline Bitboard same_color_squares(Square s) { #if defined(_MSC_VER) && !defined(__INTEL_COMPILER) FORCE_INLINE Square first_1(Bitboard b) { - unsigned long index; - _BitScanForward64(&index, b); - return (Square) index; + unsigned long index; + _BitScanForward64(&index, b); + return (Square) index; +} + +FORCE_INLINE Square last_1(Bitboard b) { + unsigned long index; + _BitScanReverse64(&index, b); + return (Square) index; } #else @@ -252,6 +241,12 @@ FORCE_INLINE Square first_1(Bitboard b) { // Assembly code by Heinz van Saanen __asm__("bsfq %1, %0": "=r"(dummy): "rm"(b) ); return (Square) dummy; } + +FORCE_INLINE Square last_1(Bitboard b) { + Bitboard dummy; + __asm__("bsrq %1, %0": "=r"(dummy): "rm"(b) ); + return (Square) dummy; +} #endif FORCE_INLINE Square pop_1st_bit(Bitboard* b) { @@ -263,11 +258,11 @@ FORCE_INLINE Square pop_1st_bit(Bitboard* b) { #else // if !defined(USE_BSFQ) extern Square first_1(Bitboard b); +extern Square last_1(Bitboard b); extern Square pop_1st_bit(Bitboard* b); #endif - extern void print_bitboard(Bitboard b); extern void bitboards_init();