X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbitboard.h;h=0177df8cdb02c7345e991c3de6046ff412a7b03a;hb=53ccba8457231677897f531ff283136edc550cf2;hp=6239953e9de2c245c2c866a8a2a5665569c23e54;hpb=e7ab3a0d168cfc978ec154ee5a3c7a0fd0093b63;p=stockfish
diff --git a/src/bitboard.h b/src/bitboard.h
index 6239953e..0177df8c 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;
@@ -55,35 +43,32 @@ 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];
-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 SquaresByColorBB[2];
+extern Bitboard FileBB[8];
+extern Bitboard NeighboringFilesBB[8];
+extern Bitboard ThisAndNeighboringFilesBB[8];
+extern Bitboard RankBB[8];
+extern Bitboard InFrontBB[2][8];
extern Bitboard SetMaskBB[65];
extern Bitboard ClearMaskBB[65];
-extern Bitboard StepAttackBB[16][64];
+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 const uint64_t RMult[64];
-extern const int RShift[64];
+extern uint64_t RMult[64];
+extern int RShift[64];
extern Bitboard RMask[64];
-extern int RAttackIndex[64];
-extern Bitboard RAttacks[0x19000];
+extern Bitboard* RAttacks[64];
-extern const uint64_t BMult[64];
-extern const int BShift[64];
+extern uint64_t BMult[64];
+extern int BShift[64];
extern Bitboard BMask[64];
-extern int BAttackIndex[64];
-extern Bitboard BAttacks[0x1480];
+extern Bitboard* BAttacks[64];
extern Bitboard BishopPseudoAttacks[64];
extern Bitboard RookPseudoAttacks[64];
@@ -92,10 +77,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 +104,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 +113,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 +121,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 +137,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 +149,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 +164,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
@@ -214,32 +171,26 @@ inline Bitboard behind_bb(Color c, Square s) {
#if defined(IS_64BIT)
-inline Bitboard rook_attacks_bb(Square s, Bitboard blockers) {
- Bitboard b = blockers & RMask[s];
- return RAttacks[RAttackIndex[s] + ((b * RMult[s]) >> RShift[s])];
+inline Bitboard rook_attacks_bb(Square s, Bitboard occ) {
+ return RAttacks[s][((occ & RMask[s]) * RMult[s]) >> RShift[s]];
}
-inline Bitboard bishop_attacks_bb(Square s, Bitboard blockers) {
- Bitboard b = blockers & BMask[s];
- return BAttacks[BAttackIndex[s] + ((b * BMult[s]) >> BShift[s])];
+inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) {
+ return BAttacks[s][((occ & BMask[s]) * BMult[s]) >> BShift[s]];
}
#else // if !defined(IS_64BIT)
-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])];
+inline Bitboard rook_attacks_bb(Square s, Bitboard occ) {
+ Bitboard b = occ & RMask[s];
+ return RAttacks[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])];
+inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) {
+ Bitboard b = occ & BMask[s];
+ return BAttacks[s]
+ [unsigned(int(b) * int(BMult[s]) ^ int(b >> 32) * int(BMult[s] >> 32)) >> BShift[s]];
}
#endif
@@ -269,14 +220,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:
@@ -310,15 +253,25 @@ inline bool squares_aligned(Square s1, Square s2, Square s3) {
/// pop_1st_bit() finds and clears the least significant nonzero bit in a
/// nonzero bitboard.
-#if defined(USE_BSFQ) // Assembly code by Heinz van Saanen
+#if defined(USE_BSFQ)
-inline Square first_1(Bitboard b) {
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+
+FORCE_INLINE Square first_1(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);
+ return (Square) dummy;
}
+#endif
-inline Square pop_1st_bit(Bitboard* b) {
+FORCE_INLINE Square pop_1st_bit(Bitboard* b) {
const Square s = first_1(*b);
*b &= ~(1ULL<