Make init_magic() piece agnostic

[stockfish] / src / bitboard.h

diff --git a/src/bitboard.h b/src/bitboard.h
index a00a0bdbb648649ca0216e55b49790a039aa330d..945791249a212b6d3f327b5447c460d223981966 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -140,37 +140,34 @@ inline Bitboard in_front_bb(Color c, Square s) {
 
 #if defined(IS_64BIT)
 
 
 #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]);
 }
 
   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)
 
   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];
 }
 
   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];
 }
   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) {
 #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) {
 }
 
 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)];

 }
 
 
 }