From 14e23d520f251f28234a686a9d30d9711495dfef Mon Sep 17 00:00:00 2001 From: protonspring Date: Sun, 9 Jun 2019 06:31:16 -0600 Subject: [PATCH] Remove a few file_of's (simplify adjacent_files_bb) #2171 This is a non-functional simplification that removes two file_of(s). STC LLR: 2.96 (-2.94,2.94) [-3.00,1.00] Total: 22030 W: 5106 L: 4984 D: 11940 http://tests.stockfishchess.org/tests/view/5cf028de0ebc5925cf0839e7 --- src/bitboard.h | 8 ++++---- src/pawns.cpp | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/bitboard.h b/src/bitboard.h index 4e0267f1..ef5c4fa3 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -184,8 +184,8 @@ constexpr Bitboard pawn_double_attacks_bb(Bitboard b) { /// adjacent_files_bb() returns a bitboard representing all the squares on the /// adjacent files of the given one. -inline Bitboard adjacent_files_bb(File f) { - return shift(file_bb(f)) | shift(file_bb(f)); +inline Bitboard adjacent_files_bb(Square s) { + return shift(file_bb(s)) | shift(file_bb(s)); } @@ -221,7 +221,7 @@ inline Bitboard forward_file_bb(Color c, Square s) { /// starting from the given square. inline Bitboard pawn_attack_span(Color c, Square s) { - return forward_ranks_bb(c, s) & adjacent_files_bb(file_of(s)); + return forward_ranks_bb(c, s) & adjacent_files_bb(s); } @@ -229,7 +229,7 @@ inline Bitboard pawn_attack_span(Color c, Square s) { /// the given color and on the given square is a passed pawn. inline Bitboard passed_pawn_span(Color c, Square s) { - return forward_ranks_bb(c, s) & (adjacent_files_bb(file_of(s)) | file_bb(s)); + return forward_ranks_bb(c, s) & (adjacent_files_bb(s) | file_bb(s)); } diff --git a/src/pawns.cpp b/src/pawns.cpp index 47c89ed4..2b4f039e 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -87,7 +87,6 @@ namespace { { assert(pos.piece_on(s) == make_piece(Us, PAWN)); - File f = file_of(s); Rank r = relative_rank(Us, s); e->pawnAttacksSpan[Us] |= pawn_attack_span(Us, s); @@ -98,7 +97,7 @@ namespace { lever = theirPawns & PawnAttacks[Us][s]; leverPush = theirPawns & PawnAttacks[Us][s + Up]; doubled = ourPawns & (s - Up); - neighbours = ourPawns & adjacent_files_bb(f); + neighbours = ourPawns & adjacent_files_bb(s); phalanx = neighbours & rank_bb(s); support = neighbours & rank_bb(s - Up); -- 2.39.2