X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=09c005979b2bf4e58c836673759a4b82152bef44;hp=fa1f9d20ad9d0dae3dc8a7f501655a3a4157bd22;hb=348f8241041a26cd9458beb8098306099f44a46a;hpb=29be28e1a24898cec64470332740eaa54893b7a4

diff --git a/src/bitboard.h b/src/bitboard.h
index fa1f9d20..09c00597 100644
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -60,14 +60,14 @@ extern Bitboard SquaresInFrontMask[2][64];
 extern Bitboard PassedPawnMask[2][64];
 extern Bitboard AttackSpanMask[2][64];
 
-extern uint64_t RMult[64];
-extern int RShift[64];
-extern Bitboard RMask[64];
+extern uint64_t RMagics[64];
+extern int RShifts[64];
+extern Bitboard RMasks[64];
 extern Bitboard* RAttacks[64];
 
-extern uint64_t BMult[64];
-extern int BShift[64];
-extern Bitboard BMask[64];
+extern uint64_t BMagics[64];
+extern int BShifts[64];
+extern Bitboard BMasks[64];
 extern Bitboard* BAttacks[64];
 
 extern Bitboard BishopPseudoAttacks[64];
@@ -171,30 +171,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 & RMask[s]) * RMult[s]) >> RShift[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 & BMask[s]) * BMult[s]) >> BShift[s]];
+FORCE_INLINE unsigned bishop_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) {
+  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) {
+  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) {
-  Bitboard b = occ & RMask[s];
-  return RAttacks[s]
-         [unsigned(int(b) * int(RMult[s]) ^ int(b >> 32) * int(RMult[s] >> 32)) >> RShift[s]];
+  return RAttacks[s][rook_index(s, occ)];
 }
 
 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]];
+  return BAttacks[s][bishop_index(s, occ)];
 }
 
-#endif
-
 inline Bitboard queen_attacks_bb(Square s, Bitboard blockers) {
   return rook_attacks_bb(s, blockers) | bishop_attacks_bb(s, blockers);
 }