X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=fa1f9d20ad9d0dae3dc8a7f501655a3a4157bd22;hp=5b2ec249febfebe92169ec241e40e78fef1d520d;hb=29be28e1a24898cec64470332740eaa54893b7a4;hpb=3092f0c6460c831e666d54389710394c52a86ed9

diff --git a/src/bitboard.h b/src/bitboard.h
index 5b2ec249..fa1f9d20 100644
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -60,25 +60,22 @@ 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 Bitboard* RAttacks[64];
+
+extern uint64_t BMult[64];
+extern int BShift[64];
+extern Bitboard BMask[64];
+extern Bitboard* BAttacks[64];
+
 extern Bitboard BishopPseudoAttacks[64];
 extern Bitboard RookPseudoAttacks[64];
 extern Bitboard QueenPseudoAttacks[64];
 
 extern uint8_t BitCount8Bit[256];
 
-struct Magics {
-  Bitboard mask;
-  uint64_t mult;
-  uint32_t offset;
-  uint32_t shift;
-};
-
-extern Magics RMagics[64];
-extern Magics BMagics[64];
-
-extern Bitboard RAttacks[0x19000];
-extern Bitboard BAttacks[0x1480];
-
 
 /// Functions for testing whether a given bit is set in a bitboard, and for
 /// setting and clearing bits.
@@ -87,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];
 }
 
@@ -103,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;
 }
 
@@ -116,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) {
@@ -124,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)];
 }
 
 
@@ -136,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)];
 }
 
 
@@ -148,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)];
 }
 
 
@@ -163,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)];
 }
 
 
@@ -175,29 +172,25 @@ inline Bitboard in_front_bb(Color c, Square s) {
 #if defined(IS_64BIT)
 
 inline Bitboard rook_attacks_bb(Square s, Bitboard occ) {
-  const Magics& m = RMagics[s];
-  return RAttacks[m.index + (((occ & m.mask) * m.mult) >> m.shift)];
+  return RAttacks[s][((occ & RMask[s]) * RMult[s]) >> RShift[s]];
 }
 
 inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) {
-  const Magics& m = BMagics[s];
-  return BAttacks[m.index + (((occ & m.mask) * m.mult) >> m.shift)];
+  return BAttacks[s][((occ & BMask[s]) * BMult[s]) >> BShift[s]];
 }
 
 #else // if !defined(IS_64BIT)
 
 inline Bitboard rook_attacks_bb(Square s, Bitboard occ) {
-  const Magics& m = RMagics[s];
-  Bitboard b = occ & m.mask;
-  return RAttacks[m.offset +
-        ((unsigned(b) * unsigned(m.mult) ^ unsigned(b >> 32) * unsigned(m.mult >> 32)) >> m.shift)];
+  Bitboard b = occ & RMask[s];
+  return RAttacks[s]
+         [unsigned(int(b) * int(RMult[s]) ^ int(b >> 32) * int(RMult[s] >> 32)) >> RShift[s]];
 }
 
 inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) {
-  const Magics& m = BMagics[s];
-  Bitboard b = occ & m.mask;
-  return BAttacks[m.offset +
-        ((unsigned(b) * unsigned(m.mult) ^ unsigned(b >> 32) * unsigned(m.mult >> 32)) >> m.shift)];
+  Bitboard b = occ & BMask[s];
+  return BAttacks[s]
+         [unsigned(int(b) * int(BMult[s]) ^ int(b >> 32) * int(BMult[s] >> 32)) >> BShift[s]];
 }
 
 #endif
@@ -252,7 +245,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]);
 }