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)
-/// 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 {
- assert(stage == KILLERS_S1 || stage == QUIETS_1_S1 || stage == QUIETS_2_S1);
- return stage == KILLERS_S1 ? killers : moves;
+const ExtMove* MovePicker::quiet_moves() const {
+ return stage == KILLERS_S1 ? killers
+ : stage == QUIETS_1_S1 || stage == QUIETS_2_S1 ? moves : NULL;
MovePicker(const Position&, Move, const HistoryStats&, PieceType);
MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*);
MovePicker(const Position&, Move, const HistoryStats&, PieceType);
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();
private:
template<bool SpNode> Move next_move();
private:
Value bonus = Value(int(depth) * int(depth));
History.update(pos.moved_piece(bestMove), to_sq(bestMove), bonus);
Value bonus = Value(int(depth) * int(depth));
History.update(pos.moved_piece(bestMove), to_sq(bestMove), bonus);
- if (bestMove != ttMove)
- for (const ExtMove* em = mp.stage_moves(); em->move != bestMove; ++em)
- History.update(pos.moved_piece(em->move), to_sq(em->move), -bonus);
+ for (const ExtMove* em = mp.quiet_moves(); em && em->move != bestMove; ++em)
+ History.update(pos.moved_piece(em->move), to_sq(em->move), -bonus);
if (is_ok((ss-1)->currentMove))
Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);
if (is_ok((ss-1)->currentMove))
Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);