X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=e0e2fe64545ececedd4acf53852b9fd7e3b7dbf0;hp=d15d883843048aa4d2f155cc92c2cd0a24bc7ba4;hb=aecdbfc4a000c72fcc2642f54ce83967913a16ba;hpb=002062ae934c1fae3e56157e8e7e6451b552ada5

diff --git a/src/bitboard.h b/src/bitboard.h
index d15d8838..e0e2fe64 100644
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -82,7 +82,7 @@ extern Bitboard PseudoAttacks[PIECE_TYPE_NB][SQUARE_NB];
 
 extern int SquareDistance[SQUARE_NB][SQUARE_NB];
 
-const Bitboard BlackSquares = 0xAA55AA55AA55AA55ULL;
+const Bitboard DarkSquares = 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.
@@ -214,6 +214,14 @@ inline Bitboard passed_pawn_mask(Color c, Square s) {
 }
 
 
+/// squares_of_color() returns a bitboard representing all squares with the same
+/// color of the given square.
+
+inline Bitboard squares_of_color(Square s) {
+  return DarkSquares & s ? DarkSquares : ~DarkSquares;
+}
+
+
 /// squares_aligned() returns true if the squares s1, s2 and s3 are aligned
 /// either on a straight or on a diagonal line.
 
@@ -223,14 +231,6 @@ inline bool squares_aligned(Square s1, Square s2, Square s3) {
 }
 
 
-/// same_color_squares() returns a bitboard representing all squares with
-/// the same color of the given square.
-
-inline Bitboard same_color_squares(Square s) {
-  return BlackSquares & s ? BlackSquares : ~BlackSquares;
-}
-
-
 /// 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.
@@ -258,7 +258,7 @@ inline Bitboard attacks_bb(Square s, Bitboard occ) {
 /// 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.
 
-#ifdef BSFQ
+#ifdef USE_BSFQ
 
 #  if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
 
@@ -319,4 +319,9 @@ extern Square pop_lsb(Bitboard* b);
 
 #endif
 
+/// lsb() overload finds least significant bit relative to the given color
+inline Square lsb(Color c, Bitboard b) {
+  return c == WHITE ? lsb(b) : msb(b);
+}
+
 #endif // #ifndef BITBOARD_H_INCLUDED