X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=e6abd39fa8697a77f352d0e56674330790b5b2ad;hp=cb4c9fad5781515dc6d2474bd3a3e93250562ddd;hb=875a8079bc142ca92027b07427d72c03fe5268a5;hpb=8307da0de77c9c7bbf7c56a7d9c8a688ff4dfb4e

diff --git a/src/bitboard.h b/src/bitboard.h
index cb4c9fad..e6abd39f 100644
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -23,52 +23,43 @@
 
 #include "types.h"
 
+extern Bitboard RMasks[64];
+extern Bitboard RMagics[64];
+extern Bitboard* RAttacks[64];
+extern int RShifts[64];
+
+extern Bitboard BMasks[64];
+extern Bitboard BMagics[64];
+extern Bitboard* BAttacks[64];
+extern int BShifts[64];
+
+extern Bitboard SquareBB[64];
 extern Bitboard FileBB[8];
-extern Bitboard NeighboringFilesBB[8];
-extern Bitboard ThisAndNeighboringFilesBB[8];
 extern Bitboard RankBB[8];
+extern Bitboard AdjacentFilesBB[8];
+extern Bitboard ThisAndAdjacentFilesBB[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 BishopPseudoAttacks[64];
-extern Bitboard RookPseudoAttacks[64];
-extern Bitboard QueenPseudoAttacks[64];
-
-extern uint8_t BitCount8Bit[256];
+extern Bitboard PseudoAttacks[6][64];
 
 
 /// Functions 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];
+  return b & SquareBB[s];
 }
 
 inline void set_bit(Bitboard* b, Square s) {
-  *b |= SetMaskBB[s];
+  *b |= SquareBB[s];
 }
 
-inline void clear_bit(Bitboard* b, Square s) {
-  *b &= ClearMaskBB[s];
+inline void xor_bit(Bitboard* b, Square s) {
+  *b ^= SquareBB[s];
 }
 
 
@@ -76,7 +67,7 @@ inline void clear_bit(Bitboard* b, Square s) {
 /// then calling a sequence of clear_bit() + set_bit()
 
 inline Bitboard make_move_bb(Square from, Square to) {
-  return SetMaskBB[from] | SetMaskBB[to];
+  return SquareBB[from] | SquareBB[to];
 }
 
 inline void do_move_bb(Bitboard* b, Bitboard move_bb) {
@@ -104,19 +95,19 @@ inline Bitboard file_bb(Square s) {
 }
 
 
-/// neighboring_files_bb takes a file as input and returns a bitboard representing
-/// all squares on the neighboring files.
+/// adjacent_files_bb takes a file as input and returns a bitboard representing
+/// all squares on the adjacent files.
 
-inline Bitboard neighboring_files_bb(File f) {
-  return NeighboringFilesBB[f];
+inline Bitboard adjacent_files_bb(File f) {
+  return AdjacentFilesBB[f];
 }
 
 
-/// this_and_neighboring_files_bb takes a file as input and returns a bitboard
-/// representing all squares on the given and neighboring files.
+/// 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_neighboring_files_bb(File f) {
-  return ThisAndNeighboringFilesBB[f];
+inline Bitboard this_and_adjacent_files_bb(File f) {
+  return ThisAndAdjacentFilesBB[f];
 }
 
 
@@ -142,37 +133,34 @@ inline Bitboard in_front_bb(Color c, Square s) {
 
 #if defined(IS_64BIT)
 
-FORCE_INLINE unsigned rook_index(Square s, Bitboard occ) {
+FORCE_INLINE unsigned r_index(Square s, Bitboard occ) {
   return unsigned(((occ & RMasks[s]) * RMagics[s]) >> RShifts[s]);
 }
 
-FORCE_INLINE unsigned bishop_index(Square s, Bitboard occ) {
+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 rook_index(Square s, Bitboard occ) {
+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 bishop_index(Square s, Bitboard occ) {
+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
 
 inline Bitboard rook_attacks_bb(Square s, Bitboard occ) {
-  return RAttacks[s][rook_index(s, occ)];
+  return RAttacks[s][r_index(s, occ)];
 }
 
 inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) {
-  return BAttacks[s][bishop_index(s, occ)];
-}
-
-inline Bitboard queen_attacks_bb(Square s, Bitboard blockers) {
-  return rook_attacks_bb(s, blockers) | bishop_attacks_bb(s, blockers);
+  return BAttacks[s][b_index(s, occ)];
 }
 
 
@@ -199,7 +187,7 @@ inline Bitboard squares_in_front_of(Color c, Square 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:
-/// PassedPawnMask[c][s] = in_front_bb(c, s) & this_and_neighboring_files_bb(s)
+/// PassedPawnMask[c][s] = in_front_bb(c, s) & this_and_adjacent_files_bb(s)
 
 inline Bitboard passed_pawn_mask(Color c, Square s) {
   return PassedPawnMask[c][s];
@@ -209,7 +197,7 @@ inline Bitboard passed_pawn_mask(Color c, Square s) {
 /// attack_span_mask takes a color and a square as input, and returns a bitboard
 /// representing all squares that can be attacked by a pawn of the given color
 /// when it moves along its file starting from the given square. Definition is:
-/// AttackSpanMask[c][s] = in_front_bb(c, s) & neighboring_files_bb(s);
+/// 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];
@@ -221,7 +209,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]);
 }