X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbitboard.h;h=55f40eee2e8e2414c2af55c4e1c5c949670fd982;hp=00f0f576d91972762e7f2781a585c3600f371e24;hb=30b3edf328fcb87246bb0929c54c3446fd27683e;hpb=b1b0c640462aed199a3665e575f9cb208b8e4687

diff --git a/src/bitboard.h b/src/bitboard.h
index 00f0f576..55f40eee 100644
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -60,22 +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 shift;
-  Bitboard* attacks;
-};
-
-extern Magics RMagics[64];
-extern Magics BMagics[64];
-
 
 /// Functions for testing whether a given bit is set in a bitboard, and for
 /// setting and clearing bits.
@@ -172,27 +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 m.attacks[((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 m.attacks[((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 m.attacks[(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 m.attacks[(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
@@ -247,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]);
 }