X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbitboard.h;h=a133c65bef28b0ef3e507a8bf7f93d4990b7e23e;hb=a4c11b71acc4aeab032128d4ba9d0d4ccd51aa20;hp=6aa35874df7d3a244a8be9a919c81e09cc46105e;hpb=7f9ebf8e86e90ea1eb68388f1be12503a3f31e56;p=stockfish diff --git a/src/bitboard.h b/src/bitboard.h index 6aa35874..a133c65b 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,36 +33,36 @@ void print(Bitboard b); namespace Bitbases { void init_kpk(); -uint32_t probe_kpk(Square wksq, Square wpsq, Square bksq, Color stm); +bool probe_kpk(Square wksq, Square wpsq, Square bksq, Color us); } 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 InFrontBB[2][8]; -extern Bitboard StepAttacksBB[16][64]; -extern Bitboard BetweenBB[64][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]; - +extern Bitboard RMasks[SQUARE_NB]; +extern Bitboard RMagics[SQUARE_NB]; +extern Bitboard* RAttacks[SQUARE_NB]; +extern unsigned RShifts[SQUARE_NB]; + +extern Bitboard BMasks[SQUARE_NB]; +extern Bitboard BMagics[SQUARE_NB]; +extern Bitboard* BAttacks[SQUARE_NB]; +extern unsigned BShifts[SQUARE_NB]; + +extern Bitboard SquareBB[SQUARE_NB]; +extern Bitboard FileBB[FILE_NB]; +extern Bitboard RankBB[RANK_NB]; +extern Bitboard AdjacentFilesBB[FILE_NB]; +extern Bitboard InFrontBB[COLOR_NB][RANK_NB]; +extern Bitboard StepAttacksBB[PIECE_NB][SQUARE_NB]; +extern Bitboard BetweenBB[SQUARE_NB][SQUARE_NB]; +extern Bitboard DistanceRingsBB[SQUARE_NB][8]; +extern Bitboard ForwardBB[COLOR_NB][SQUARE_NB]; +extern Bitboard PassedPawnMask[COLOR_NB][SQUARE_NB]; +extern Bitboard PawnAttackSpan[COLOR_NB][SQUARE_NB]; +extern Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB]; + +const Bitboard BlackSquares = 0xAA55AA55AA55AA55ULL; /// 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. @@ -95,6 +95,18 @@ inline bool more_than_one(Bitboard b) { } +/// shift_bb() moves bitboard one step along direction Delta. Mainly for pawns. + +template +inline Bitboard shift_bb(Bitboard b) { + + return Delta == DELTA_N ? b << 8 : Delta == DELTA_S ? b >> 8 + : Delta == DELTA_NE ? (b & ~FileHBB) << 9 : Delta == DELTA_SE ? (b & ~FileHBB) >> 7 + : Delta == DELTA_NW ? (b & ~FileABB) << 7 : Delta == DELTA_SW ? (b & ~FileABB) >> 9 + : 0; +} + + /// 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. @@ -123,28 +135,15 @@ inline Bitboard adjacent_files_bb(File f) { } -/// this_and_adjacent_files_bb takes a file as input and returns a bitboard -/// representing all squares on the given and adjacent files. - -inline Bitboard this_and_adjacent_files_bb(File f) { - return ThisAndAdjacentFilesBB[f]; -} - - -/// 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, -/// in_front_bb(WHITE, RANK_5) will give all squares on ranks 6, 7 and 8, while -/// in_front_bb(BLACK, SQ_D3) will give all squares on ranks 1 and 2. +/// in_front_bb() takes a color and a rank as input, and returns a bitboard +/// representing all the squares on all ranks in front of the rank, from the +/// given color's point of view. For instance, in_front_bb(BLACK, RANK_3) will +/// give all squares on ranks 1 and 2. inline Bitboard in_front_bb(Color c, Rank r) { return InFrontBB[c][r]; } -inline Bitboard in_front_bb(Color c, Square s) { - return InFrontBB[c][rank_of(s)]; -} - /// 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 @@ -181,8 +180,8 @@ inline Bitboard passed_pawn_mask(Color c, Square s) { /// when it moves along its file starting from the given square. Definition is: /// AttackSpanMask[c][s] = in_front_bb(c, s) & adjacent_files_bb(s); -inline Bitboard attack_span_mask(Color c, Square s) { - return AttackSpanMask[c][s]; +inline Bitboard pawn_attack_span(Color c, Square s) { + return PawnAttackSpan[c][s]; } @@ -199,8 +198,7 @@ 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 Bitboard(0xAA55AA55AA55AA55ULL) & s ? 0xAA55AA55AA55AA55ULL - : ~0xAA55AA55AA55AA55ULL; + return BlackSquares & s ? BlackSquares : ~BlackSquares; } @@ -280,7 +278,7 @@ FORCE_INLINE Square msb(Bitboard b) { FORCE_INLINE Square pop_lsb(Bitboard* b) { const Square s = lsb(*b); - *b &= ~(1ULL << s); + *b &= *b - 1; return s; }