X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=07decab1fd4c52e9c490f5468c5f4c94d9d73b31;hp=37a54dd95545fcc8e2e9365f6ba219166dbbf2e5;hb=d4876dc96395f5592bfbc25b2eca2360db0655e6;hpb=3249777cdb2b9e8c4eb40970483544133545ae20 diff --git a/src/pawns.cpp b/src/pawns.cpp index 37a54dd9..07decab1 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -147,6 +147,7 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns, Rank r; bool passed, isolated, doubled, opposed, chain, backward, candidate; Score value = SCORE_ZERO; + const BitCountType Max15 = CpuIs64Bit ? CNT64_MAX15 : CNT32_MAX15; const Square* ptr = pos.piece_list_begin(Us, PAWN); // Initialize halfOpenFiles[] @@ -206,7 +207,7 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns, // Test for candidate passed pawn candidate = !(opposed | passed) && (b = attack_span_mask(opposite_color(Us), s + pawn_push(Us)) & ourPawns) != EmptyBoardBB - && count_1s_max_15(b) >= count_1s_max_15(attack_span_mask(Us, s) & theirPawns); + && count_1s(b) >= count_1s(attack_span_mask(Us, s) & theirPawns); // In order to prevent doubled passed pawns from receiving a too big // bonus, only the frontmost passed pawn on each file is considered as