Skip to content

Commit

Permalink
Revert "Generalize shift_bb() to handle double pushes"
Browse files Browse the repository at this point in the history
Seems to intorduce some compiler warning as
reported by Gary. Warning seems bogus, but
revert anyhow.

No functional change.
  • Loading branch information
mcostalba committed Apr 21, 2014
1 parent 56273fc commit a66e6e5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 3 additions & 2 deletions src/bitboard.h
Expand Up @@ -130,9 +130,10 @@ inline int rank_distance(Square s1, Square s2) {
template<Square Delta>
inline Bitboard shift_bb(Bitboard b) {

return Delta == DELTA_NE ? (b & ~FileHBB) << 9 : Delta == DELTA_SE ? (b & ~FileHBB) >> 7
return Delta == DELTA_N ? b << 8 : Delta == DELTA_S ? b >> 8
: Delta == DELTA_NE ? (b & ~FileHBB) << 9 : Delta == DELTA_SE ? (b & ~FileHBB) >> 7
: Delta == DELTA_NW ? (b & ~FileABB) << 7 : Delta == DELTA_SW ? (b & ~FileABB) >> 9
: Delta > 0 ? b << Delta : b >> -Delta;
: 0;
}


Expand Down
8 changes: 3 additions & 5 deletions src/evaluate.cpp
Expand Up @@ -702,9 +702,7 @@ namespace {
template<Color Us>
int evaluate_space(const Position& pos, const EvalInfo& ei) {

const Color Them = (Us == WHITE ? BLACK : WHITE);
const Square Down = (Us == WHITE ? DELTA_S : DELTA_N);
const Square DownDown = (Us == WHITE ? DELTA_SS : DELTA_NN);
const Color Them = (Us == WHITE ? BLACK : WHITE);

// Find the safe squares for our pieces inside the area defined by
// SpaceMask[]. A square is unsafe if it is attacked by an enemy
Expand All @@ -716,8 +714,8 @@ namespace {

// Find all squares which are at most three squares behind some friendly pawn
Bitboard behind = pos.pieces(Us, PAWN);
behind |= shift_bb< Down>(behind);
behind |= shift_bb<DownDown>(behind);
behind |= (Us == WHITE ? behind >> 8 : behind << 8);
behind |= (Us == WHITE ? behind >> 16 : behind << 16);

// Since SpaceMask[Us] is fully on our half of the board
assert(unsigned(safe >> (Us == WHITE ? 32 : 0)) == 0);
Expand Down

0 comments on commit a66e6e5

Please sign in to comment.