Correct a bug introduced by Stéphane in the previous patch.

snicolet · snicolet · commit 06e0134cbc9b · 2018-05-02T13:38:00.000+02:00
When we are using the "Bitboard + Square" overloaded operators,
the compiler uses the interpediate SquareBB[s] to transform the
square into a Bitboard, and then calculate the result.

For instance, the following code:

```
   b = pos.pieces(Us, PAWN) &amp; s
```

generates in fact the code:

```
   b = pos.pieces(Us, PAWN) &amp; SquareBB[s]`
```

The bug introduced by Stéphane in the previous patch was the
use of `b = pos.pieces(Us, PAWN) &amp; (s + Up)` which can result
in out-of-bounds errors for the SquareBB[] array if s in the
last rank of the board.

We coorect the bug, and also add some asserts in bitboard.h to
make the code more robust for this particular bug in the future.

Bug report by Joost VandeVondele. Thanks!

Bench: 5512000
diff --git a/src/bitboard.h b/src/bitboard.h
@@ -107,22 +107,27 @@ extern Magic BishopMagics[SQUARE_NB];
 /// whether a given bit is set in a bitboard, and for setting and clearing bits.
 
 inline Bitboard operator&(Bitboard b, Square s) {
+  assert(s >= SQ_A1 && s <= SQ_H8);
   return b & SquareBB[s];
 }
 
 inline Bitboard operator|(Bitboard b, Square s) {
+  assert(s >= SQ_A1 && s <= SQ_H8);
   return b | SquareBB[s];
 }
 
 inline Bitboard operator^(Bitboard b, Square s) {
+  assert(s >= SQ_A1 && s <= SQ_H8);
   return b ^ SquareBB[s];
 }
 
 inline Bitboard& operator|=(Bitboard& b, Square s) {
+  assert(s >= SQ_A1 && s <= SQ_H8);
   return b |= SquareBB[s];
 }
 
 inline Bitboard& operator^=(Bitboard& b, Square s) {
+  assert(s >= SQ_A1 && s <= SQ_H8);
   return b ^= SquareBB[s];
 }
 
diff --git a/src/pawns.cpp b/src/pawns.cpp
@@ -226,16 +226,16 @@ Value Entry::evaluate_shelter(const Position& pos, Square ksq) {
 
   enum { Unopposed, BlockedByPawn, Unblocked };
   constexpr Color     Them = (Us == WHITE ? BLACK : WHITE);
-  constexpr Direction Up   = (Us == WHITE ? NORTH : SOUTH);
-  constexpr Bitboard  BlockRanks = (Us == WHITE ? Rank2BB | Rank3BB : Rank7BB | Rank6BB);
+  constexpr Direction Down = (Us == WHITE ? SOUTH : NORTH);
+  constexpr Bitboard  BlockRanks = (Us == WHITE ? Rank1BB | Rank2BB : Rank8BB | Rank7BB);
 
   Bitboard b = pos.pieces(PAWN) & (forward_ranks_bb(Us, ksq) | rank_bb(ksq));
   Bitboard ourPawns = b & pos.pieces(Us);
   Bitboard theirPawns = b & pos.pieces(Them);
 
   Value safety = (ourPawns & file_bb(ksq)) ? Value(5) : Value(-5);
 
-  if ((theirPawns & (FileABB | FileHBB) & BlockRanks) & (ksq + Up))
+  if ((shift<Down>(theirPawns) & (FileABB | FileHBB) & BlockRanks) & ksq)
       safety += 374;
 
   File center = std::max(FILE_B, std::min(FILE_G, file_of(ksq)));

Original file line number	Diff line number	Diff line change
`@@ -107,22 +107,27 @@ extern Magic BishopMagics[SQUARE_NB];`
`107`	`107`	`/// whether a given bit is set in a bitboard, and for setting and clearing bits.`
`108`	`108`
`109`	`109`	`inline Bitboard operator&(Bitboard b, Square s) {`
	`110`	`+ assert(s >= SQ_A1 && s <= SQ_H8);`
`110`	`111`	`return b & SquareBB[s];`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`inline Bitboard operator\|(Bitboard b, Square s) {`
	`115`	`+ assert(s >= SQ_A1 && s <= SQ_H8);`
`114`	`116`	`return b \| SquareBB[s];`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`inline Bitboard operator^(Bitboard b, Square s) {`
	`120`	`+ assert(s >= SQ_A1 && s <= SQ_H8);`
`118`	`121`	`return b ^ SquareBB[s];`
`119`	`122`	`}`
`120`	`123`
`121`	`124`	`inline Bitboard& operator\|=(Bitboard& b, Square s) {`
	`125`	`+ assert(s >= SQ_A1 && s <= SQ_H8);`
`122`	`126`	`return b \|= SquareBB[s];`
`123`	`127`	`}`
`124`	`128`
`125`	`129`	`inline Bitboard& operator^=(Bitboard& b, Square s) {`
	`130`	`+ assert(s >= SQ_A1 && s <= SQ_H8);`
`126`	`131`	`return b ^= SquareBB[s];`
`127`	`132`	`}`
`128`	`133`