Get rid of Shift[] tables

[stockfish] / src / bitboard.h

diff --git a/src/bitboard.h b/src/bitboard.h
index bdeddbd2def0879bee629e49042643c91fcf3507..b3a0033c65832b84fe4089d149861a34d5ddde62 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -69,7 +69,7 @@ extern uint8_t BitCount8Bit[256];
 struct Magics {
   Bitboard mask;
   uint64_t mult;
-  uint32_t index;
+  uint32_t offset;
   uint32_t shift;
 };
 
@@ -176,12 +176,12 @@ inline Bitboard in_front_bb(Color c, Square s) {
 
 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[m.offset + (((occ & m.mask) * m.mult) >> m.shift)];
 }
 
 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[m.offset + (((occ & m.mask) * m.mult) >> m.shift)];
 }
 
 #else // if !defined(IS_64BIT)
@@ -189,14 +189,14 @@ inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) {
 inline Bitboard rook_attacks_bb(Square s, Bitboard occ) {
   const Magics& m = RMagics[s];
   Bitboard b = occ & m.mask;
-  return RAttacks[m.index +
+  return RAttacks[m.offset +
         ((unsigned(b) * unsigned(m.mult) ^ unsigned(b >> 32) * unsigned(m.mult >> 32)) >> m.shift)];
 }
 
 inline Bitboard bishop_attacks_bb(Square s, Bitboard occ) {
   const Magics& m = BMagics[s];
   Bitboard b = occ & m.mask;
-  return BAttacks[m.index +
+  return BAttacks[m.offset +
         ((unsigned(b) * unsigned(m.mult) ^ unsigned(b >> 32) * unsigned(m.mult >> 32)) >> m.shift)];
 }