X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbitboard.h;h=e390b01855447186fcc6c991bd04118b9c10be9b;hb=c0cb713a000ef176cdad16defe640b7b6432a4a9;hp=9aa3375026f6ee722ef256c5956bb840e47730cd;hpb=6d24ef8585c2ed5618eb9b4ab1d8ee35a05ce2cd;p=stockfish diff --git a/src/bitboard.h b/src/bitboard.h index 9aa33750..e390b018 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -83,18 +83,18 @@ struct Magic { Bitboard* attacks; unsigned shift; - /// looks up the index using the 'magic bitboards' approach. + // Compute the attack's index using the 'magic bitboards' approach unsigned index(Bitboard occupied) const { - if (HasPext) - return unsigned(pext(occupied, mask)); + if (HasPext) + return unsigned(pext(occupied, mask)); - if (Is64Bit) - return unsigned(((occupied & mask) * magic) >> shift); + if (Is64Bit) + return unsigned(((occupied & mask) * magic) >> shift); - unsigned lo = unsigned(occupied) & unsigned(mask); - unsigned hi = unsigned(occupied >> 32) & unsigned(mask >> 32); - return (lo * unsigned(magic) ^ hi * unsigned(magic >> 32)) >> shift; + unsigned lo = unsigned(occupied) & unsigned(mask); + unsigned hi = unsigned(occupied >> 32) & unsigned(mask >> 32); + return (lo * unsigned(magic) ^ hi * unsigned(magic >> 32)) >> shift; } }; @@ -241,8 +241,8 @@ template<> inline int distance(Square x, Square y) { return distance(rank_ template inline Bitboard attacks_bb(Square s, Bitboard occupied) { - const Magic& M = Pt == ROOK ? RookMagics[s] : BishopMagics[s]; - return M.attacks[M.index(occupied)]; + const Magic& m = Pt == ROOK ? RookMagics[s] : BishopMagics[s]; + return m.attacks[m.index(occupied)]; } inline Bitboard attacks_bb(PieceType pt, Square s, Bitboard occupied) {