HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-21 01:27:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix an assert in SMP case

Browse Source 
SMP case is very tricky and raises an assert in stage_moves():

assert(stage == KILLERS_S1 || stage == QUIETS_1_S1 || stage == QUIETS_2_S1)

So rewrite the code to just return moves[] when we are sure
we are in quiet moves stages.

Also rename stage_moves to quiet_moves to reflect that.

No functional change (but needs testing in SMP case)
This commit is contained in:
Marco Costalba
2013-11-17 10:15:45 +01:00
parent d9c7cad630
commit 917944e9c5
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/movepick.cpp
View File

@@ -140,12 +140,12 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece
} }
/// stage_moves() returns a pointer to the beginning of moves array. It /// quiet_moves() returns a pointer to the beginning of moves array. It
/// is used to access already tried quiet moves when updating history. /// is used to access already tried quiet moves when updating history.
const ExtMove* MovePicker::stage_moves() const { const ExtMove* MovePicker::quiet_moves() const {
assert(stage == KILLERS_S1 || stage == QUIETS_1_S1 || stage == QUIETS_2_S1); return stage == KILLERS_S1 ? killers
return stage == KILLERS_S1 ? killers : moves; : stage == QUIETS_1_S1 || stage == QUIETS_2_S1 ? moves : NULL;
} }

2
src/movepick.h
View File

@@ -88,7 +88,7 @@ public:
MovePicker(const Position&, Move, const HistoryStats&, PieceType); MovePicker(const Position&, Move, const HistoryStats&, PieceType);
MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*); MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*);
const ExtMove* stage_moves() const; const ExtMove* quiet_moves() const;
template<bool SpNode> Move next_move(); template<bool SpNode> Move next_move();
private: private:

5
src/search.cpp
View File

@@ -1075,9 +1075,8 @@ moves_loop: // When in check and at SpNode search starts from here
Value bonus = Value(int(depth) * int(depth)); Value bonus = Value(int(depth) * int(depth));
History.update(pos.moved_piece(bestMove), to_sq(bestMove), bonus); History.update(pos.moved_piece(bestMove), to_sq(bestMove), bonus);
if (bestMove != ttMove) for (const ExtMove* em = mp.quiet_moves(); em && em->move != bestMove; ++em)
for (const ExtMove* em = mp.stage_moves(); em->move != bestMove; ++em) History.update(pos.moved_piece(em->move), to_sq(em->move), -bonus);
History.update(pos.moved_piece(em->move), to_sq(em->move), -bonus);
if (is_ok((ss-1)->currentMove)) if (is_ok((ss-1)->currentMove))
Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove); Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);