Retire neighboring_files_bb() overload

[stockfish] / src / bitboard.h

diff --git a/src/bitboard.h b/src/bitboard.h
index c613654965861ad9515410cdb165ef4ba4e15a7f..1c8a8c2245bee5a8000016eacf1d3fa3b9b7a2fa 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -125,29 +125,21 @@ inline Bitboard file_bb(Square s) {
 }
 
 
-/// neighboring_files_bb takes a file or a square as input and returns a
-/// bitboard representing all squares on the neighboring files.
+/// neighboring_files_bb takes a file as input and returns a bitboard representing
+/// all squares on the neighboring files.
 
 inline Bitboard neighboring_files_bb(File f) {
   return NeighboringFilesBB[f];
 }
 
-inline Bitboard neighboring_files_bb(Square s) {
-  return NeighboringFilesBB[file_of(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 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];
 }
 
-inline Bitboard this_and_neighboring_files_bb(Square s) {
-  return ThisAndNeighboringFilesBB[file_of(s)];
-}
-
 
 /// 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
@@ -171,30 +163,35 @@ inline Bitboard in_front_bb(Color c, Square s) {
 
 #if defined(IS_64BIT)
 
-inline Bitboard rook_attacks_bb(Square s, Bitboard occ) {
-  return RAttacks[s][((occ & RMasks[s]) * RMagics[s]) >> RShifts[s]];
+FORCE_INLINE unsigned rook_index(Square s, Bitboard occ) {
+  return unsigned(((occ & RMasks[s]) * RMagics[s]) >> RShifts[s]);
 }
 
-inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) {
-  return BAttacks[s][((occ & BMasks[s]) * BMagics[s]) >> BShifts[s]];
+FORCE_INLINE unsigned bishop_index(Square s, Bitboard occ) {
+  return unsigned(((occ & BMasks[s]) * BMagics[s]) >> BShifts[s]);
 }
 
 #else // if !defined(IS_64BIT)
 
-inline Bitboard rook_attacks_bb(Square s, Bitboard occ) {
+FORCE_INLINE unsigned rook_index(Square s, Bitboard occ) {
   Bitboard b = occ & RMasks[s];
-  return RAttacks[s]
-         [unsigned(int(b) * int(RMagics[s]) ^ int(b >> 32) * int(RMagics[s] >> 32)) >> RShifts[s]];
+  return unsigned(int(b) * int(RMagics[s]) ^ int(b >> 32) * int(RMagics[s] >> 32)) >> RShifts[s];
 }
 
-inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) {
+FORCE_INLINE unsigned bishop_index(Square s, Bitboard occ) {
   Bitboard b = occ & BMasks[s];
-  return BAttacks[s]
-         [unsigned(int(b) * int(BMagics[s]) ^ int(b >> 32) * int(BMagics[s] >> 32)) >> BShifts[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)];
+}
+
+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);
 }
@@ -286,6 +283,6 @@ extern Square pop_1st_bit(Bitboard* b);
 
 
 extern void print_bitboard(Bitboard b);
-extern void init_bitboards();
+extern void bitboards_init();
 
 #endif // !defined(BITBOARD_H_INCLUDED)