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

diff --git a/src/bitboard.h b/src/bitboard.h
index 404178dc..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 const 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 const 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];
@@ -84,11 +84,11 @@ inline Bitboard bit_is_set(Bitboard b, Square s) {
   return b & SetMaskBB[s];
 }
 
-inline void set_bit(Bitboard *b, Square s) {
+inline void set_bit(Bitboard* b, Square s) {
   *b |= SetMaskBB[s];
 }
 
-inline void clear_bit(Bitboard *b, Square s) {
+inline void clear_bit(Bitboard* b, Square s) {
   *b &= ClearMaskBB[s];
 }
 
@@ -100,7 +100,7 @@ inline Bitboard make_move_bb(Square from, Square to) {
   return SetMaskBB[from] | SetMaskBB[to];
 }
 
-inline void do_move_bb(Bitboard *b, Bitboard move_bb) {
+inline void do_move_bb(Bitboard* b, Bitboard move_bb) {
   *b ^= move_bb;
 }
 
@@ -113,7 +113,7 @@ inline Bitboard rank_bb(Rank r) {
 }
 
 inline Bitboard rank_bb(Square s) {
-  return RankBB[square_rank(s)];
+  return RankBB[rank_of(s)];
 }
 
 inline Bitboard file_bb(File f) {
@@ -121,7 +121,7 @@ inline Bitboard file_bb(File f) {
 }
 
 inline Bitboard file_bb(Square s) {
-  return FileBB[square_file(s)];
+  return FileBB[file_of(s)];
 }
 
 
@@ -133,7 +133,7 @@ inline Bitboard neighboring_files_bb(File f) {
 }
 
 inline Bitboard neighboring_files_bb(Square s) {
-  return NeighboringFilesBB[square_file(s)];
+  return NeighboringFilesBB[file_of(s)];
 }
 
 
@@ -145,7 +145,7 @@ inline Bitboard this_and_neighboring_files_bb(File f) {
 }
 
 inline Bitboard this_and_neighboring_files_bb(Square s) {
-  return ThisAndNeighboringFilesBB[square_file(s)];
+  return ThisAndNeighboringFilesBB[file_of(s)];
 }
 
 
@@ -160,7 +160,7 @@ inline Bitboard in_front_bb(Color c, Rank r) {
 }
 
 inline Bitboard in_front_bb(Color c, Square s) {
-  return InFrontBB[c][square_rank(s)];
+  return InFrontBB[c][rank_of(s)];
 }
 
 
@@ -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);
 }
@@ -245,7 +250,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])
-        & ((1ULL << s1) | (1ULL << s2) | (1ULL << s3));
+        & (    SetMaskBB[s1] |     SetMaskBB[s2] |     SetMaskBB[s3]);
 }